diff --git a/firmware/config/boards/hellen/hellen-nb1/board.mk b/firmware/config/boards/hellen/hellen-nb1/board.mk index ecb5689f83..51dca32527 100644 --- a/firmware/config/boards/hellen/hellen-nb1/board.mk +++ b/firmware/config/boards/hellen/hellen-nb1/board.mk @@ -21,8 +21,7 @@ DDEFS += -DLED_RUNING_BRAIN_PIN_MODE=INVERTED_OUTPUT DDEFS += -DLED_WARNING_BRAIN_PIN_MODE=INVERTED_OUTPUT DDEFS += -DLED_COMMUNICATION_BRAIN_PIN_MODE=INVERTED_OUTPUT -# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card -DDEFS += -DTS_NO_PRIMARY -DTS_NO_SECONDARY +DDEFS += -DTS_NO_SECONDARY # Add them all together DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellenNB1\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(LED_COMMUNICATION_BRAIN_PIN) @@ -31,6 +30,9 @@ DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE # todo: is it broken? DDEFS += -DEFI_LOGIC_ANALYZER=FALSE +# Enable serial pins on expansion header +DDEFS += -DEFI_CONSOLE_TX_BRAIN_PIN=GPIOD_6 -DEFI_CONSOLE_RX_BRAIN_PIN=GPIOD_5 -DTS_PRIMARY_UART=UARTD2 -DSTM32_UART_USE_USART2=1 + # We are running on Hellen-One hardware! DDEFS += -DHW_HELLEN=1 diff --git a/firmware/console/binary/tunerstudio_io_serial.cpp b/firmware/console/binary/tunerstudio_io_serial.cpp index 1cd432a5e2..e9a8aff6da 100644 --- a/firmware/console/binary/tunerstudio_io_serial.cpp +++ b/firmware/console/binary/tunerstudio_io_serial.cpp @@ -4,7 +4,7 @@ #include "tunerstudio_io.h" -#if HAS_PRIMARY || HAS_PRIMARY +#if HAS_PRIMARY || HAS_SECONDARY #if HAL_USE_SERIAL void SerialTsChannel::start(uint32_t baud) { SerialConfig cfg = { @@ -65,4 +65,4 @@ size_t UartTsChannel::readTimeout(uint8_t* buffer, size_t size, int timeout) { return size; } #endif // HAL_USE_UART -#endif // HAS_PRIMARY || HAS_PRIMARY +#endif // HAS_PRIMARY || HAS_SECONDARY