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

The Big Refactoring of 2019: console vs TS vs CONSOLE_MODE_SWITCH_PIN vs text protocol #725 

removing startConsoleInBinaryMode
This commit is contained in:
rusefi 2019-04-01 11:45:06 -04:00
parent 17ad43e443
commit 1ab6cace13
9 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/console_io.cpp
View File

@ -143,7 +143,7 @@ static SerialConfig serialConfig = { 0, 0, USART_CR2_STOP1_BITS | USART_CR2_LINE
bool consoleInBinaryMode = false; bool consoleInBinaryMode = false;
void runConsoleLoop(ts_channel_s *console) { void runConsoleLoop(ts_channel_s *console) {
if (CONFIGB(startConsoleInBinaryMode)) { if (true) {
// switch to binary protocol // switch to binary protocol
consoleInBinaryMode = true; consoleInBinaryMode = true;
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO || defined(__DOXYGEN__)

1
firmware/controllers/algo/engine_configuration.cpp
View File

@ -413,7 +413,6 @@ void setDefaultBasePins(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// needed also by bootloader code // needed also by bootloader code
void setDefaultSerialParameters(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void setDefaultSerialParameters(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
boardConfiguration->startConsoleInBinaryMode = true;
boardConfiguration->useSerialPort = true; boardConfiguration->useSerialPort = true;
engineConfiguration->binarySerialTxPin = GPIOC_10; engineConfiguration->binarySerialTxPin = GPIOC_10;
engineConfiguration->binarySerialRxPin = GPIOC_11; engineConfiguration->binarySerialRxPin = GPIOC_11;

6
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -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 // begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_ #ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_
@ -670,7 +670,7 @@ typedef struct {
bool useLcdScreen : 1; bool useLcdScreen : 1;
/** /**
offset 144 bit 13 */ offset 144 bit 13 */
bool startConsoleInBinaryMode : 1; bool unusedAnotherOne : 1;
/** /**
offset 144 bit 14 */ offset 144 bit 14 */
bool useWarmupPidAfr : 1; bool useWarmupPidAfr : 1;
@ -2625,4 +2625,4 @@ typedef struct {
#endif #endif
// end // 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

4
firmware/controllers/algo/rusefi_generated.h
View File

@ -596,8 +596,8 @@
#define useTpicAdvancedMode_offset_hex 2e8 #define useTpicAdvancedMode_offset_hex 2e8
#define useLcdScreen_offset 744 #define useLcdScreen_offset 744
#define useLcdScreen_offset_hex 2e8 #define useLcdScreen_offset_hex 2e8
#define startConsoleInBinaryMode_offset 744 #define unusedAnotherOne_offset 744
#define startConsoleInBinaryMode_offset_hex 2e8 #define unusedAnotherOne_offset_hex 2e8
#define useWarmupPidAfr_offset 744 #define useWarmupPidAfr_offset 744
#define useWarmupPidAfr_offset_hex 2e8 #define useWarmupPidAfr_offset_hex 2e8
#define onOffAlternatorLogic_offset 744 #define onOffAlternatorLogic_offset 744

2
firmware/controllers/settings.cpp
View File

@ -873,8 +873,6 @@ static void enableOrDisable(const char *param, bool isEnabled) {
engine->etbAutoTune = isEnabled; engine->etbAutoTune = isEnabled;
} else if (strEqualCaseInsensitive(param, "cranking_constant_dwell")) { } else if (strEqualCaseInsensitive(param, "cranking_constant_dwell")) {
engineConfiguration->useConstantDwellDuringCranking = isEnabled; engineConfiguration->useConstantDwellDuringCranking = isEnabled;
} else if (strEqualCaseInsensitive(param, "binary_mode_console")) {
boardConfiguration->startConsoleInBinaryMode = isEnabled;
} else if (strEqualCaseInsensitive(param, "cj125")) { } else if (strEqualCaseInsensitive(param, "cj125")) {
boardConfiguration->isCJ125Enabled = isEnabled; boardConfiguration->isCJ125Enabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "engine_sniffer")) { } else if (strEqualCaseInsensitive(param, "engine_sniffer")) {

2
firmware/integration/rusefi_config.txt
View File

@ -563,7 +563,7 @@ bit is_enabled_spi_2
bit enabledStep1Limiter; bit enabledStep1Limiter;
bit useTpicAdvancedMode; bit useTpicAdvancedMode;
bit useLcdScreen; bit useLcdScreen;
bit startConsoleInBinaryMode; bit unusedAnotherOne;
bit useWarmupPidAfr; bit useWarmupPidAfr;
bit onOffAlternatorLogic; bit onOffAlternatorLogic;
bit isCJ125Enabled bit isCJ125Enabled

5
firmware/tunerstudio/rusefi.ini
View File

@ -68,7 +68,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Apr 01 03:42:17 EDT 2019 ; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Apr 01 11:40:04 EDT 2019
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -318,7 +318,7 @@ page = 1
enabledStep1Limiter = bits, U32, 744, [10:10], "false", "true" enabledStep1Limiter = bits, U32, 744, [10:10], "false", "true"
useTpicAdvancedMode = bits, U32, 744, [11:11], "false", "true" useTpicAdvancedMode = bits, U32, 744, [11:11], "false", "true"
useLcdScreen = bits, U32, 744, [12:12], "false", "true" useLcdScreen = bits, U32, 744, [12:12], "false", "true"
startConsoleInBinaryMode= bits, U32, 744, [13:13], "false", "true" unusedAnotherOne = bits, U32, 744, [13:13], "false", "true"
useWarmupPidAfr = bits, U32, 744, [14:14], "false", "true" useWarmupPidAfr = bits, U32, 744, [14:14], "false", "true"
onOffAlternatorLogic = bits, U32, 744, [15:15], "false", "true" onOffAlternatorLogic = bits, U32, 744, [15:15], "false", "true"
isCJ125Enabled = bits, U32, 744, [16:16], "false", "true" isCJ125Enabled = bits, U32, 744, [16:16], "false", "true"
@ -2939,7 +2939,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = tsPort, "TunerStudio Port" dialog = tsPort, "TunerStudio Port"
field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed
field = "Use PC10/PC11 serial?", useSerialPort field = "Use PC10/PC11 serial?", useSerialPort
field = "startConsoleInBinaryMode", startConsoleInBinaryMode
field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed
dialog = canBus, "CAN Bus" dialog = canBus, "CAN Bus"

1
firmware/tunerstudio/rusefi.input
View File

@ -2031,7 +2031,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = tsPort, "TunerStudio Port" dialog = tsPort, "TunerStudio Port"
field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed
field = "Use PC10/PC11 serial?", useSerialPort field = "Use PC10/PC11 serial?", useSerialPort
field = "startConsoleInBinaryMode", startConsoleInBinaryMode
field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed
dialog = canBus, "CAN Bus" dialog = canBus, "CAN Bus"

6
java_console/models/src/com/rusefi/config/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config; 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 class Fields {
public static final int LE_COMMAND_LENGTH = 200; public static final int LE_COMMAND_LENGTH = 200;
public static final int BLOCKING_FACTOR = 400; 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 enabledStep1Limiter_offset = 744;
public static final int useTpicAdvancedMode_offset = 744; public static final int useTpicAdvancedMode_offset = 744;
public static final int useLcdScreen_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 useWarmupPidAfr_offset = 744;
public static final int onOffAlternatorLogic_offset = 744; public static final int onOffAlternatorLogic_offset = 744;
public static final int isCJ125Enabled_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 ENABLEDSTEP1LIMITER = Field.create("ENABLEDSTEP1LIMITER", 744, FieldType.BIT, 10);
public static final Field USETPICADVANCEDMODE = Field.create("USETPICADVANCEDMODE", 744, FieldType.BIT, 11); 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 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 USEWARMUPPIDAFR = Field.create("USEWARMUPPIDAFR", 744, FieldType.BIT, 14);
public static final Field ONOFFALTERNATORLOGIC = Field.create("ONOFFALTERNATORLOGIC", 744, FieldType.BIT, 15); public static final Field ONOFFALTERNATORLOGIC = Field.create("ONOFFALTERNATORLOGIC", 744, FieldType.BIT, 15);
public static final Field ISCJ125ENABLED = Field.create("ISCJ125ENABLED", 744, FieldType.BIT, 16); public static final Field ISCJ125ENABLED = Field.create("ISCJ125ENABLED", 744, FieldType.BIT, 16);