diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 9390610819..be5c0d3af0 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Apr 04 09:07:06 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Apr 05 11:21:22 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2488,7 +2488,7 @@ struct engine_configuration_s { /** * offset 2416 */ - int nbVvtIndex; + int unusedSomethingWasHere; /** * offset 2420 */ @@ -3258,4 +3258,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Apr 04 09:07:06 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Apr 05 11:21:22 EDT 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index d635f219b0..7744d93e78 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1617,8 +1617,6 @@ #define narrowToWideOxygen_offset_hex 8f8 #define narrowToWideOxygenBins_offset 2264 #define narrowToWideOxygenBins_offset_hex 8d8 -#define nbVvtIndex_offset 2416 -#define nbVvtIndex_offset_hex 970 #define noAccelAfterHardLimitPeriodSecs_offset 1536 #define noAccelAfterHardLimitPeriodSecs_offset_hex 600 #define o2heaterPin_offset 742 @@ -2178,6 +2176,8 @@ #define unusedOldBiquad_offset_hex 91c #define unusedOneMoreHere_offset 760 #define unusedOneMoreHere_offset_hex 2f8 +#define unusedSomethingWasHere_offset 2416 +#define unusedSomethingWasHere_offset_hex 970 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding4_offset_hex a21 #define unusedSpiPadding5_offset 2713 diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 4819ccf96e..3974479042 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -195,8 +195,6 @@ static void setMazdaMiataEngineNB2Defaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) { setCommonNTCSensor(&engineConfiguration->clt, 2700); setCommonNTCSensor(&engineConfiguration->iat, 2700); - engineConfiguration->nbVvtIndex = 0; - engineConfiguration->auxPidFrequency[0] = 300; // VVT solenoid control // set idle_position 35 diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 5ec25830d6..2ca4772058 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -707,6 +707,6 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20200403; + return 20200405; } #endif /* EFI_UNIT_TEST */ diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 2cb8af3465..de16aa96d5 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Apr 04 09:06:52 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Apr 05 11:21:05 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2488,7 +2488,7 @@ struct engine_configuration_s { /** * offset 2416 */ - int nbVvtIndex; + int unusedSomethingWasHere; /** * offset 2420 */ @@ -3258,4 +3258,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Apr 04 09:06:52 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Apr 05 11:21:05 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 1c33971b84..65d157702c 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1617,8 +1617,6 @@ #define narrowToWideOxygen_offset_hex 8f8 #define narrowToWideOxygenBins_offset 2264 #define narrowToWideOxygenBins_offset_hex 8d8 -#define nbVvtIndex_offset 2416 -#define nbVvtIndex_offset_hex 970 #define noAccelAfterHardLimitPeriodSecs_offset 1536 #define noAccelAfterHardLimitPeriodSecs_offset_hex 600 #define o2heaterPin_offset 742 @@ -2178,6 +2176,8 @@ #define unusedOldBiquad_offset_hex 91c #define unusedOneMoreHere_offset 760 #define unusedOneMoreHere_offset_hex 2f8 +#define unusedSomethingWasHere_offset 2416 +#define unusedSomethingWasHere_offset_hex 970 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding4_offset_hex a21 #define unusedSpiPadding5_offset 2713 diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index f735bac272..6a81bccdd1 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -1132,10 +1132,6 @@ static void getValue(const char *paramStr) { scheduleMsg(&logger, "tps_min=%d", engineConfiguration->tpsMin); } else if (strEqualCaseInsensitive(paramStr, "tps_max")) { scheduleMsg(&logger, "tps_max=%d", engineConfiguration->tpsMax); - } else if (strEqualCaseInsensitive(paramStr, "nb_vvt_index")) { - scheduleMsg(&logger, "nb_vvt_index=%d", engineConfiguration->nbVvtIndex); - } else if (strEqualCaseInsensitive(paramStr, "nb_vvt_index")) { - scheduleMsg(&logger, "nb_vvt_index=%d", engineConfiguration->nbVvtIndex); } else if (strEqualCaseInsensitive(paramStr, "global_trigger_offset_angle")) { scheduleMsg(&logger, "global_trigger_offset=%.2f", engineConfiguration->globalTriggerAngleOffset); } else if (strEqualCaseInsensitive(paramStr, "isHip9011Enabled")) { @@ -1350,8 +1346,6 @@ static void setValue(const char *paramStr, const char *valueStr) { engineConfiguration->vvtOffset = valueF; } else if (strEqualCaseInsensitive(paramStr, "vvt_mode")) { engineConfiguration->vvtMode = (vvt_mode_e)valueI; - } else if (strEqualCaseInsensitive(paramStr, "nb_vvt_index")) { - engineConfiguration->nbVvtIndex = valueI; } else if (strEqualCaseInsensitive(paramStr, "operation_mode")) { engineConfiguration->ambiguousOperationMode = (operation_mode_e)valueI; } else if (strEqualCaseInsensitive(paramStr, "wwaeTau")) { diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 41c22ac6d4..696bcb5209 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -88,7 +88,7 @@ void addTriggerEventListener(ShaftPositionListener listener, const char *name, E #define miataNb2VVTRatioFrom (8.50 * 0.75) #define miataNb2VVTRatioTo (14) - +#define miataNbIndex (0) void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt DECLARE_ENGINE_PARAMETER_SUFFIX) { TriggerCentral *tc = &engine->triggerCentral; @@ -180,7 +180,7 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt DECLARE_ENGINE_ /** * NB2 is a symmetrical crank, there are four phases total */ - while (tc->triggerState.getTotalRevolutionCounter() % 4 != engineConfiguration->nbVvtIndex) { + while (tc->triggerState.getTotalRevolutionCounter() % 4 != miataNbIndex) { tc->triggerState.incrementTotalEventCounter(); } } @@ -646,8 +646,7 @@ void onConfigurationChangeTriggerCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) { isConfigurationChanged(vvtMode) || isConfigurationChanged(vvtCamSensorUseRise) || isConfigurationChanged(vvtOffset) || - isConfigurationChanged(vvtDisplayInverted) || - isConfigurationChanged(nbVvtIndex); + isConfigurationChanged(vvtDisplayInverted); if (changed) { assertEngineReference(); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 4e5dfe37f1..a28aa4dddc 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1049,7 +1049,7 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300, uint8_t[20] unusedOldBiquad float[CLT_TIMING_CURVE_SIZE] cltTimingBins;CLT-based timing correction;"C", 1, 0, -100.0, 250.0, 1 float[CLT_TIMING_CURVE_SIZE] cltTimingExtra;;"degree", 1, 0, -400.0, 400.0, 0 - int nbVvtIndex;;"index", 1, 0, 0, 4.0, 0 + int unusedSomethingWasHere; float autoTuneCltThreshold; float autoTuneTpsRocThreshold; float autoTuneTpsQuietPeriod; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 40b21416f3..4767d16101 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Apr 04 09:06:52 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Apr 05 11:21:05 EDT 2020 pageSize = 20000 page = 1 @@ -820,7 +820,7 @@ page = 1 ;no TS info - skipping unusedOldBiquad offset 2332 cltTimingBins = array, F32, 2352, [8], "C", 1, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1, 0, -400.0, 400.0, 0 - nbVvtIndex = scalar, S32, 2416, "index", 1, 0, 0, 4.0, 0 +;no TS info - skipping unusedSomethingWasHere offset 2416 ;no TS info - skipping autoTuneCltThreshold offset 2420 ;no TS info - skipping autoTuneTpsRocThreshold offset 2424 ;no TS info - skipping autoTuneTpsQuietPeriod offset 2428 @@ -2696,7 +2696,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT position display offset", vvtOffset field = "VVT display inverted", vvtDisplayInverted - field = "nbVvtIndex", nbVvtIndex field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 7e88ab374b..bf0acb931a 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1558,7 +1558,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT position display offset", vvtOffset field = "VVT display inverted", vvtDisplayInverted - field = "nbVvtIndex", nbVvtIndex field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index f03585d906..e19a3fecab 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Apr 04 09:06:58 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Apr 05 11:21:12 EDT 2020 pageSize = 20000 page = 1 @@ -820,7 +820,7 @@ page = 1 ;no TS info - skipping unusedOldBiquad offset 2332 cltTimingBins = array, F32, 2352, [8], "C", 1, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1, 0, -400.0, 400.0, 0 - nbVvtIndex = scalar, S32, 2416, "index", 1, 0, 0, 4.0, 0 +;no TS info - skipping unusedSomethingWasHere offset 2416 ;no TS info - skipping autoTuneCltThreshold offset 2420 ;no TS info - skipping autoTuneTpsRocThreshold offset 2424 ;no TS info - skipping autoTuneTpsQuietPeriod offset 2428 @@ -2696,7 +2696,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT position display offset", vvtOffset field = "VVT display inverted", vvtDisplayInverted - field = "nbVvtIndex", nbVvtIndex field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 91717b4a29..55cc3738c3 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Apr 04 09:07:06 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Apr 05 11:21:22 EDT 2020 pageSize = 20000 page = 1 @@ -820,7 +820,7 @@ page = 1 ;no TS info - skipping unusedOldBiquad offset 2332 cltTimingBins = array, F32, 2352, [8], "C", 1, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1, 0, -400.0, 400.0, 0 - nbVvtIndex = scalar, S32, 2416, "index", 1, 0, 0, 4.0, 0 +;no TS info - skipping unusedSomethingWasHere offset 2416 ;no TS info - skipping autoTuneCltThreshold offset 2420 ;no TS info - skipping autoTuneTpsRocThreshold offset 2424 ;no TS info - skipping autoTuneTpsQuietPeriod offset 2428 @@ -2696,7 +2696,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT position display offset", vvtOffset field = "VVT display inverted", vvtDisplayInverted - field = "nbVvtIndex", nbVvtIndex field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 8a14d70c10..6ffd883835 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Apr 04 09:06:55 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Apr 05 11:21:09 EDT 2020 pageSize = 20000 page = 1 @@ -820,7 +820,7 @@ page = 1 ;no TS info - skipping unusedOldBiquad offset 2332 cltTimingBins = array, F32, 2352, [8], "C", 1, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1, 0, -400.0, 400.0, 0 - nbVvtIndex = scalar, S32, 2416, "index", 1, 0, 0, 4.0, 0 +;no TS info - skipping unusedSomethingWasHere offset 2416 ;no TS info - skipping autoTuneCltThreshold offset 2420 ;no TS info - skipping autoTuneTpsRocThreshold offset 2424 ;no TS info - skipping autoTuneTpsQuietPeriod offset 2428 @@ -2688,7 +2688,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT position display offset", vvtOffset field = "VVT display inverted", vvtDisplayInverted - field = "nbVvtIndex", nbVvtIndex field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index c119f23ec0..dc79c6e978 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Apr 04 09:07:00 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Apr 05 11:21:15 EDT 2020 pageSize = 20000 page = 1 @@ -820,7 +820,7 @@ page = 1 ;no TS info - skipping unusedOldBiquad offset 2332 cltTimingBins = array, F32, 2352, [8], "C", 1, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1, 0, -400.0, 400.0, 0 - nbVvtIndex = scalar, S32, 2416, "index", 1, 0, 0, 4.0, 0 +;no TS info - skipping unusedSomethingWasHere offset 2416 ;no TS info - skipping autoTuneCltThreshold offset 2420 ;no TS info - skipping autoTuneTpsRocThreshold offset 2424 ;no TS info - skipping autoTuneTpsQuietPeriod offset 2428 @@ -2692,7 +2692,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT position display offset", vvtOffset field = "VVT display inverted", vvtDisplayInverted - field = "nbVvtIndex", nbVvtIndex field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index dbcac42c60..e820a852db 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Apr 04 09:07:03 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Apr 05 11:21:19 EDT 2020 pageSize = 20000 page = 1 @@ -820,7 +820,7 @@ page = 1 ;no TS info - skipping unusedOldBiquad offset 2332 cltTimingBins = array, F32, 2352, [8], "C", 1, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1, 0, -400.0, 400.0, 0 - nbVvtIndex = scalar, S32, 2416, "index", 1, 0, 0, 4.0, 0 +;no TS info - skipping unusedSomethingWasHere offset 2416 ;no TS info - skipping autoTuneCltThreshold offset 2420 ;no TS info - skipping autoTuneTpsRocThreshold offset 2424 ;no TS info - skipping autoTuneTpsQuietPeriod offset 2428 @@ -2688,7 +2688,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT position display offset", vvtOffset field = "VVT display inverted", vvtDisplayInverted - field = "nbVvtIndex", nbVvtIndex field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 583aea14ec..301f35653f 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Apr 04 09:06:52 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Apr 05 11:21:05 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1067,8 +1067,6 @@ public class Fields { public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; public static final int narrowToWideOxygen_offset = 2296; public static final int narrowToWideOxygenBins_offset = 2264; - public static final int nbVvtIndex_offset = 2416; - public static final int nbVvtIndex_offset_hex = 970; public static final int noAccelAfterHardLimitPeriodSecs_offset = 1536; public static final int noAccelAfterHardLimitPeriodSecs_offset_hex = 600; public static final int o2heaterPin_offset = 742; @@ -1427,6 +1425,8 @@ public class Fields { public static final int unusedFormerWarmupAfrPid_offset = 1774; public static final int unusedOldBiquad_offset = 2332; public static final int unusedOneMoreHere_offset = 760; + public static final int unusedSomethingWasHere_offset = 2416; + public static final int unusedSomethingWasHere_offset_hex = 970; public static final int unusedSpiPadding4_offset = 2593; public static final int unusedSpiPadding5_offset = 2713; public static final int unusedSpiPadding7_offset = 4005; @@ -2213,7 +2213,7 @@ public class Fields { public static final Field STORAGEMODE = Field.create("STORAGEMODE", 2260, FieldType.INT, mass_storage_e); public static final String[] vvt_mode_e = {"First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7"}; public static final Field VVTMODE = Field.create("VVTMODE", 2328, FieldType.INT, vvt_mode_e); - public static final Field NBVVTINDEX = Field.create("NBVVTINDEX", 2416, FieldType.INT); + public static final Field UNUSEDSOMETHINGWASHERE = Field.create("UNUSEDSOMETHINGWASHERE", 2416, FieldType.INT); public static final Field AUTOTUNECLTTHRESHOLD = Field.create("AUTOTUNECLTTHRESHOLD", 2420, FieldType.FLOAT); public static final Field AUTOTUNETPSROCTHRESHOLD = Field.create("AUTOTUNETPSROCTHRESHOLD", 2424, FieldType.FLOAT); public static final Field AUTOTUNETPSQUIETPERIOD = Field.create("AUTOTUNETPSQUIETPERIOD", 2428, FieldType.FLOAT); @@ -3112,7 +3112,7 @@ public class Fields { ALTERNATORPWMFREQUENCY, STORAGEMODE, VVTMODE, - NBVVTINDEX, + UNUSEDSOMETHINGWASHERE, AUTOTUNECLTTHRESHOLD, AUTOTUNETPSROCTHRESHOLD, AUTOTUNETPSQUIETPERIOD,