From 94e962afcae750a4f8da6c7d6f3d485eed7e4539 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 4 Apr 2015 23:06:25 -0500 Subject: [PATCH] auto-sync --- .../controllers/algo/engine_configuration.cpp | 10 +++- ...ngine_configuration_generated_structures.h | 56 +++++++++---------- firmware/controllers/algo/fuel_math.cpp | 2 +- firmware/controllers/flash_main.h | 2 +- firmware/controllers/settings.cpp | 2 +- firmware/integration/rusefi_config.txt | 15 +++-- firmware/tunerstudio/rusefi.ini | 18 +++--- 7 files changed, 54 insertions(+), 51 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 0ceedb7c04..7a871c13e1 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -121,7 +121,7 @@ void setWholeFuelMap(float value DECLARE_ENGINE_PARAMETER_S) { } void setFuelTablesLoadBin(float minValue, float maxValue DECLARE_ENGINE_PARAMETER_S) { - setTableBin2(engineConfiguration->injPhaseLoadBins, FUEL_LOAD_COUNT, minValue, maxValue, 1); + setTableBin2(config->injPhaseLoadBins, FUEL_LOAD_COUNT, minValue, maxValue, 1); setTableBin2(engineConfiguration->veLoadBins, FUEL_LOAD_COUNT, minValue, maxValue, 1); setTableBin2(engineConfiguration->afrLoadBins, FUEL_LOAD_COUNT, minValue, maxValue, 1); } @@ -149,8 +149,12 @@ static void initTemperatureCurve(int size, float *bins, float *values) { */ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { board_configuration_s *boardConfiguration = &engineConfiguration->bc; + // technically these regions currently overlap, but I will reset all individually for readability memset(engineConfiguration, 0, sizeof(engine_configuration_s)); memset(boardConfiguration, 0, sizeof(board_configuration_s)); +#if ! EFI_UNIT_TEST + memset(&persistentState.persistentConfiguration, 0, sizeof(persistentState.persistentConfiguration)); +#endif boardConfiguration->mafSensorType = Bosch0280218037; setBosch0280218037(engineConfiguration); @@ -218,8 +222,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { setDefaultVETable(PASS_ENGINE_PARAMETER_F); - setMap(engineConfiguration->injectionPhase, -180); - setRpmTableBin(engineConfiguration->injPhaseRpmBins, FUEL_RPM_COUNT); + setMap(config->injectionPhase, -180); + setRpmTableBin(config->injPhaseRpmBins, FUEL_RPM_COUNT); setFuelTablesLoadBin(10, 160 PASS_ENGINE_PARAMETER); setThermistorConfiguration(&engineConfiguration->clt, 0, 9500, 23.8889, 2100, 48.8889, 1000); diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index cdb9d5a741..a00d9fe1fd 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 Apr 04 17:10:30 EDT 2015 +// this section was generated by config_definition.jar on Sat Apr 04 23:34:22 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -1210,36 +1210,12 @@ typedef struct { /** * offset 12856 */ - fuel_table_t injectionPhase; - /** - * offset 13880 - */ - float injPhaseLoadBins[FUEL_LOAD_COUNT]; - /** - * offset 13944 - */ - float injPhaseRpmBins[FUEL_RPM_COUNT]; - /** - * offset 14008 - */ float iatIdleCorrBins[IAT_CURVE_SIZE]; /** - * offset 14072 + * offset 12920 */ float iatIdleCorr[IAT_CURVE_SIZE]; - /** - * offset 14136 - */ - ignition_table_t ignitionIatCorrTable; - /** - * offset 15160 - */ - float ignitionIatCorrLoadBins[IGN_LOAD_COUNT]; - /** - * offset 15224 - */ - float ignitionIatCorrRpmBins[IGN_RPM_COUNT]; - /** total size 15288*/ + /** total size 12984*/ } engine_configuration_s; typedef struct { @@ -1247,8 +1223,32 @@ typedef struct { * offset 0 */ engine_configuration_s engineConfiguration; + /** + * offset 12984 + */ + ignition_table_t ignitionIatCorrTable; + /** + * offset 14008 + */ + float ignitionIatCorrLoadBins[IGN_LOAD_COUNT]; + /** + * offset 14072 + */ + float ignitionIatCorrRpmBins[IGN_RPM_COUNT]; + /** + * offset 14136 + */ + fuel_table_t injectionPhase; + /** + * offset 15160 + */ + float injPhaseLoadBins[FUEL_LOAD_COUNT]; + /** + * offset 15224 + */ + float injPhaseRpmBins[FUEL_RPM_COUNT]; /** total size 15288*/ } persistent_config_s; // end -// this section was generated by config_definition.jar on Sat Apr 04 17:10:30 EDT 2015 +// this section was generated by config_definition.jar on Sat Apr 04 23:34:22 EDT 2015 diff --git a/firmware/controllers/algo/fuel_math.cpp b/firmware/controllers/algo/fuel_math.cpp index 7ae83b7a10..3820712173 100644 --- a/firmware/controllers/algo/fuel_math.cpp +++ b/firmware/controllers/algo/fuel_math.cpp @@ -157,7 +157,7 @@ float getInjectorLag(float vBatt DECLARE_ENGINE_PARAMETER_S) { */ void prepareFuelMap(DECLARE_ENGINE_PARAMETER_F) { fuelMap.init(engineConfiguration->fuelTable, engineConfiguration->fuelLoadBins, engineConfiguration->fuelRpmBins); - fuelPhaseMap.init(engineConfiguration->injectionPhase, engineConfiguration->injPhaseLoadBins, engineConfiguration->injPhaseRpmBins); + fuelPhaseMap.init(config->injectionPhase, config->injPhaseLoadBins, config->injPhaseRpmBins); } /** diff --git a/firmware/controllers/flash_main.h b/firmware/controllers/flash_main.h index 6ad3c0ad25..03283f5e10 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 7612 +#define FLASH_DATA_VERSION 7613 void readFromFlash(void); void initFlash(Logging *sharedLogger, Engine *engine); diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 995d2cfafe..01db4b8165 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -547,7 +547,7 @@ static void setWholeTimingMap(float value) { static void setWholePhaseMapCmd(float value) { scheduleMsg(&logger, "Setting whole injection phase map to %f", value); - setMap(engineConfiguration->injectionPhase, value); + setMap(config->injectionPhase, value); } static void setWholeTimingMapCmd(float value) { diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index ccc56fe1db..a893981b75 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -526,21 +526,20 @@ afr_table_t afrTable; float[FUEL_LOAD_COUNT] afrLoadBins;;"%", 1, 0.0, 0, 300.0, 2 float[FUEL_RPM_COUNT] afrRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2 -fuel_table_t injectionPhase; -float[FUEL_LOAD_COUNT] injPhaseLoadBins;;"Load", 1, 0.0, 0, 300.0, 2 -float[FUEL_RPM_COUNT] injPhaseRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2 - float[IAT_CURVE_SIZE] iatIdleCorrBins;;"C", 1, 0, -100.0, 250.0, 2 float[IAT_CURVE_SIZE] iatIdleCorr;;"%", 1, 0, 0.0, 500.0, 2 +end_struct + +engine_configuration_s engineConfiguration; + ignition_table_t ignitionIatCorrTable; float[IGN_LOAD_COUNT] ignitionIatCorrLoadBins;;"Load", 1, 0.0, 0, 300.0, 2 float[IGN_RPM_COUNT] ignitionIatCorrRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2 - -end_struct - -engine_configuration_s engineConfiguration; +fuel_table_t injectionPhase; +float[FUEL_LOAD_COUNT] injPhaseLoadBins;;"Load", 1, 0.0, 0, 300.0, 2 +float[FUEL_RPM_COUNT] injPhaseRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2 ! ve_table_t ve2Table; ! float[FUEL_LOAD_COUNT] ve2LoadBins;;"%", 1, 0.0, 0, 300.0, 2 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 4c1eae3c3a..92ae16ce1d 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -40,7 +40,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated by ConfigDefinition.jar on Sat Apr 04 14:18:43 EDT 2015 +; this section was generated by ConfigDefinition.jar on Sat Apr 04 23:34:23 EDT 2015 pageSize = 15288 page = 1 @@ -495,14 +495,14 @@ page = 1 afrTable = array, F32, 11704, [16x16],"deg", 1, 0, 0, 25.0, 2 afrLoadBins = array, F32, 12728, [16], "%", 1, 0.0, 0, 300.0, 2 afrRpmBins = array, F32, 12792, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - injectionPhase = array, F32, 12856, [16x16],"ms", 1, 0, 0.0, 300.0, 2 - injPhaseLoadBins = array, F32, 13880, [16], "Load", 1, 0.0, 0, 300.0, 2 - injPhaseRpmBins = array, F32, 13944, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - iatIdleCorrBins = array, F32, 14008, [16], "C", 1, 0, -100.0, 250.0, 2 - iatIdleCorr = array, F32, 14072, [16], "%", 1, 0, 0.0, 500.0, 2 - ignitionIatCorrTable = array, F32, 14136, [16x16],"deg", 1, 0, -360, 360, 2 - ignitionIatCorrLoadBins = array, F32, 15160, [16], "Load", 1, 0.0, 0, 300.0, 2 - ignitionIatCorrRpmBins = array, F32, 15224, [16], "RPM", 1, 0.0, 0, 18000.0, 2 + iatIdleCorrBins = array, F32, 12856, [16], "C", 1, 0, -100.0, 250.0, 2 + iatIdleCorr = array, F32, 12920, [16], "%", 1, 0, 0.0, 500.0, 2 + ignitionIatCorrTable = array, F32, 12984, [16x16],"deg", 1, 0, -360, 360, 2 + ignitionIatCorrLoadBins = array, F32, 14008, [16], "Load", 1, 0.0, 0, 300.0, 2 + ignitionIatCorrRpmBins = array, F32, 14072, [16], "RPM", 1, 0.0, 0, 18000.0, 2 + injectionPhase = array, F32, 14136, [16x16],"ms", 1, 0, 0.0, 300.0, 2 + injPhaseLoadBins = array, F32, 15160, [16], "Load", 1, 0.0, 0, 300.0, 2 + injPhaseRpmBins = array, F32, 15224, [16], "RPM", 1, 0.0, 0, 18000.0, 2 ; total TS size = 15288 ; CONFIG_DEFINITION_END