From 0e602b76386aab411b574985879e647f1f79153e Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 17 Mar 2015 17:05:19 -0500 Subject: [PATCH] auto-sync --- firmware/controllers/algo/engine_configuration.cpp | 2 ++ .../algo/engine_configuration_generated_structures.h | 9 ++++++--- firmware/controllers/flash_main.h | 2 +- firmware/integration/rusefi_config.txt | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 183ff08ee3..120c679c48 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -355,6 +355,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->externalKnockSenseAdc = EFI_ADC_NONE; + boardConfiguration->useSerialPort = true; + #if EFI_PROD_CODE engineConfiguration->digitalChartSize = 300; #else diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 5c5263f272..841fae3158 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 by config_definition.jar on Sat Mar 14 19:07:34 EDT 2015 +// this section was generated by config_definition.jar on Tue Mar 17 17:32:00 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -375,7 +375,7 @@ typedef struct { /** * offset 312 */ - int tunerStudioThreadPeriod; + int anotherUnused; /** * offset 316 */ @@ -440,6 +440,9 @@ typedef struct { /** offset 372 bit 7 */ bool_t isVerboseAlternator : 1; + /** + offset 372 bit 8 */ + bool_t useSerialPort : 1; /** * offset 376 */ @@ -1182,4 +1185,4 @@ typedef struct { } engine_configuration_s; // end -// this section was generated by config_definition.jar on Sat Mar 14 19:07:34 EDT 2015 +// this section was generated by config_definition.jar on Tue Mar 17 17:32:00 EDT 2015 diff --git a/firmware/controllers/flash_main.h b/firmware/controllers/flash_main.h index e1d2bdde6c..3aa821bf54 100644 --- a/firmware/controllers/flash_main.h +++ b/firmware/controllers/flash_main.h @@ -12,7 +12,7 @@ #include "engine_configuration.h" #include "engine.h" -#define FLASH_DATA_VERSION 7427 +#define FLASH_DATA_VERSION 7442 void readFromFlash(void); void initFlash(Logging *sharedLogger, Engine *engine); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 79c4064406..2c65554063 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -333,6 +333,7 @@ bit is_enabled_spi_2 bit isEngineControlEnabled bit isHip9011Enabled bit isVerboseAlternator + bit useSerialPort brain_input_pin_e[LOGIC_ANALYZER_CHANNEL_COUNT iterate] logicAnalyzerPins; uint8_t[LOGIC_ANALYZER_CHANNEL_COUNT] logicAnalyzerMode;default or inverted input