From 75e6233eaf440764590de654109d660cc5fd4166 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 4 Apr 2015 17:05:11 -0500 Subject: [PATCH] auto-sync --- firmware/console/binary/tunerstudio.cpp | 4 ++-- firmware/controllers/algo/engine_configuration.h | 15 --------------- .../engine_configuration_generated_structures.h | 12 ++++++++++-- firmware/integration/rusefi_config.txt | 12 ++++++++++-- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index 9a68de8284..a36a591e2f 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -180,8 +180,8 @@ char *getWorkingPageAddr(int pageIndex) { switch (pageIndex) { case 0: return (char*) &configWorkingCopy.engineConfiguration; - case 1: - return (char*) &configWorkingCopy.ve2Table; +// case 1: +// return (char*) &configWorkingCopy.ve2Table; // case 2: // return (char*) &configWorkingCopy.fuelTable; // case 3: diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h index 4aa0bcf0c0..3279358cb3 100644 --- a/firmware/controllers/algo/engine_configuration.h +++ b/firmware/controllers/algo/engine_configuration.h @@ -38,21 +38,6 @@ float getRpmMultiplier(operation_mode_e mode); void setOperationMode(engine_configuration_s *engineConfiguration, operation_mode_e mode); -typedef struct { - engine_configuration_s engineConfiguration; - - ve_table_t ve2Table; - /** - * offset 15032 - */ - float ve2LoadBins[FUEL_LOAD_COUNT]; - /** - * offset 15096 - */ - float ve2RpmBins[FUEL_RPM_COUNT]; - -} persistent_config_s; - typedef struct { int version; int size; diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index ed92d4d08a..cdb9d5a741 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 14:18:42 EDT 2015 +// this section was generated by config_definition.jar on Sat Apr 04 17:10:30 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -1242,5 +1242,13 @@ typedef struct { /** total size 15288*/ } engine_configuration_s; +typedef struct { + /** + * offset 0 + */ + engine_configuration_s engineConfiguration; + /** total size 15288*/ +} persistent_config_s; + // end -// this section was generated by config_definition.jar on Sat Apr 04 14:18:42 EDT 2015 +// this section was generated by config_definition.jar on Sat Apr 04 17:10:30 EDT 2015 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 186d7a524a..ccc56fe1db 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -9,7 +9,10 @@ ! all the sub-structures are going to be nested withint the primary structure, that's ! needed to get a proper TunerStudio file -struct engine_configuration_s + +struct persistent_config_s + +struct_no_prefix engine_configuration_s #define MAP_ANGLE_SIZE 8 #define MAP_WINDOW_SIZE 8 @@ -534,8 +537,13 @@ 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; + ! ve_table_t ve2Table; ! float[FUEL_LOAD_COUNT] ve2LoadBins;;"%", 1, 0.0, 0, 300.0, 2 ! float[FUEL_RPM_COUNT] ve2RpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2 -end_struct \ No newline at end of file +end_struct