andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enable nb1 serial pins (#3546) 

* enable serial on nb1

* typo

* serial

Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
This commit is contained in:
Matthew Kennedy 2021-11-14 13:07:56 -08:00 committed by GitHub
parent 377c9e2fda
commit 36d75fa6db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/config/boards/hellen/hellen-nb1/board.mk
View File

@ -21,8 +21,7 @@ DDEFS += -DLED_RUNING_BRAIN_PIN_MODE=INVERTED_OUTPUT
DDEFS += -DLED_WARNING_BRAIN_PIN_MODE=INVERTED_OUTPUT DDEFS += -DLED_WARNING_BRAIN_PIN_MODE=INVERTED_OUTPUT
DDEFS += -DLED_COMMUNICATION_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_SECONDARY
DDEFS += -DTS_NO_PRIMARY -DTS_NO_SECONDARY
# Add them all together # Add them all together
DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellenNB1\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(LED_COMMUNICATION_BRAIN_PIN) 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? # todo: is it broken?
DDEFS += -DEFI_LOGIC_ANALYZER=FALSE 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! # We are running on Hellen-One hardware!
DDEFS += -DHW_HELLEN=1 DDEFS += -DHW_HELLEN=1

4
firmware/console/binary/tunerstudio_io_serial.cpp
View File

@ -4,7 +4,7 @@
#include "tunerstudio_io.h" #include "tunerstudio_io.h"
#if HAS_PRIMARY || HAS_PRIMARY #if HAS_PRIMARY || HAS_SECONDARY
#if HAL_USE_SERIAL #if HAL_USE_SERIAL
void SerialTsChannel::start(uint32_t baud) { void SerialTsChannel::start(uint32_t baud) {
SerialConfig cfg = { SerialConfig cfg = {
@ -65,4 +65,4 @@ size_t UartTsChannel::readTimeout(uint8_t* buffer, size_t size, int timeout) {
return size; return size;
} }
#endif // HAL_USE_UART #endif // HAL_USE_UART
#endif // HAS_PRIMARY || HAS_PRIMARY #endif // HAS_PRIMARY || HAS_SECONDARY