diff --git a/firmware/config/stm32f1egt/efifeatures.h b/firmware/config/stm32f1egt/efifeatures.h index f89415fab2..3a9774f34b 100644 --- a/firmware/config/stm32f1egt/efifeatures.h +++ b/firmware/config/stm32f1egt/efifeatures.h @@ -16,8 +16,6 @@ #define hal_lld_get_counter_value() DWT_CYCCNT -#define EFI_USE_UART_FOR_CONSOLE FALSE - #define EFI_CONSOLE_TX_PORT GPIOC #define EFI_CONSOLE_TX_PIN 10 #define EFI_CONSOLE_RX_PORT GPIOC @@ -44,9 +42,6 @@ #define EFI_UNIT_TEST FALSE -#define CONSOLE_MODE_SWITCH_PORT GPIOB -#define CONSOLE_MODE_SWITCH_PIN 1 - #define EFI_MAX_31855 TRUE #define CONSOLE_MAX_ACTIONS 32 diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h index b1585d729e..bd24a00cb4 100644 --- a/firmware/config/stm32f4ems/efifeatures.h +++ b/firmware/config/stm32f4ems/efifeatures.h @@ -49,8 +49,6 @@ //#define EFI_UART_ECHO_TEST_MODE TRUE -#define EFI_USE_UART_FOR_CONSOLE FALSE - /** * Build-in logic analyzer support. Logic analyzer viewer is one of the java console panes. */ @@ -364,9 +362,6 @@ #define GPS_SERIAL_DEVICE &SD1 #define GPS_SERIAL_SPEED 38400 -#define CONSOLE_MODE_SWITCH_PORT GPIOB -#define CONSOLE_MODE_SWITCH_PIN 1 - #define CONFIG_RESET_SWITCH_PORT GPIOD #define CONFIG_RESET_SWITCH_PIN 6 diff --git a/firmware/config/stm32f7ems/efifeatures.h b/firmware/config/stm32f7ems/efifeatures.h index 608d0dc560..29390e43b1 100644 --- a/firmware/config/stm32f7ems/efifeatures.h +++ b/firmware/config/stm32f7ems/efifeatures.h @@ -21,10 +21,6 @@ #undef EFI_USE_CCM #define EFI_USE_CCM FALSE -// todo: no actual selection pin configured for Nucleo -#undef EFI_USE_UART_FOR_CONSOLE -#define EFI_USE_UART_FOR_CONSOLE FALSE - #undef EFI_POTENTIOMETER #define EFI_POTENTIOMETER FALSE diff --git a/firmware/console/console_io.cpp b/firmware/console/console_io.cpp index 21948bcde2..3b31acafb4 100644 --- a/firmware/console/console_io.cpp +++ b/firmware/console/console_io.cpp @@ -132,11 +132,7 @@ static bool getConsoleLine(BaseSequentialStream *chp, char *line, unsigned size) CommandHandler console_line_callback; -/** - * todo: what does this variable currently mean? is it still needed? - * looks like things are a bit confusing here - */ -static bool b_isCommandLineConsoleOverTTL; +static const bool b_isCommandLineConsoleOverTTL = true; bool isCommandLineConsoleOverTTL(void) { return b_isCommandLineConsoleOverTTL; @@ -270,10 +266,6 @@ void startConsole(Logging *sharedLogger, CommandHandler console_line_callback_p) #if (defined(EFI_CONSOLE_UART_DEVICE) && ! EFI_SIMULATOR) || defined(__DOXYGEN__) - palSetPadMode(CONSOLE_MODE_SWITCH_PORT, CONSOLE_MODE_SWITCH_PIN, PAL_MODE_INPUT_PULLUP); - - b_isCommandLineConsoleOverTTL = GET_CONSOLE_MODE_VALUE() == EFI_USE_UART_FOR_CONSOLE; - if (isCommandLineConsoleOverTTL()) { /* * Activates the serial @@ -290,8 +282,6 @@ void startConsole(Logging *sharedLogger, CommandHandler console_line_callback_p) chEvtRegisterMask((event_source_t *) chnGetEventSource(EFI_CONSOLE_UART_DEVICE), &consoleEventListener, 1); } -#else - b_isCommandLineConsoleOverTTL = false; #endif /* EFI_PROD_CODE */ #if !defined(EFI_CONSOLE_NO_THREAD) || defined(__DOXYGEN__) diff --git a/firmware/console/console_io.h b/firmware/console/console_io.h index f7e0d9d242..2a203430b9 100644 --- a/firmware/console/console_io.h +++ b/firmware/console/console_io.h @@ -25,7 +25,6 @@ typedef void (*CommandHandler)(char *); #include "datalogging.h" // todo: make this pin configurable -#define GET_CONSOLE_MODE_VALUE() palReadPad(CONSOLE_MODE_SWITCH_PORT, CONSOLE_MODE_SWITCH_PIN) #define SHOULD_INGORE_FLASH() (palReadPad(CONFIG_RESET_SWITCH_PORT, CONFIG_RESET_SWITCH_PIN) == 0) BaseChannel * getConsoleChannel(void); diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 5bf8dea445..0a7492238d 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -779,5 +779,5 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20190324; + return 20190401; }