diff --git a/firmware/console/console_io.cpp b/firmware/console/console_io.cpp index 6612e01b3a..898e0fa403 100644 --- a/firmware/console/console_io.cpp +++ b/firmware/console/console_io.cpp @@ -143,7 +143,7 @@ static SerialConfig serialConfig = { 0, 0, USART_CR2_STOP1_BITS | USART_CR2_LINE bool consoleInBinaryMode = false; void runConsoleLoop(ts_channel_s *console) { - if (CONFIGB(startConsoleInBinaryMode)) { + if (true) { // switch to binary protocol consoleInBinaryMode = true; #if EFI_TUNER_STUDIO || defined(__DOXYGEN__) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 1bac01653f..6fbb8743e2 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -413,7 +413,6 @@ void setDefaultBasePins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { // needed also by bootloader code void setDefaultSerialParameters(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - boardConfiguration->startConsoleInBinaryMode = true; boardConfiguration->useSerialPort = true; engineConfiguration->binarySerialTxPin = GPIOC_10; engineConfiguration->binarySerialRxPin = GPIOC_11; diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index c1d4c9e680..5935a75fbf 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Mar 29 02:31:18 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Apr 01 11:40:04 EDT 2019 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -670,7 +670,7 @@ typedef struct { bool useLcdScreen : 1; /** offset 144 bit 13 */ - bool startConsoleInBinaryMode : 1; + bool unusedAnotherOne : 1; /** offset 144 bit 14 */ bool useWarmupPidAfr : 1; @@ -2625,4 +2625,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Mar 29 02:31:18 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Apr 01 11:40:04 EDT 2019 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 7ac5ec0a2c..0d479ad88b 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -596,8 +596,8 @@ #define useTpicAdvancedMode_offset_hex 2e8 #define useLcdScreen_offset 744 #define useLcdScreen_offset_hex 2e8 -#define startConsoleInBinaryMode_offset 744 -#define startConsoleInBinaryMode_offset_hex 2e8 +#define unusedAnotherOne_offset 744 +#define unusedAnotherOne_offset_hex 2e8 #define useWarmupPidAfr_offset 744 #define useWarmupPidAfr_offset_hex 2e8 #define onOffAlternatorLogic_offset 744 diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 49b31aa0b5..2bc5478fa3 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -873,8 +873,6 @@ static void enableOrDisable(const char *param, bool isEnabled) { engine->etbAutoTune = isEnabled; } else if (strEqualCaseInsensitive(param, "cranking_constant_dwell")) { engineConfiguration->useConstantDwellDuringCranking = isEnabled; - } else if (strEqualCaseInsensitive(param, "binary_mode_console")) { - boardConfiguration->startConsoleInBinaryMode = isEnabled; } else if (strEqualCaseInsensitive(param, "cj125")) { boardConfiguration->isCJ125Enabled = isEnabled; } else if (strEqualCaseInsensitive(param, "engine_sniffer")) { diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index d939009195..4965e13e25 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -563,7 +563,7 @@ bit is_enabled_spi_2 bit enabledStep1Limiter; bit useTpicAdvancedMode; bit useLcdScreen; - bit startConsoleInBinaryMode; + bit unusedAnotherOne; bit useWarmupPidAfr; bit onOffAlternatorLogic; bit isCJ125Enabled diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 018d56c14e..6ea1071374 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2031,7 +2031,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = tsPort, "TunerStudio Port" field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed field = "Use PC10/PC11 serial?", useSerialPort - field = "startConsoleInBinaryMode", startConsoleInBinaryMode field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed dialog = canBus, "CAN Bus" diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 8b5c6c8317..1d21eb3d06 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Mar 29 02:31:18 EDT 2019 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Apr 01 11:40:04 EDT 2019 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -407,7 +407,7 @@ public class Fields { public static final int enabledStep1Limiter_offset = 744; public static final int useTpicAdvancedMode_offset = 744; public static final int useLcdScreen_offset = 744; - public static final int startConsoleInBinaryMode_offset = 744; + public static final int unusedAnotherOne_offset = 744; public static final int useWarmupPidAfr_offset = 744; public static final int onOffAlternatorLogic_offset = 744; public static final int isCJ125Enabled_offset = 744; @@ -1441,7 +1441,7 @@ public class Fields { public static final Field ENABLEDSTEP1LIMITER = Field.create("ENABLEDSTEP1LIMITER", 744, FieldType.BIT, 10); public static final Field USETPICADVANCEDMODE = Field.create("USETPICADVANCEDMODE", 744, FieldType.BIT, 11); public static final Field USELCDSCREEN = Field.create("USELCDSCREEN", 744, FieldType.BIT, 12); - public static final Field STARTCONSOLEINBINARYMODE = Field.create("STARTCONSOLEINBINARYMODE", 744, FieldType.BIT, 13); + public static final Field UNUSEDANOTHERONE = Field.create("UNUSEDANOTHERONE", 744, FieldType.BIT, 13); public static final Field USEWARMUPPIDAFR = Field.create("USEWARMUPPIDAFR", 744, FieldType.BIT, 14); public static final Field ONOFFALTERNATORLOGIC = Field.create("ONOFFALTERNATORLOGIC", 744, FieldType.BIT, 15); public static final Field ISCJ125ENABLED = Field.create("ISCJ125ENABLED", 744, FieldType.BIT, 16);