From 62a599bf6ed49f8a27650e61f1a5b653cf9bcc98 Mon Sep 17 00:00:00 2001 From: Samuel Sadok Date: Mon, 14 May 2018 16:13:51 -0700 Subject: [PATCH 1/3] fix ascii protocol compilation --- Firmware/communication/interface_usb.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/communication/interface_usb.cpp b/Firmware/communication/interface_usb.cpp index 28891a82..b044cdd6 100644 --- a/Firmware/communication/interface_usb.cpp +++ b/Firmware/communication/interface_usb.cpp @@ -2,6 +2,8 @@ #include "interface_usb.h" #include "protocol.hpp" +#include "ascii_protocol.h" + #include #include From 0e32df329fd420793bf8317052de8ccaa41bee90 Mon Sep 17 00:00:00 2001 From: Samuel Sadok Date: Mon, 14 May 2018 16:25:31 -0700 Subject: [PATCH 2/3] fix compilation when using stdout protocol --- Firmware/communication/communication.cpp | 4 ++-- Firmware/communication/interface_uart.cpp | 1 + Firmware/communication/interface_uart.h | 3 +++ Firmware/communication/interface_usb.cpp | 1 + Firmware/communication/interface_usb.h | 3 +++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Firmware/communication/communication.cpp b/Firmware/communication/communication.cpp index 1c4accfd..d1a8e487 100644 --- a/Firmware/communication/communication.cpp +++ b/Firmware/communication/communication.cpp @@ -182,10 +182,10 @@ int _write(int file, const char* data, int len); // @brief This is what printf calls internally int _write(int file, const char* data, int len) { #ifdef USB_PROTOCOL_STDOUT - usb_stream_output.process_bytes((const uint8_t *)data, len); + usb_stream_output_ptr->process_bytes((const uint8_t *)data, len); #endif #ifdef UART_PROTOCOL_STDOUT - uart4_stream_output.process_bytes((const uint8_t *)data, len); + uart4_stream_output_ptr->process_bytes((const uint8_t *)data, len); #endif return len; } diff --git a/Firmware/communication/interface_uart.cpp b/Firmware/communication/interface_uart.cpp index 90d976aa..58b4f57d 100644 --- a/Firmware/communication/interface_uart.cpp +++ b/Firmware/communication/interface_uart.cpp @@ -48,6 +48,7 @@ public: private: uint8_t tx_buf_[UART_TX_BUFFER_SIZE]; } uart4_stream_output; +StreamSink* uart4_stream_output_ptr = &uart4_stream_output; PacketToStreamConverter uart4_packet_output(uart4_stream_output); BidirectionalPacketBasedChannel uart4_channel(uart4_packet_output); diff --git a/Firmware/communication/interface_uart.h b/Firmware/communication/interface_uart.h index b5f1ed72..8ad71c19 100644 --- a/Firmware/communication/interface_uart.h +++ b/Firmware/communication/interface_uart.h @@ -2,6 +2,9 @@ #define __INTERFACE_UART_HPP #ifdef __cplusplus +#include "protocol.hpp" +extern StreamSink* uart4_stream_output_ptr; + extern "C" { #endif diff --git a/Firmware/communication/interface_usb.cpp b/Firmware/communication/interface_usb.cpp index b044cdd6..5687e186 100644 --- a/Firmware/communication/interface_usb.cpp +++ b/Firmware/communication/interface_usb.cpp @@ -67,6 +67,7 @@ public: private: PacketSink& output_; } usb_stream_output(usb_packet_output); +StreamSink* usb_stream_output_ptr = &usb_stream_output; #if defined(USB_PROTOCOL_NATIVE) BidirectionalPacketBasedChannel usb_channel(usb_packet_output); diff --git a/Firmware/communication/interface_usb.h b/Firmware/communication/interface_usb.h index a56bca36..9038d822 100644 --- a/Firmware/communication/interface_usb.h +++ b/Firmware/communication/interface_usb.h @@ -2,6 +2,9 @@ #define __INTERFACE_USB_HPP #ifdef __cplusplus +#include "protocol.hpp" +extern StreamSink* usb_stream_output_ptr; + extern "C" { #endif From e0b0824783e996410c9172430d8a6f0727525a13 Mon Sep 17 00:00:00 2001 From: Samuel Sadok Date: Mon, 14 May 2018 16:29:53 -0700 Subject: [PATCH 3/3] add CI jobs for board version 3.5 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8391da91..5dd08769 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,8 @@ env: - CONFIG_BOARD_VERSION=v3.3 DEPLOY=v3.3 - CONFIG_BOARD_VERSION=v3.4-24V DEPLOY=v3.4-24V - CONFIG_BOARD_VERSION=v3.4-48V DEPLOY=v3.4-48V + - CONFIG_BOARD_VERSION=v3.5-24V DEPLOY=v3.5-24V + - CONFIG_BOARD_VERSION=v3.5-48V DEPLOY=v3.5-48V # Various protocol combinations - CONFIG_BOARD_VERSION=v3.4-24V CONFIG_USB_PROTOCOL=native-stream CONFIG_UART_PROTOCOL=native