From a5e4895efdf31646dbaac009c711d959df5ffb6f Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 26 Jun 2017 09:23:26 +0300 Subject: [PATCH] refactoring: better name --- .../controllers/algo/engine_configuration.cpp | 2 +- ...ngine_configuration_generated_structures.h | 6 +- firmware/controllers/algo/rusefi_generated.h | 64 +++++++-------- firmware/controllers/core/fsio_impl.cpp | 8 +- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.ini | 34 ++++---- .../models/src/com/rusefi/config/Fields.java | 78 +++++++++---------- 7 files changed, 97 insertions(+), 97 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index a2df37b0d4..189f2f7903 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -519,7 +519,7 @@ static void setDefaultFsioParameters(DECLARE_ENGINE_PARAMETER_SIGNATURE) { } for (int i = 0; i < FSIO_COMMAND_COUNT; i++) { boardConfiguration->fsioPins[i] = GPIO_UNASSIGNED; - config->le_formulas[i][0] = 0; + config->fsioFormulas[i][0] = 0; boardConfiguration->fsioDigitalInputs[i] = GPIO_UNASSIGNED; engineConfiguration->fsioInputModes[i] = PI_DEFAULT; } diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index e495647562..c00e69581f 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 Mon Jun 26 09:05:40 MSK 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 26 09:15:23 MSK 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1923,7 +1923,7 @@ typedef struct { /** * offset 3048 */ - le_formula_t le_formulas[FSIO_COMMAND_COUNT]; + le_formula_t fsioFormulas[FSIO_COMMAND_COUNT]; /** * offset 6248 */ @@ -2126,4 +2126,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 26 09:05:40 MSK 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 26 09:15:23 MSK 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 458e891ecb..ace2616127 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1436,38 +1436,38 @@ #define auxPid4_maxValue_offset_hex b7e #define unusedEnd_offset 2944 #define unusedEnd_offset_hex b80 -#define le_formulas1_offset 3048 -#define le_formulas1_offset_hex be8 -#define le_formulas2_offset 3248 -#define le_formulas2_offset_hex cb0 -#define le_formulas3_offset 3448 -#define le_formulas3_offset_hex d78 -#define le_formulas4_offset 3648 -#define le_formulas4_offset_hex e40 -#define le_formulas5_offset 3848 -#define le_formulas5_offset_hex f08 -#define le_formulas6_offset 4048 -#define le_formulas6_offset_hex fd0 -#define le_formulas7_offset 4248 -#define le_formulas7_offset_hex 1098 -#define le_formulas8_offset 4448 -#define le_formulas8_offset_hex 1160 -#define le_formulas9_offset 4648 -#define le_formulas9_offset_hex 1228 -#define le_formulas10_offset 4848 -#define le_formulas10_offset_hex 12f0 -#define le_formulas11_offset 5048 -#define le_formulas11_offset_hex 13b8 -#define le_formulas12_offset 5248 -#define le_formulas12_offset_hex 1480 -#define le_formulas13_offset 5448 -#define le_formulas13_offset_hex 1548 -#define le_formulas14_offset 5648 -#define le_formulas14_offset_hex 1610 -#define le_formulas15_offset 5848 -#define le_formulas15_offset_hex 16d8 -#define le_formulas16_offset 6048 -#define le_formulas16_offset_hex 17a0 +#define fsioFormulas1_offset 3048 +#define fsioFormulas1_offset_hex be8 +#define fsioFormulas2_offset 3248 +#define fsioFormulas2_offset_hex cb0 +#define fsioFormulas3_offset 3448 +#define fsioFormulas3_offset_hex d78 +#define fsioFormulas4_offset 3648 +#define fsioFormulas4_offset_hex e40 +#define fsioFormulas5_offset 3848 +#define fsioFormulas5_offset_hex f08 +#define fsioFormulas6_offset 4048 +#define fsioFormulas6_offset_hex fd0 +#define fsioFormulas7_offset 4248 +#define fsioFormulas7_offset_hex 1098 +#define fsioFormulas8_offset 4448 +#define fsioFormulas8_offset_hex 1160 +#define fsioFormulas9_offset 4648 +#define fsioFormulas9_offset_hex 1228 +#define fsioFormulas10_offset 4848 +#define fsioFormulas10_offset_hex 12f0 +#define fsioFormulas11_offset 5048 +#define fsioFormulas11_offset_hex 13b8 +#define fsioFormulas12_offset 5248 +#define fsioFormulas12_offset_hex 1480 +#define fsioFormulas13_offset 5448 +#define fsioFormulas13_offset_hex 1548 +#define fsioFormulas14_offset 5648 +#define fsioFormulas14_offset_hex 1610 +#define fsioFormulas15_offset 5848 +#define fsioFormulas15_offset_hex 16d8 +#define fsioFormulas16_offset 6048 +#define fsioFormulas16_offset_hex 17a0 #define timingMultiplier_offset 6248 #define timingMultiplier_offset_hex 1868 #define timingAdditive_offset 6448 diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp index 2d821c6b14..e85b54d5a4 100644 --- a/firmware/controllers/core/fsio_impl.cpp +++ b/firmware/controllers/core/fsio_impl.cpp @@ -192,7 +192,7 @@ void setFsioExt(int index, brain_pin_e pin, const char * exp, int freq DECLARE_E if (len >= LE_COMMAND_LENGTH) { return; } - strcpy(config->le_formulas[index], exp); + strcpy(config->fsioFormulas[index], exp); boardConfiguration->fsioFrequency[index] = freq; } @@ -206,7 +206,7 @@ void applyFsioConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { brain_pin_e brainPin = boardConfiguration->fsioPins[i]; if (brainPin != GPIO_UNASSIGNED) { - const char *formula = config->le_formulas[i]; + const char *formula = config->fsioFormulas[i]; LEElement *logic = userPool.parseExpression(formula); if (logic == NULL) { warning(CUSTOM_FSIO_PARSING, "parsing [%s]", formula); @@ -429,7 +429,7 @@ static void showFsioInfo(void) { for (int i = 0; i < FSIO_COMMAND_COUNT; i++) { - char * exp = config->le_formulas[i]; + char * exp = config->fsioFormulas[i]; if (exp[0] != 0) { /** * in case of FSIO user interface indexes are starting with 0, the argument for that @@ -486,7 +486,7 @@ static void setFsioExpression(const char *indexStr, const char *quotedLine, Engi } scheduleMsg(logger, "setting user out #%d to [%s]", index + 1, l); - strcpy(engine->config->le_formulas[index], l); + strcpy(engine->config->fsioFormulas[index], l); // this would apply the changes applyFsioConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); showFsioInfo(); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 6e39136f08..a71fd0701c 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -820,7 +820,7 @@ end_struct engine_configuration_s engineConfiguration; -le_formula_t[FSIO_COMMAND_COUNT iterate] le_formulas; +le_formula_t[FSIO_COMMAND_COUNT iterate] fsioFormulas; le_formula_t timingMultiplier; le_formula_t timingAdditive; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index fc81eae448..4d87515c23 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -59,7 +59,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jun 24 02:37:19 MSK 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 26 09:15:23 MSK 2017 pageSize = 16376 page = 1 @@ -723,22 +723,22 @@ page = 1 auxPid4_minValue = scalar, S16, 2940, "", 1, 0, 0, 3000.0, 3 auxPid4_maxValue = scalar, S16, 2942, "", 1, 0, 0, 3000.0, 3 ;skipping unusedEnd offset 2944 - le_formulas1 = array, U08, 3048, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas2 = array, U08, 3248, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas3 = array, U08, 3448, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas4 = array, U08, 3648, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas5 = array, U08, 3848, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas6 = array, U08, 4048, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas7 = array, U08, 4248, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas8 = array, U08, 4448, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas9 = array, U08, 4648, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas10 = array, U08, 4848, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas11 = array, U08, 5048, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas12 = array, U08, 5248, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas13 = array, U08, 5448, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas14 = array, U08, 5648, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas15 = array, U08, 5848, [200],"char", 1, 0, 0.0, 3.0, 2 - le_formulas16 = array, U08, 6048, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas1 = array, U08, 3048, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas2 = array, U08, 3248, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas3 = array, U08, 3448, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas4 = array, U08, 3648, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas5 = array, U08, 3848, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas6 = array, U08, 4048, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas7 = array, U08, 4248, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas8 = array, U08, 4448, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas9 = array, U08, 4648, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas10 = array, U08, 4848, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas11 = array, U08, 5048, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas12 = array, U08, 5248, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas13 = array, U08, 5448, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas14 = array, U08, 5648, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas15 = array, U08, 5848, [200],"char", 1, 0, 0.0, 3.0, 2 + fsioFormulas16 = array, U08, 6048, [200],"char", 1, 0, 0.0, 3.0, 2 timingMultiplier = array, U08, 6248, [200],"char", 1, 0, 0.0, 3.0, 2 timingAdditive = array, U08, 6448, [200],"char", 1, 0, 0.0, 3.0, 2 cltFuelCorrBins = array, F32, 6648, [16], "C", 1, 0, -100.0, 250.0, 2 diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 36a5d278db..8395d9f277 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 Mon Jun 26 09:05:40 MSK 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 26 09:15:23 MSK 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -992,28 +992,28 @@ public class Fields { public static final int auxPid4_minValue_offset = 2940; public static final int auxPid4_maxValue_offset = 2942; public static final int unusedEnd_offset = 2944; - public static final int le_formulas1_offset = 3048; - public static final int le_formulas2_offset = 3248; - public static final int le_formulas3_offset = 3448; - public static final int le_formulas4_offset = 3648; - public static final int le_formulas5_offset = 3848; - public static final int le_formulas6_offset = 4048; - public static final int le_formulas7_offset = 4248; - public static final int le_formulas7_offset_hex = 1098; - public static final int le_formulas8_offset = 4448; - public static final int le_formulas8_offset_hex = 1160; - public static final int le_formulas9_offset = 4648; - public static final int le_formulas9_offset_hex = 1228; - public static final int le_formulas10_offset = 4848; - public static final int le_formulas11_offset = 5048; - public static final int le_formulas12_offset = 5248; - public static final int le_formulas12_offset_hex = 1480; - public static final int le_formulas13_offset = 5448; - public static final int le_formulas13_offset_hex = 1548; - public static final int le_formulas14_offset = 5648; - public static final int le_formulas14_offset_hex = 1610; - public static final int le_formulas15_offset = 5848; - public static final int le_formulas16_offset = 6048; + public static final int fsioFormulas1_offset = 3048; + public static final int fsioFormulas2_offset = 3248; + public static final int fsioFormulas3_offset = 3448; + public static final int fsioFormulas4_offset = 3648; + public static final int fsioFormulas5_offset = 3848; + public static final int fsioFormulas6_offset = 4048; + public static final int fsioFormulas7_offset = 4248; + public static final int fsioFormulas7_offset_hex = 1098; + public static final int fsioFormulas8_offset = 4448; + public static final int fsioFormulas8_offset_hex = 1160; + public static final int fsioFormulas9_offset = 4648; + public static final int fsioFormulas9_offset_hex = 1228; + public static final int fsioFormulas10_offset = 4848; + public static final int fsioFormulas11_offset = 5048; + public static final int fsioFormulas12_offset = 5248; + public static final int fsioFormulas12_offset_hex = 1480; + public static final int fsioFormulas13_offset = 5448; + public static final int fsioFormulas13_offset_hex = 1548; + public static final int fsioFormulas14_offset = 5648; + public static final int fsioFormulas14_offset_hex = 1610; + public static final int fsioFormulas15_offset = 5848; + public static final int fsioFormulas16_offset = 6048; public static final int timingMultiplier_offset = 6248; public static final int timingMultiplier_offset_hex = 1868; public static final int timingAdditive_offset = 6448; @@ -1739,22 +1739,22 @@ public class Fields { public static final Field AUXPID4_PERIOD = Field.create("AUXPID4_PERIOD", 2938, FieldType.INT); public static final Field AUXPID4_MINVALUE = Field.create("AUXPID4_MINVALUE", 2940, FieldType.INT); public static final Field AUXPID4_MAXVALUE = Field.create("AUXPID4_MAXVALUE", 2942, FieldType.INT); - public static final Field LE_FORMULAS1 = Field.create("LE_FORMULAS1", 3048, FieldType.INT); - public static final Field LE_FORMULAS2 = Field.create("LE_FORMULAS2", 3248, FieldType.INT); - public static final Field LE_FORMULAS3 = Field.create("LE_FORMULAS3", 3448, FieldType.INT); - public static final Field LE_FORMULAS4 = Field.create("LE_FORMULAS4", 3648, FieldType.INT); - public static final Field LE_FORMULAS5 = Field.create("LE_FORMULAS5", 3848, FieldType.INT); - public static final Field LE_FORMULAS6 = Field.create("LE_FORMULAS6", 4048, FieldType.INT); - public static final Field LE_FORMULAS7 = Field.create("LE_FORMULAS7", 4248, FieldType.INT); - public static final Field LE_FORMULAS8 = Field.create("LE_FORMULAS8", 4448, FieldType.INT); - public static final Field LE_FORMULAS9 = Field.create("LE_FORMULAS9", 4648, FieldType.INT); - public static final Field LE_FORMULAS10 = Field.create("LE_FORMULAS10", 4848, FieldType.INT); - public static final Field LE_FORMULAS11 = Field.create("LE_FORMULAS11", 5048, FieldType.INT); - public static final Field LE_FORMULAS12 = Field.create("LE_FORMULAS12", 5248, FieldType.INT); - public static final Field LE_FORMULAS13 = Field.create("LE_FORMULAS13", 5448, FieldType.INT); - public static final Field LE_FORMULAS14 = Field.create("LE_FORMULAS14", 5648, FieldType.INT); - public static final Field LE_FORMULAS15 = Field.create("LE_FORMULAS15", 5848, FieldType.INT); - public static final Field LE_FORMULAS16 = Field.create("LE_FORMULAS16", 6048, FieldType.INT); + public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 3048, FieldType.INT); + public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 3248, FieldType.INT); + public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 3448, FieldType.INT); + public static final Field FSIOFORMULAS4 = Field.create("FSIOFORMULAS4", 3648, FieldType.INT); + public static final Field FSIOFORMULAS5 = Field.create("FSIOFORMULAS5", 3848, FieldType.INT); + public static final Field FSIOFORMULAS6 = Field.create("FSIOFORMULAS6", 4048, FieldType.INT); + public static final Field FSIOFORMULAS7 = Field.create("FSIOFORMULAS7", 4248, FieldType.INT); + public static final Field FSIOFORMULAS8 = Field.create("FSIOFORMULAS8", 4448, FieldType.INT); + public static final Field FSIOFORMULAS9 = Field.create("FSIOFORMULAS9", 4648, FieldType.INT); + public static final Field FSIOFORMULAS10 = Field.create("FSIOFORMULAS10", 4848, FieldType.INT); + public static final Field FSIOFORMULAS11 = Field.create("FSIOFORMULAS11", 5048, FieldType.INT); + public static final Field FSIOFORMULAS12 = Field.create("FSIOFORMULAS12", 5248, FieldType.INT); + public static final Field FSIOFORMULAS13 = Field.create("FSIOFORMULAS13", 5448, FieldType.INT); + public static final Field FSIOFORMULAS14 = Field.create("FSIOFORMULAS14", 5648, FieldType.INT); + public static final Field FSIOFORMULAS15 = Field.create("FSIOFORMULAS15", 5848, FieldType.INT); + public static final Field FSIOFORMULAS16 = Field.create("FSIOFORMULAS16", 6048, FieldType.INT); public static final Field TIMINGMULTIPLIER = Field.create("TIMINGMULTIPLIER", 6248, FieldType.INT); public static final Field TIMINGADDITIVE = Field.create("TIMINGADDITIVE", 6448, FieldType.INT); public static final Field IGNITIONIATCORRTABLE = Field.create("IGNITIONIATCORRTABLE", 9208, FieldType.INT);