From 59ad7d73e9846dcbea9ab34776b1beb62a379150 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 29 Nov 2021 22:53:01 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 16 +++++++--------- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 16 +++++++--------- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 16 +++++++--------- .../console/binary/generated/data_logs.ini | 2 +- firmware/console/binary/generated/gauges.ini | 2 +- .../console/binary/ts_outputs_generated.h | 6 +++--- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/generated/rusefi_generated.h | 16 +++++++--------- firmware/tunerstudio/generated/cache.zip | Bin 2197814 -> 2198072 bytes firmware/tunerstudio/generated/rusefi.ini | 4 ++-- .../tunerstudio/generated/rusefi_atlas.ini | 4 ++-- .../generated/rusefi_f429-discovery.ini | 4 ++-- .../generated/rusefi_frankenso_na6.ini | 4 ++-- .../generated/rusefi_hellen-nb1.ini | 4 ++-- .../generated/rusefi_hellen121nissan.ini | 4 ++-- .../generated/rusefi_hellen121vag.ini | 4 ++-- .../generated/rusefi_hellen128mercedes.ini | 4 ++-- .../generated/rusefi_hellen154hyundai.ini | 4 ++-- .../tunerstudio/generated/rusefi_hellen72.ini | 4 ++-- .../generated/rusefi_hellen88bmw.ini | 4 ++-- .../generated/rusefi_hellenNA6.ini | 4 ++-- .../generated/rusefi_hellen_cypress.ini | 4 ++-- .../tunerstudio/generated/rusefi_kinetis.ini | 4 ++-- .../tunerstudio/generated/rusefi_mre_f4.ini | 4 ++-- .../tunerstudio/generated/rusefi_mre_f7.ini | 4 ++-- .../generated/rusefi_prometheus_405.ini | 4 ++-- .../generated/rusefi_prometheus_469.ini | 4 ++-- .../generated/rusefi_proteus_f4.ini | 4 ++-- .../generated/rusefi_proteus_f7.ini | 4 ++-- .../generated/rusefi_subaru_eg33_f7.ini | 4 ++-- .../com/rusefi/config/generated/Fields.java | 16 +++++++--------- java_console/rusefi.xml | 2 +- 35 files changed, 91 insertions(+), 101 deletions(-) diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index e2e283e5a2..cd7d1690b6 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 29 17:53:38 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 29 22:51:37 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4546,4 +4546,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 29 17:53:38 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 29 22:51:37 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 1e30ca61f0..b06e941079 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -632,32 +632,33 @@ #define cylindersCount_offset 400 #define dc_io_size 4 #define DC_PER_STEPPER 2 -#define debug_mode_e_auto_enum "DBG_0", "DBG_TPS_ACCEL", "DBG_GPPWM", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_SOFT_SPARK_CUT", "DBG_VVT_1_PID", "DBG_VVT", "DBG_CRANKING_DETAILS", "DBG_IGNITION_TIMING", "DBG_FUEL_PID_CORRECTION", "DBG_UNUSED12", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_AUX_VALVES", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "UNUSED23", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_ELECTRONIC_THROTTLE_EXTRA", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_35", "DBG_BOOST", "DBG_START_STOP", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_UNUSED41", "DBG_UNUSED_42", "DBG_43", "DBG_DYNO_VIEW", "DBG_LOGIC_ANALYZER", "DBG_RUSEFI_WIDEBAND", "DBG_TCU", "DBG_LUA", "DBG_VVT_2_PID", "DBG_VVT_3_PID", "DBG_VVT_4_PID", "MODE_52", "MODE_53" +#define debug_mode_e_auto_enum "DBG_0", "DBG_TPS_ACCEL", "DBG_GPPWM", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_SOFT_SPARK_CUT", "DBG_VVT_1_PID", "DBG_VVT", "DBG_9", "DBG_10", "DBG_11", "DBG_UNUSED12", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_20", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "UNUSED23", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_29", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_35", "DBG_BOOST", "DBG_37", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_UNUSED41", "DBG_UNUSED_42", "DBG_43", "DBG_DYNO_VIEW", "DBG_LOGIC_ANALYZER", "DBG_RUSEFI_WIDEBAND", "DBG_TCU", "DBG_LUA", "DBG_VVT_2_PID", "DBG_VVT_3_PID", "DBG_VVT_4_PID" #define debug_mode_e_DBG_0 0 +#define debug_mode_e_DBG_10 10 +#define debug_mode_e_DBG_11 11 #define debug_mode_e_DBG_16 16 +#define debug_mode_e_DBG_20 20 +#define debug_mode_e_DBG_29 29 #define debug_mode_e_DBG_34 34 #define debug_mode_e_DBG_35 35 +#define debug_mode_e_DBG_37 37 #define debug_mode_e_DBG_43 43 +#define debug_mode_e_DBG_9 9 #define debug_mode_e_DBG_ANALOG_INPUTS 21 #define debug_mode_e_DBG_ANALOG_INPUTS2 32 -#define debug_mode_e_DBG_AUX_VALVES 20 #define debug_mode_e_DBG_BENCH_TEST 19 #define debug_mode_e_DBG_BOOST 36 #define debug_mode_e_DBG_CAN 26 #define debug_mode_e_DBG_CJ125 25 #define debug_mode_e_DBG_COMPOSITE_LOG 40 -#define debug_mode_e_DBG_CRANKING_DETAILS 9 #define debug_mode_e_DBG_DWELL_METRIC 33 #define debug_mode_e_DBG_DYNO_VIEW 44 #define debug_mode_e_DBG_EL_ACCEL 4 -#define debug_mode_e_DBG_ELECTRONIC_THROTTLE_EXTRA 29 #define debug_mode_e_DBG_ELECTRONIC_THROTTLE_PID 17 #define debug_mode_e_DBG_ETB_AUTOTUNE 39 #define debug_mode_e_DBG_EXECUTOR 18 -#define debug_mode_e_DBG_FUEL_PID_CORRECTION 11 #define debug_mode_e_DBG_GPPWM 2 #define debug_mode_e_DBG_IDLE_CONTROL 3 -#define debug_mode_e_DBG_IGNITION_TIMING 10 #define debug_mode_e_DBG_INSTANT_RPM 22 #define debug_mode_e_DBG_ION 30 #define debug_mode_e_DBG_KNOCK 15 @@ -670,7 +671,6 @@ #define debug_mode_e_DBG_SD_CARD 13 #define debug_mode_e_DBG_SOFT_SPARK_CUT 6 #define debug_mode_e_DBG_SR5_PROTOCOL 14 -#define debug_mode_e_DBG_START_STOP 37 #define debug_mode_e_DBG_STATUS 24 #define debug_mode_e_DBG_TCU 47 #define debug_mode_e_DBG_TLE8888 31 @@ -686,8 +686,6 @@ #define debug_mode_e_DBG_VVT_4_PID 51 #define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "GPPWM", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "Soft Spark Cut", "VVT1 PID", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "INVALID", "SD card", "sr5", "Knock", "Wall Wetting", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "INVALID", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "FSIO_COMPOSITE_LOG", "INVALID", "INVALID", "Injector Compensation", "Dyno_View", "Logic_Analyzer", "rusEFI Wideband", "TCU", "Lua", "VVT2 PID", "VVT3 PID", "VVT4 PID", "mode 52", "mode 53" #define debug_mode_e_Force_4_bytes_size_debug_mode_e ENUM_32_BITS -#define debug_mode_e_MODE_52 52 -#define debug_mode_e_MODE_53 53 #define debug_mode_e_UNUSED23 23 #define debugMapAveraging_offset 807 #define debugMode_offset 2092 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 b6a2c71533..a8a1ef1036 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 kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 29 17:53:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 29 22:51:34 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4540,4 +4540,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 29 17:53:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 29 22:51:34 UTC 2021 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 ab45cadb65..8bf818b804 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -617,32 +617,33 @@ #define cylindersCount_offset 400 #define dc_io_size 4 #define DC_PER_STEPPER 2 -#define debug_mode_e_auto_enum "DBG_0", "DBG_TPS_ACCEL", "DBG_GPPWM", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_SOFT_SPARK_CUT", "DBG_VVT_1_PID", "DBG_VVT", "DBG_CRANKING_DETAILS", "DBG_IGNITION_TIMING", "DBG_FUEL_PID_CORRECTION", "DBG_UNUSED12", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_AUX_VALVES", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "UNUSED23", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_ELECTRONIC_THROTTLE_EXTRA", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_35", "DBG_BOOST", "DBG_START_STOP", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_UNUSED41", "DBG_UNUSED_42", "DBG_43", "DBG_DYNO_VIEW", "DBG_LOGIC_ANALYZER", "DBG_RUSEFI_WIDEBAND", "DBG_TCU", "DBG_LUA", "DBG_VVT_2_PID", "DBG_VVT_3_PID", "DBG_VVT_4_PID", "MODE_52", "MODE_53" +#define debug_mode_e_auto_enum "DBG_0", "DBG_TPS_ACCEL", "DBG_GPPWM", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_SOFT_SPARK_CUT", "DBG_VVT_1_PID", "DBG_VVT", "DBG_9", "DBG_10", "DBG_11", "DBG_UNUSED12", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_20", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "UNUSED23", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_29", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_35", "DBG_BOOST", "DBG_37", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_UNUSED41", "DBG_UNUSED_42", "DBG_43", "DBG_DYNO_VIEW", "DBG_LOGIC_ANALYZER", "DBG_RUSEFI_WIDEBAND", "DBG_TCU", "DBG_LUA", "DBG_VVT_2_PID", "DBG_VVT_3_PID", "DBG_VVT_4_PID" #define debug_mode_e_DBG_0 0 +#define debug_mode_e_DBG_10 10 +#define debug_mode_e_DBG_11 11 #define debug_mode_e_DBG_16 16 +#define debug_mode_e_DBG_20 20 +#define debug_mode_e_DBG_29 29 #define debug_mode_e_DBG_34 34 #define debug_mode_e_DBG_35 35 +#define debug_mode_e_DBG_37 37 #define debug_mode_e_DBG_43 43 +#define debug_mode_e_DBG_9 9 #define debug_mode_e_DBG_ANALOG_INPUTS 21 #define debug_mode_e_DBG_ANALOG_INPUTS2 32 -#define debug_mode_e_DBG_AUX_VALVES 20 #define debug_mode_e_DBG_BENCH_TEST 19 #define debug_mode_e_DBG_BOOST 36 #define debug_mode_e_DBG_CAN 26 #define debug_mode_e_DBG_CJ125 25 #define debug_mode_e_DBG_COMPOSITE_LOG 40 -#define debug_mode_e_DBG_CRANKING_DETAILS 9 #define debug_mode_e_DBG_DWELL_METRIC 33 #define debug_mode_e_DBG_DYNO_VIEW 44 #define debug_mode_e_DBG_EL_ACCEL 4 -#define debug_mode_e_DBG_ELECTRONIC_THROTTLE_EXTRA 29 #define debug_mode_e_DBG_ELECTRONIC_THROTTLE_PID 17 #define debug_mode_e_DBG_ETB_AUTOTUNE 39 #define debug_mode_e_DBG_EXECUTOR 18 -#define debug_mode_e_DBG_FUEL_PID_CORRECTION 11 #define debug_mode_e_DBG_GPPWM 2 #define debug_mode_e_DBG_IDLE_CONTROL 3 -#define debug_mode_e_DBG_IGNITION_TIMING 10 #define debug_mode_e_DBG_INSTANT_RPM 22 #define debug_mode_e_DBG_ION 30 #define debug_mode_e_DBG_KNOCK 15 @@ -655,7 +656,6 @@ #define debug_mode_e_DBG_SD_CARD 13 #define debug_mode_e_DBG_SOFT_SPARK_CUT 6 #define debug_mode_e_DBG_SR5_PROTOCOL 14 -#define debug_mode_e_DBG_START_STOP 37 #define debug_mode_e_DBG_STATUS 24 #define debug_mode_e_DBG_TCU 47 #define debug_mode_e_DBG_TLE8888 31 @@ -671,8 +671,6 @@ #define debug_mode_e_DBG_VVT_4_PID 51 #define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "GPPWM", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "Soft Spark Cut", "VVT1 PID", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "INVALID", "SD card", "sr5", "Knock", "Wall Wetting", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "INVALID", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "FSIO_COMPOSITE_LOG", "INVALID", "INVALID", "Injector Compensation", "Dyno_View", "Logic_Analyzer", "rusEFI Wideband", "TCU", "Lua", "VVT2 PID", "VVT3 PID", "VVT4 PID", "mode 52", "mode 53" #define debug_mode_e_Force_4_bytes_size_debug_mode_e ENUM_32_BITS -#define debug_mode_e_MODE_52 52 -#define debug_mode_e_MODE_53 53 #define debug_mode_e_UNUSED23 23 #define debugMapAveraging_offset 807 #define debugMode_offset 2092 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 249e822b37..fd542ec06b 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:40 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:40 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4546,4 +4546,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:40 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:40 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 977dd130f4..789bf609c7 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -644,32 +644,33 @@ #define cylindersCount_offset 400 #define dc_io_size 4 #define DC_PER_STEPPER 2 -#define debug_mode_e_auto_enum "DBG_0", "DBG_TPS_ACCEL", "DBG_GPPWM", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_SOFT_SPARK_CUT", "DBG_VVT_1_PID", "DBG_VVT", "DBG_CRANKING_DETAILS", "DBG_IGNITION_TIMING", "DBG_FUEL_PID_CORRECTION", "DBG_UNUSED12", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_AUX_VALVES", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "UNUSED23", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_ELECTRONIC_THROTTLE_EXTRA", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_35", "DBG_BOOST", "DBG_START_STOP", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_UNUSED41", "DBG_UNUSED_42", "DBG_43", "DBG_DYNO_VIEW", "DBG_LOGIC_ANALYZER", "DBG_RUSEFI_WIDEBAND", "DBG_TCU", "DBG_LUA", "DBG_VVT_2_PID", "DBG_VVT_3_PID", "DBG_VVT_4_PID", "MODE_52", "MODE_53" +#define debug_mode_e_auto_enum "DBG_0", "DBG_TPS_ACCEL", "DBG_GPPWM", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_SOFT_SPARK_CUT", "DBG_VVT_1_PID", "DBG_VVT", "DBG_9", "DBG_10", "DBG_11", "DBG_UNUSED12", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_20", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "UNUSED23", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_29", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_35", "DBG_BOOST", "DBG_37", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_UNUSED41", "DBG_UNUSED_42", "DBG_43", "DBG_DYNO_VIEW", "DBG_LOGIC_ANALYZER", "DBG_RUSEFI_WIDEBAND", "DBG_TCU", "DBG_LUA", "DBG_VVT_2_PID", "DBG_VVT_3_PID", "DBG_VVT_4_PID" #define debug_mode_e_DBG_0 0 +#define debug_mode_e_DBG_10 10 +#define debug_mode_e_DBG_11 11 #define debug_mode_e_DBG_16 16 +#define debug_mode_e_DBG_20 20 +#define debug_mode_e_DBG_29 29 #define debug_mode_e_DBG_34 34 #define debug_mode_e_DBG_35 35 +#define debug_mode_e_DBG_37 37 #define debug_mode_e_DBG_43 43 +#define debug_mode_e_DBG_9 9 #define debug_mode_e_DBG_ANALOG_INPUTS 21 #define debug_mode_e_DBG_ANALOG_INPUTS2 32 -#define debug_mode_e_DBG_AUX_VALVES 20 #define debug_mode_e_DBG_BENCH_TEST 19 #define debug_mode_e_DBG_BOOST 36 #define debug_mode_e_DBG_CAN 26 #define debug_mode_e_DBG_CJ125 25 #define debug_mode_e_DBG_COMPOSITE_LOG 40 -#define debug_mode_e_DBG_CRANKING_DETAILS 9 #define debug_mode_e_DBG_DWELL_METRIC 33 #define debug_mode_e_DBG_DYNO_VIEW 44 #define debug_mode_e_DBG_EL_ACCEL 4 -#define debug_mode_e_DBG_ELECTRONIC_THROTTLE_EXTRA 29 #define debug_mode_e_DBG_ELECTRONIC_THROTTLE_PID 17 #define debug_mode_e_DBG_ETB_AUTOTUNE 39 #define debug_mode_e_DBG_EXECUTOR 18 -#define debug_mode_e_DBG_FUEL_PID_CORRECTION 11 #define debug_mode_e_DBG_GPPWM 2 #define debug_mode_e_DBG_IDLE_CONTROL 3 -#define debug_mode_e_DBG_IGNITION_TIMING 10 #define debug_mode_e_DBG_INSTANT_RPM 22 #define debug_mode_e_DBG_ION 30 #define debug_mode_e_DBG_KNOCK 15 @@ -682,7 +683,6 @@ #define debug_mode_e_DBG_SD_CARD 13 #define debug_mode_e_DBG_SOFT_SPARK_CUT 6 #define debug_mode_e_DBG_SR5_PROTOCOL 14 -#define debug_mode_e_DBG_START_STOP 37 #define debug_mode_e_DBG_STATUS 24 #define debug_mode_e_DBG_TCU 47 #define debug_mode_e_DBG_TLE8888 31 @@ -698,8 +698,6 @@ #define debug_mode_e_DBG_VVT_4_PID 51 #define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "GPPWM", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "Soft Spark Cut", "VVT1 PID", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "INVALID", "SD card", "sr5", "Knock", "Wall Wetting", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "INVALID", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "FSIO_COMPOSITE_LOG", "INVALID", "INVALID", "Injector Compensation", "Dyno_View", "Logic_Analyzer", "rusEFI Wideband", "TCU", "Lua", "VVT2 PID", "VVT3 PID", "VVT4 PID", "mode 52", "mode 53" #define debug_mode_e_Force_4_bytes_size_debug_mode_e ENUM_32_BITS -#define debug_mode_e_MODE_52 52 -#define debug_mode_e_MODE_53 53 #define debug_mode_e_UNUSED23 23 #define debugMapAveraging_offset 807 #define debugMode_offset 2092 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 314ce2f48e..94ee3f86e4 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -188,7 +188,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant \"MAP\"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 67a0bbf664..3e6b433aa3 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -375,7 +375,7 @@ unused113Gauge = unused113,"unused113", "", -10000.0,10000.0, -10000.0,10000.0, timingCltCorrectionGauge = timingCltCorrection,"timingCltCorrection", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -instantMAPValueGauge = instantMAPValue,"MAP", "kPa", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +instantMAPValueGauge = instantMAPValue,"Instant \\\"MAP\\\"", "kPa", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 mostRecentTimeBetweenSparkEventsGauge = mostRecentTimeBetweenSparkEvents,"mostRecentTimeBetweenSparkEvents", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 mostRecentTimeBetweenIgnitionEventsGauge = mostRecentTimeBetweenIgnitionEvents,"mostRecentTimeBetweenIgnitionEvents", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 maxLockedDurationGauge = maxLockedDuration,"maxLockedDuration", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index bc39979751..64aa4ae153 100644 --- a/firmware/console/binary/ts_outputs_generated.h +++ b/firmware/console/binary/ts_outputs_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Nov 29 17:52:38 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Nov 29 22:50:38 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -857,7 +857,7 @@ struct ts_outputs_s { */ scaled_channel timingPidCorrection = (uint16_t)0; /** - * @@GAUGE_NAME_MAP@@ + * Instant @@GAUGE_NAME_MAP@@ kPa * offset 514 */ @@ -966,4 +966,4 @@ struct ts_outputs_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Nov 29 17:52:38 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Nov 29 22:50:38 UTC 2021 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index bd2ddf3459..7a4f1ed078 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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:32 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:31 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4546,4 +4546,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:32 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:31 UTC 2021 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index ab3dac4b6d..e278f25b48 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -632,32 +632,33 @@ #define cylindersCount_offset 400 #define dc_io_size 4 #define DC_PER_STEPPER 2 -#define debug_mode_e_auto_enum "DBG_0", "DBG_TPS_ACCEL", "DBG_GPPWM", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_SOFT_SPARK_CUT", "DBG_VVT_1_PID", "DBG_VVT", "DBG_CRANKING_DETAILS", "DBG_IGNITION_TIMING", "DBG_FUEL_PID_CORRECTION", "DBG_UNUSED12", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_AUX_VALVES", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "UNUSED23", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_ELECTRONIC_THROTTLE_EXTRA", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_35", "DBG_BOOST", "DBG_START_STOP", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_UNUSED41", "DBG_UNUSED_42", "DBG_43", "DBG_DYNO_VIEW", "DBG_LOGIC_ANALYZER", "DBG_RUSEFI_WIDEBAND", "DBG_TCU", "DBG_LUA", "DBG_VVT_2_PID", "DBG_VVT_3_PID", "DBG_VVT_4_PID", "MODE_52", "MODE_53" +#define debug_mode_e_auto_enum "DBG_0", "DBG_TPS_ACCEL", "DBG_GPPWM", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_SOFT_SPARK_CUT", "DBG_VVT_1_PID", "DBG_VVT", "DBG_9", "DBG_10", "DBG_11", "DBG_UNUSED12", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_20", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "UNUSED23", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_29", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_35", "DBG_BOOST", "DBG_37", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_UNUSED41", "DBG_UNUSED_42", "DBG_43", "DBG_DYNO_VIEW", "DBG_LOGIC_ANALYZER", "DBG_RUSEFI_WIDEBAND", "DBG_TCU", "DBG_LUA", "DBG_VVT_2_PID", "DBG_VVT_3_PID", "DBG_VVT_4_PID" #define debug_mode_e_DBG_0 0 +#define debug_mode_e_DBG_10 10 +#define debug_mode_e_DBG_11 11 #define debug_mode_e_DBG_16 16 +#define debug_mode_e_DBG_20 20 +#define debug_mode_e_DBG_29 29 #define debug_mode_e_DBG_34 34 #define debug_mode_e_DBG_35 35 +#define debug_mode_e_DBG_37 37 #define debug_mode_e_DBG_43 43 +#define debug_mode_e_DBG_9 9 #define debug_mode_e_DBG_ANALOG_INPUTS 21 #define debug_mode_e_DBG_ANALOG_INPUTS2 32 -#define debug_mode_e_DBG_AUX_VALVES 20 #define debug_mode_e_DBG_BENCH_TEST 19 #define debug_mode_e_DBG_BOOST 36 #define debug_mode_e_DBG_CAN 26 #define debug_mode_e_DBG_CJ125 25 #define debug_mode_e_DBG_COMPOSITE_LOG 40 -#define debug_mode_e_DBG_CRANKING_DETAILS 9 #define debug_mode_e_DBG_DWELL_METRIC 33 #define debug_mode_e_DBG_DYNO_VIEW 44 #define debug_mode_e_DBG_EL_ACCEL 4 -#define debug_mode_e_DBG_ELECTRONIC_THROTTLE_EXTRA 29 #define debug_mode_e_DBG_ELECTRONIC_THROTTLE_PID 17 #define debug_mode_e_DBG_ETB_AUTOTUNE 39 #define debug_mode_e_DBG_EXECUTOR 18 -#define debug_mode_e_DBG_FUEL_PID_CORRECTION 11 #define debug_mode_e_DBG_GPPWM 2 #define debug_mode_e_DBG_IDLE_CONTROL 3 -#define debug_mode_e_DBG_IGNITION_TIMING 10 #define debug_mode_e_DBG_INSTANT_RPM 22 #define debug_mode_e_DBG_ION 30 #define debug_mode_e_DBG_KNOCK 15 @@ -670,7 +671,6 @@ #define debug_mode_e_DBG_SD_CARD 13 #define debug_mode_e_DBG_SOFT_SPARK_CUT 6 #define debug_mode_e_DBG_SR5_PROTOCOL 14 -#define debug_mode_e_DBG_START_STOP 37 #define debug_mode_e_DBG_STATUS 24 #define debug_mode_e_DBG_TCU 47 #define debug_mode_e_DBG_TLE8888 31 @@ -686,8 +686,6 @@ #define debug_mode_e_DBG_VVT_4_PID 51 #define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "GPPWM", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "Soft Spark Cut", "VVT1 PID", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "INVALID", "SD card", "sr5", "Knock", "Wall Wetting", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "INVALID", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "FSIO_COMPOSITE_LOG", "INVALID", "INVALID", "Injector Compensation", "Dyno_View", "Logic_Analyzer", "rusEFI Wideband", "TCU", "Lua", "VVT2 PID", "VVT3 PID", "VVT4 PID", "mode 52", "mode 53" #define debug_mode_e_Force_4_bytes_size_debug_mode_e ENUM_32_BITS -#define debug_mode_e_MODE_52 52 -#define debug_mode_e_MODE_53 53 #define debug_mode_e_UNUSED23 23 #define debugMapAveraging_offset 807 #define debugMode_offset 2092 diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 594e95d441fc4b4ce76fcbb91b8b61b9008537e6..64533ea15cce708bac304424e809a186c67480ca 100644 GIT binary patch delta 67043 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 delta 67031 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 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 2635850d2a..6aba199ed4 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:32 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:31 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 045a94eab0..b13f8fa16e 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:29 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:28 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index a60004ad8e..2a699e14fd 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:52:40 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:50:41 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 00c17eef3d..2c758c4f2d 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:14 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:13 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 47a53c39ed..ea29dabf67 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:02 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:01 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index ba88594674..3e51be6f1d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:52:49 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:50:49 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index a035091cf8..5def19b8e9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:52:46 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:50:46 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index d30400ad2d..0a89ad05c8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:52:43 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:50:44 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 4c1afceb87..ce01e12c5a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:52:53 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:50:52 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index d8b7cd4c13..9e1adbee12 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:52:59 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:50:58 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index cec8056f2d..29beddd248 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:52:56 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:50:55 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 27596345c7..57566ef852 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:05 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:04 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index b6b99e308b..77b66cda5f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -85,7 +85,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 29 17:53:38 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 29 22:51:37 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 1ef8b9246a..8b5bc61e6e 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -85,7 +85,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 kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 29 17:53:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 29 22:51:34 UTC 2021 pageSize = 19972 page = 1 @@ -3388,7 +3388,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index be54e1f529..0bafef2ee1 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:11 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:10 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 334a70eeda..683b56e2ff 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:08 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:07 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index a95feffe9b..3f382deab1 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:20 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:19 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index a770bcb292..4aecb69d06 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:17 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:16 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 15d09f5269..54f6dae34e 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:26 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:25 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 6534ef3cfe..34d8178416 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -85,7 +85,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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:23 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:22 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index ff3a64d3d1..1947819aa2 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -85,7 +85,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 config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:40 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:40 UTC 2021 pageSize = 20000 page = 1 @@ -3422,7 +3422,7 @@ entry = fallbackMap, "fallbackMap", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" -entry = instantMAPValue, "MAP", float, "%.3f" +entry = instantMAPValue, "Instant "MAP"", float, "%.3f" entry = mostRecentTimeBetweenSparkEvents, "mostRecentTimeBetweenSparkEvents", int, "%d" entry = mostRecentTimeBetweenIgnitionEvents, "mostRecentTimeBetweenIgnitionEvents", int, "%d" entry = maxLockedDuration, "maxLockedDuration", int, "%d" diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index d8ce9563b1..85950c5b09 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/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 gen_config.sh integration/rusefi_config.txt Mon Nov 29 17:53:32 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 22:51:31 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -613,30 +613,31 @@ public class Fields { public static final int dc_io_size = 4; public static final int DC_PER_STEPPER = 2; public static final int debug_mode_e_DBG_0 = 0; + public static final int debug_mode_e_DBG_10 = 10; + public static final int debug_mode_e_DBG_11 = 11; public static final int debug_mode_e_DBG_16 = 16; + public static final int debug_mode_e_DBG_20 = 20; + public static final int debug_mode_e_DBG_29 = 29; public static final int debug_mode_e_DBG_34 = 34; public static final int debug_mode_e_DBG_35 = 35; + public static final int debug_mode_e_DBG_37 = 37; public static final int debug_mode_e_DBG_43 = 43; + public static final int debug_mode_e_DBG_9 = 9; public static final int debug_mode_e_DBG_ANALOG_INPUTS = 21; public static final int debug_mode_e_DBG_ANALOG_INPUTS2 = 32; - public static final int debug_mode_e_DBG_AUX_VALVES = 20; public static final int debug_mode_e_DBG_BENCH_TEST = 19; public static final int debug_mode_e_DBG_BOOST = 36; public static final int debug_mode_e_DBG_CAN = 26; public static final int debug_mode_e_DBG_CJ125 = 25; public static final int debug_mode_e_DBG_COMPOSITE_LOG = 40; - public static final int debug_mode_e_DBG_CRANKING_DETAILS = 9; public static final int debug_mode_e_DBG_DWELL_METRIC = 33; public static final int debug_mode_e_DBG_DYNO_VIEW = 44; public static final int debug_mode_e_DBG_EL_ACCEL = 4; - public static final int debug_mode_e_DBG_ELECTRONIC_THROTTLE_EXTRA = 29; public static final int debug_mode_e_DBG_ELECTRONIC_THROTTLE_PID = 17; public static final int debug_mode_e_DBG_ETB_AUTOTUNE = 39; public static final int debug_mode_e_DBG_EXECUTOR = 18; - public static final int debug_mode_e_DBG_FUEL_PID_CORRECTION = 11; public static final int debug_mode_e_DBG_GPPWM = 2; public static final int debug_mode_e_DBG_IDLE_CONTROL = 3; - public static final int debug_mode_e_DBG_IGNITION_TIMING = 10; public static final int debug_mode_e_DBG_INSTANT_RPM = 22; public static final int debug_mode_e_DBG_ION = 30; public static final int debug_mode_e_DBG_KNOCK = 15; @@ -649,7 +650,6 @@ public class Fields { public static final int debug_mode_e_DBG_SD_CARD = 13; public static final int debug_mode_e_DBG_SOFT_SPARK_CUT = 6; public static final int debug_mode_e_DBG_SR5_PROTOCOL = 14; - public static final int debug_mode_e_DBG_START_STOP = 37; public static final int debug_mode_e_DBG_STATUS = 24; public static final int debug_mode_e_DBG_TCU = 47; public static final int debug_mode_e_DBG_TLE8888 = 31; @@ -663,8 +663,6 @@ public class Fields { public static final int debug_mode_e_DBG_VVT_2_PID = 49; public static final int debug_mode_e_DBG_VVT_3_PID = 50; public static final int debug_mode_e_DBG_VVT_4_PID = 51; - public static final int debug_mode_e_MODE_52 = 52; - public static final int debug_mode_e_MODE_53 = 53; public static final int debug_mode_e_UNUSED23 = 23; public static final int debugMapAveraging_offset = 807; public static final int debugMode_offset = 2092; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 83396678d6..caf4de2cb1 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +