From 2d9f734a8f87689c22c1a00e126220c783c65f9e Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Fri, 19 Aug 2022 03:08:33 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 11 ++-- .../controllers/algo/rusefi_generated.h | 10 +-- ...ngine_configuration_generated_structures.h | 11 ++-- .../controllers/algo/rusefi_generated.h | 10 +-- ...ngine_configuration_generated_structures.h | 11 ++-- .../controllers/algo/rusefi_generated.h | 10 +-- .../console/binary/generated/data_logs.ini | 3 +- .../binary/generated/fancy_content.ini | 4 +- .../binary/generated/output_channels.ini | 43 ++++++------- .../console/binary/generated/sensors.java | 39 ++++++----- .../generated/total_live_data_generated.h | 2 +- .../actuators/idle_state_generated.h | 15 ++--- ...ngine_configuration_generated_structures.h | 11 ++-- .../controllers/generated/rusefi_generated.h | 10 +-- .../controllers/generated/signature_48way.h | 4 +- .../controllers/generated/signature_all.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../controllers/generated/signature_core8.h | 4 +- .../controllers/generated/signature_cypress.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_harley81.h | 4 +- .../generated/signature_hellen-gm-e67.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- .../lua/generated/value_lookup_generated.cpp | 8 +++ firmware/tunerstudio/generated/rusefi.ini | 64 +++++++++---------- .../tunerstudio/generated/rusefi_48way.ini | 64 +++++++++---------- .../generated/rusefi_alphax-2chan.ini | 64 +++++++++---------- .../generated/rusefi_alphax-4chan.ini | 64 +++++++++---------- .../tunerstudio/generated/rusefi_atlas.ini | 64 +++++++++---------- .../tunerstudio/generated/rusefi_core8.ini | 64 +++++++++---------- .../tunerstudio/generated/rusefi_cypress.ini | 64 +++++++++---------- .../generated/rusefi_f407-discovery.ini | 64 +++++++++---------- .../generated/rusefi_f429-discovery.ini | 64 +++++++++---------- .../generated/rusefi_frankenso_na6.ini | 64 +++++++++---------- .../tunerstudio/generated/rusefi_harley81.ini | 64 +++++++++---------- .../generated/rusefi_hellen-gm-e67.ini | 64 +++++++++---------- .../generated/rusefi_hellen-nb1.ini | 64 +++++++++---------- .../generated/rusefi_hellen121nissan.ini | 64 +++++++++---------- .../generated/rusefi_hellen121vag.ini | 64 +++++++++---------- .../generated/rusefi_hellen128mercedes.ini | 64 +++++++++---------- .../generated/rusefi_hellen154hyundai.ini | 64 +++++++++---------- .../tunerstudio/generated/rusefi_hellen72.ini | 64 +++++++++---------- .../tunerstudio/generated/rusefi_hellen81.ini | 64 +++++++++---------- .../generated/rusefi_hellen88bmw.ini | 64 +++++++++---------- .../generated/rusefi_hellenNA6.ini | 64 +++++++++---------- .../generated/rusefi_hellenNA8_96.ini | 64 +++++++++---------- firmware/tunerstudio/generated/rusefi_kin.ini | 64 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f4.ini | 64 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f7.ini | 64 +++++++++---------- .../generated/rusefi_prometheus_405.ini | 64 +++++++++---------- .../generated/rusefi_prometheus_469.ini | 64 +++++++++---------- .../generated/rusefi_proteus_f4.ini | 64 +++++++++---------- .../generated/rusefi_proteus_f7.ini | 64 +++++++++---------- .../generated/rusefi_proteus_h7.ini | 64 +++++++++---------- .../generated/rusefi_subaru_eg33_f7.ini | 64 +++++++++---------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 64 +++++++++---------- .../com/rusefi/config/generated/Fields.java | 19 +++--- .../rusefi/config/generated/IdleState.java | 8 +-- 81 files changed, 1172 insertions(+), 1229 deletions(-) diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 24161d570d..b06a5d9b08 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/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 Wed Aug 17 03:00:20 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Aug 19 03:07:37 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1130,9 +1130,11 @@ struct engine_configuration_s { */ trigger_config_s trigger; /** + * Extra air taper amount + % * offset 480 */ - int unused460; + float airByRpmTaper; /** * offset 484 */ @@ -2778,9 +2780,10 @@ struct engine_configuration_s { */ Gpio triggerInputDebugPins[TRIGGER_INPUT_PIN_COUNT]; /** + * RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0 * offset 1472 */ - uint16_t unused1452; + int16_t airTaperRpmRange; /** * offset 1474 */ @@ -4946,4 +4949,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21300); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Aug 17 03:00:20 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Aug 19 03:07:37 UTC 2022 diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index 694c801d6b..62a9e03a1d 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -72,6 +72,8 @@ #define air_pressure_sensor_type_e_MT_MPXH6400 14 #define air_pressure_sensor_type_e_MT_SUBY_DENSO 5 #define air_pressure_sensor_type_e_MT_TOYOTA_89420_02010 8 +#define airByRpmTaper_offset 480 +#define airTaperRpmRange_offset 1472 #define alignEngineSnifferAtTDC_offset 764 #define alternatorControl_dFactor_offset 1436 #define alternatorControl_iFactor_offset 1432 @@ -1939,7 +1941,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1234869343 +#define SIGNATURE_HASH 2178032719 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2494,12 +2496,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.19.cypress.1234869343" +#define TS_SIGNATURE "rusEFI 2022.08.19.cypress.2178032719" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1208 +#define TS_TOTAL_OUTPUT_SIZE 1204 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 @@ -2534,10 +2536,8 @@ #define unused1128_offset 1628 #define unused1129_offset 1628 #define unused1130_offset 1628 -#define unused1452_offset 1472 #define unused1740b2_offset 1628 #define unused4080_offset 3121 -#define unused460_offset 480 #define unused962_offset 1040 #define unused_1484_bit_27_offset 1372 #define unused_1484_bit_29_offset 1372 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 9fb4b4a311..6093893ce5 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 Wed Aug 17 03:00:18 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Aug 19 03:07:35 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1130,9 +1130,11 @@ struct engine_configuration_s { */ trigger_config_s trigger; /** + * Extra air taper amount + % * offset 480 */ - int unused460; + float airByRpmTaper; /** * offset 484 */ @@ -2778,9 +2780,10 @@ struct engine_configuration_s { */ Gpio triggerInputDebugPins[TRIGGER_INPUT_PIN_COUNT]; /** + * RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0 * offset 1472 */ - uint16_t unused1452; + int16_t airTaperRpmRange; /** * offset 1474 */ @@ -4946,4 +4949,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21300); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 17 03:00:18 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Aug 19 03:07:35 UTC 2022 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 47d600e016..088c04a902 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -72,6 +72,8 @@ #define air_pressure_sensor_type_e_MT_MPXH6400 14 #define air_pressure_sensor_type_e_MT_SUBY_DENSO 5 #define air_pressure_sensor_type_e_MT_TOYOTA_89420_02010 8 +#define airByRpmTaper_offset 480 +#define airTaperRpmRange_offset 1472 #define alignEngineSnifferAtTDC_offset 764 #define alternatorControl_dFactor_offset 1436 #define alternatorControl_iFactor_offset 1432 @@ -1939,7 +1941,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 558710419 +#define SIGNATURE_HASH 3909453443 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2494,12 +2496,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.19.kin.558710419" +#define TS_SIGNATURE "rusEFI 2022.08.19.kin.3909453443" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1208 +#define TS_TOTAL_OUTPUT_SIZE 1204 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 @@ -2534,10 +2536,8 @@ #define unused1128_offset 1628 #define unused1129_offset 1628 #define unused1130_offset 1628 -#define unused1452_offset 1472 #define unused1740b2_offset 1628 #define unused4080_offset 3121 -#define unused460_offset 480 #define unused962_offset 1040 #define unused_1484_bit_27_offset 1372 #define unused_1484_bit_29_offset 1372 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 f46aa357bf..46a3c439e0 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_subaru_config.sh integration/rusefi_config.txt Wed Aug 17 03:00:21 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:38 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1130,9 +1130,11 @@ struct engine_configuration_s { */ trigger_config_s trigger; /** + * Extra air taper amount + % * offset 480 */ - int unused460; + float airByRpmTaper; /** * offset 484 */ @@ -2778,9 +2780,10 @@ struct engine_configuration_s { */ Gpio triggerInputDebugPins[TRIGGER_INPUT_PIN_COUNT]; /** + * RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0 * offset 1472 */ - uint16_t unused1452; + int16_t airTaperRpmRange; /** * offset 1474 */ @@ -4946,4 +4949,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21300); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Aug 17 03:00:21 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:38 UTC 2022 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 220dc4533f..d07afcbb2f 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 @@ -81,6 +81,8 @@ #define air_pressure_sensor_type_e_MT_MPXH6400 14 #define air_pressure_sensor_type_e_MT_SUBY_DENSO 5 #define air_pressure_sensor_type_e_MT_TOYOTA_89420_02010 8 +#define airByRpmTaper_offset 480 +#define airTaperRpmRange_offset 1472 #define alignEngineSnifferAtTDC_offset 764 #define alternatorControl_dFactor_offset 1436 #define alternatorControl_iFactor_offset 1432 @@ -1905,7 +1907,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 128396263 +#define SIGNATURE_HASH 3488584695 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2461,12 +2463,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.19.subaru_eg33_f7.128396263" +#define TS_SIGNATURE "rusEFI 2022.08.19.subaru_eg33_f7.3488584695" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1208 +#define TS_TOTAL_OUTPUT_SIZE 1204 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 @@ -2501,10 +2503,8 @@ #define unused1128_offset 1628 #define unused1129_offset 1628 #define unused1130_offset 1628 -#define unused1452_offset 1472 #define unused1740b2_offset 1628 #define unused4080_offset 3121 -#define unused460_offset 480 #define unused962_offset 1040 #define unused_1484_bit_27_offset 1372 #define unused_1484_bit_29_offset 1372 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 3916e27291..0b1e7ce839 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -433,8 +433,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index c07e25c277..6288c1e05a 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -255,9 +255,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 122e336c63..3c0d275b0f 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -1011,25 +1011,24 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index b55b71ebb6..ecb1d44197 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -465,23 +465,22 @@ iacByTpsTaper("idle: iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUT throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1132, 1.0, -1.0, -1.0, ""), targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1140, 1.0, -1.0, -1.0, ""), targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1144, 1.0, -1.0, -1.0, ""), -airTaperRpmRange("RPM range above upper limit for extra air taper", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -1.0, -1.0, ""), -airByRpmTaper("Extra air taper amount", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1152, 1.0, -1.0, -1.0, ""), -baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1156, 1.0, -1.0, -1.0, ""), -dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1160, 1.0, -1.0, -1.0, ""), -luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1164, 1.0, -1.0, -1.0, ""), -luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), -idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), -trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), -luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -10000.0, 10000.0, "%"), -faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1196, 1.0, -1.0, -1.0, ""), -heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1197, 1.0, 0.0, 100.0, "%"), -pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1198, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1199, 1.0, -20.0, 100.0, "units"), -tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1200, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1202, 0.001, 0.0, 1.0, "V"), -esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1204, 1.0, -1.0, -1.0, ""), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1206, 1.0, -20.0, 100.0, "units"), +iacByRpmTaper("idle: iacByRpmTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -1.0, -1.0, ""), +baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1152, 1.0, -1.0, -1.0, ""), +dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1156, 1.0, -1.0, -1.0, ""), +luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1160, 1.0, -1.0, -1.0, ""), +luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1164, 1.0, -1.0, -1.0, ""), +idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), +trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), +luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -10000.0, 10000.0, "%"), +faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1192, 1.0, -1.0, -1.0, ""), +heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1193, 1.0, 0.0, 100.0, "%"), +pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1194, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1195, 1.0, -20.0, 100.0, "units"), +tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1196, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1198, 0.001, 0.0, 1.0, "V"), +esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1200, 1.0, -1.0, -1.0, ""), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1202, 1.0, -20.0, 100.0, "units"), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index 479ebb926b..d971633eb9 100644 --- a/firmware/console/binary/generated/total_live_data_generated.h +++ b/firmware/console/binary/generated/total_live_data_generated.h @@ -1,2 +1,2 @@ // generated by gen_live_documentation.sh / UsagesReader.java -#define TS_TOTAL_OUTPUT_SIZE 1208 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1204 \ No newline at end of file diff --git a/firmware/controllers/actuators/idle_state_generated.h b/firmware/controllers/actuators/idle_state_generated.h index e338b375a5..13bca4fce9 100644 --- a/firmware/controllers/actuators/idle_state_generated.h +++ b/firmware/controllers/actuators/idle_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Wed Aug 10 05:43:37 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Fri Aug 19 03:07:34 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -151,17 +151,12 @@ struct idle_state_s { */ int targetRpmAcBump = (int)0; /** - * RPM range above upper limit for extra air taper + * idle: iacByRpmTaper portion of idle * offset 32 */ - int airTaperRpmRange = (int)0; - /** - * Extra air taper amount - * offset 36 - */ - percent_t airByRpmTaper = (percent_t)0; + percent_t iacByRpmTaper = (percent_t)0; }; -static_assert(sizeof(idle_state_s) == 40); +static_assert(sizeof(idle_state_s) == 36); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Wed Aug 10 05:43:37 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Fri Aug 19 03:07:34 UTC 2022 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 5c071eb7f3..1d67edac58 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 Wed Aug 17 03:01:11 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:26 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1130,9 +1130,11 @@ struct engine_configuration_s { */ trigger_config_s trigger; /** + * Extra air taper amount + % * offset 480 */ - int unused460; + float airByRpmTaper; /** * offset 484 */ @@ -2778,9 +2780,10 @@ struct engine_configuration_s { */ Gpio triggerInputDebugPins[TRIGGER_INPUT_PIN_COUNT]; /** + * RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0 * offset 1472 */ - uint16_t unused1452; + int16_t airTaperRpmRange; /** * offset 1474 */ @@ -4946,4 +4949,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21300); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 17 03:01:11 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:26 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 01991de0a2..ee686099e7 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -72,6 +72,8 @@ #define air_pressure_sensor_type_e_MT_MPXH6400 14 #define air_pressure_sensor_type_e_MT_SUBY_DENSO 5 #define air_pressure_sensor_type_e_MT_TOYOTA_89420_02010 8 +#define airByRpmTaper_offset 480 +#define airTaperRpmRange_offset 1472 #define alignEngineSnifferAtTDC_offset 764 #define alternatorControl_dFactor_offset 1436 #define alternatorControl_iFactor_offset 1432 @@ -1939,7 +1941,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1234869343 +#define SIGNATURE_HASH 2178032719 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2494,12 +2496,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.19.all.1234869343" +#define TS_SIGNATURE "rusEFI 2022.08.19.all.2178032719" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1208 +#define TS_TOTAL_OUTPUT_SIZE 1204 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 @@ -2534,10 +2536,8 @@ #define unused1128_offset 1628 #define unused1129_offset 1628 #define unused1130_offset 1628 -#define unused1452_offset 1472 #define unused1740b2_offset 1628 #define unused4080_offset 3121 -#define unused460_offset 480 #define unused962_offset 1040 #define unused_1484_bit_27_offset 1372 #define unused_1484_bit_29_offset 1372 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index e8d79fe204..92e536f460 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1589482512 -#define TS_SIGNATURE "rusEFI 2022.08.19.48way.1589482512" +#define SIGNATURE_HASH 2532649984 +#define TS_SIGNATURE "rusEFI 2022.08.19.48way.2532649984" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 89eb507713..b59dcdfb92 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1234869343 -#define TS_SIGNATURE "rusEFI 2022.08.19.all.1234869343" +#define SIGNATURE_HASH 2178032719 +#define TS_SIGNATURE "rusEFI 2022.08.19.all.2178032719" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index a44e2b3d80..f057de3278 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2072510771 -#define TS_SIGNATURE "rusEFI 2022.08.19.alphax-2chan.2072510771" +#define SIGNATURE_HASH 3015751971 +#define TS_SIGNATURE "rusEFI 2022.08.19.alphax-2chan.3015751971" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index e667fade9c..653b08c305 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2970627480 -#define TS_SIGNATURE "rusEFI 2022.08.19.alphax-4chan.2970627480" +#define SIGNATURE_HASH 2035848584 +#define TS_SIGNATURE "rusEFI 2022.08.19.alphax-4chan.2035848584" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index ff44924c75..613dda10c8 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1431333240 -#define TS_SIGNATURE "rusEFI 2022.08.19.atlas.1431333240" +#define SIGNATURE_HASH 2635649384 +#define TS_SIGNATURE "rusEFI 2022.08.19.atlas.2635649384" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index be22d19849..5c6eb7e49a 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3212234150 -#define TS_SIGNATURE "rusEFI 2022.08.19.core8.3212234150" +#define SIGNATURE_HASH 2000582070 +#define TS_SIGNATURE "rusEFI 2022.08.19.core8.2000582070" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index da7029f971..3a2837d24c 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 1234869343 -#define TS_SIGNATURE "rusEFI 2022.08.19.cypress.1234869343" +#define SIGNATURE_HASH 2178032719 +#define TS_SIGNATURE "rusEFI 2022.08.19.cypress.2178032719" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 1128142b86..478f6ed734 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1234869343 -#define TS_SIGNATURE "rusEFI 2022.08.19.f407-discovery.1234869343" +#define SIGNATURE_HASH 2178032719 +#define TS_SIGNATURE "rusEFI 2022.08.19.f407-discovery.2178032719" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 1d5bc3e539..65d2eeef1c 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1234869343 -#define TS_SIGNATURE "rusEFI 2022.08.19.f429-discovery.1234869343" +#define SIGNATURE_HASH 2178032719 +#define TS_SIGNATURE "rusEFI 2022.08.19.f429-discovery.2178032719" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 2f2169dd8e..d4af97ab22 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 200695963 -#define TS_SIGNATURE "rusEFI 2022.08.19.frankenso_na6.200695963" +#define SIGNATURE_HASH 3284064395 +#define TS_SIGNATURE "rusEFI 2022.08.19.frankenso_na6.3284064395" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index fc85851d19..a96ed09736 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3110574448 -#define TS_SIGNATURE "rusEFI 2022.08.19.harley81.3110574448" +#define SIGNATURE_HASH 1898914144 +#define TS_SIGNATURE "rusEFI 2022.08.19.harley81.1898914144" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index ff0a0fee84..669fc56221 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4261222889 -#define TS_SIGNATURE "rusEFI 2022.08.19.hellen-gm-e67.4261222889" +#define SIGNATURE_HASH 901095929 +#define TS_SIGNATURE "rusEFI 2022.08.19.hellen-gm-e67.901095929" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 84d4ead80a..98557fa060 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2417077651 -#define TS_SIGNATURE "rusEFI 2022.08.19.hellen-nb1.2417077651" +#define SIGNATURE_HASH 1482233219 +#define TS_SIGNATURE "rusEFI 2022.08.19.hellen-nb1.1482233219" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 45d2d68972..03be6405cb 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3242468533 -#define TS_SIGNATURE "rusEFI 2022.08.19.hellen121nissan.3242468533" +#define SIGNATURE_HASH 151821477 +#define TS_SIGNATURE "rusEFI 2022.08.19.hellen121nissan.151821477" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index e6d4cf3b8d..5ef3b34cb1 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 968580901 -#define TS_SIGNATURE "rusEFI 2022.08.19.hellen121vag.968580901" +#define SIGNATURE_HASH 4059293493 +#define TS_SIGNATURE "rusEFI 2022.08.19.hellen121vag.4059293493" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index a135e36f2f..4b2b25ec11 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3076825441 -#define TS_SIGNATURE "rusEFI 2022.08.19.hellen128.3076825441" +#define SIGNATURE_HASH 2133596529 +#define TS_SIGNATURE "rusEFI 2022.08.19.hellen128.2133596529" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 3e47e8854c..eba31302ec 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3520458459 -#define TS_SIGNATURE "rusEFI 2022.08.19.hellen154hyundai.3520458459" +#define SIGNATURE_HASH 429741771 +#define TS_SIGNATURE "rusEFI 2022.08.19.hellen154hyundai.429741771" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 74bb00be5f..1e0b049093 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3148199259 -#define TS_SIGNATURE "rusEFI 2022.08.19.hellen72.3148199259" +#define SIGNATURE_HASH 1944915275 +#define TS_SIGNATURE "rusEFI 2022.08.19.hellen72.1944915275" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 003147cc81..a1a6d88937 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1798259797 -#define TS_SIGNATURE "rusEFI 2022.08.19.hellen81.1798259797" +#define SIGNATURE_HASH 2741500997 +#define TS_SIGNATURE "rusEFI 2022.08.19.hellen81.2741500997" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 1560cd8bfd..1ec8b758aa 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1550815123 -#define TS_SIGNATURE "rusEFI 2022.08.19.hellen88bmw.1550815123" +#define SIGNATURE_HASH 2485598083 +#define TS_SIGNATURE "rusEFI 2022.08.19.hellen88bmw.2485598083" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index aaf9fdc975..c042f24d8b 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3406916927 -#define TS_SIGNATURE "rusEFI 2022.08.19.hellenNA6.3406916927" +#define SIGNATURE_HASH 56218927 +#define TS_SIGNATURE "rusEFI 2022.08.19.hellenNA6.56218927" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index f63c1bc980..b857d7c047 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3918736823 -#define TS_SIGNATURE "rusEFI 2022.08.19.hellenNA8_96.3918736823" +#define SIGNATURE_HASH 568038823 +#define TS_SIGNATURE "rusEFI 2022.08.19.hellenNA8_96.568038823" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 427877f497..ac1ab1b276 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 558710419 -#define TS_SIGNATURE "rusEFI 2022.08.19.kin.558710419" +#define SIGNATURE_HASH 3909453443 +#define TS_SIGNATURE "rusEFI 2022.08.19.kin.3909453443" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 71f557358a..81a02f9fbd 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2253131945 -#define TS_SIGNATURE "rusEFI 2022.08.19.mre_f4.2253131945" +#define SIGNATURE_HASH 1308928185 +#define TS_SIGNATURE "rusEFI 2022.08.19.mre_f4.1308928185" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index fe2a5b720f..767b80f146 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2253131945 -#define TS_SIGNATURE "rusEFI 2022.08.19.mre_f7.2253131945" +#define SIGNATURE_HASH 1308928185 +#define TS_SIGNATURE "rusEFI 2022.08.19.mre_f7.1308928185" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 2a7e2c4978..3901f02e84 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 426788281 -#define TS_SIGNATURE "rusEFI 2022.08.19.prometheus_405.426788281" +#define SIGNATURE_HASH 3510173097 +#define TS_SIGNATURE "rusEFI 2022.08.19.prometheus_405.3510173097" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 7e25a091f1..2f82ccfd76 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 426788281 -#define TS_SIGNATURE "rusEFI 2022.08.19.prometheus_469.426788281" +#define SIGNATURE_HASH 3510173097 +#define TS_SIGNATURE "rusEFI 2022.08.19.prometheus_469.3510173097" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 039850853a..9fc28ffc0a 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3965147945 -#define TS_SIGNATURE "rusEFI 2022.08.19.proteus_f4.3965147945" +#define SIGNATURE_HASH 606069561 +#define TS_SIGNATURE "rusEFI 2022.08.19.proteus_f4.606069561" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 8d29b432af..9a15b5e0ac 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3965147945 -#define TS_SIGNATURE "rusEFI 2022.08.19.proteus_f7.3965147945" +#define SIGNATURE_HASH 606069561 +#define TS_SIGNATURE "rusEFI 2022.08.19.proteus_f7.606069561" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 8e1ad5efc2..8f7162f9f9 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3965147945 -#define TS_SIGNATURE "rusEFI 2022.08.19.proteus_h7.3965147945" +#define SIGNATURE_HASH 606069561 +#define TS_SIGNATURE "rusEFI 2022.08.19.proteus_h7.606069561" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 6fdd077d28..31f83343f7 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 128396263 -#define TS_SIGNATURE "rusEFI 2022.08.19.subaru_eg33_f7.128396263" +#define SIGNATURE_HASH 3488584695 +#define TS_SIGNATURE "rusEFI 2022.08.19.subaru_eg33_f7.3488584695" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 1006fdde8c..f81c81b1a8 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3818017291 -#define TS_SIGNATURE "rusEFI 2022.08.19.tdg-pdm8.3818017291" +#define SIGNATURE_HASH 735767067 +#define TS_SIGNATURE "rusEFI 2022.08.19.tdg-pdm8.735767067" diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index 7880c38c07..bc2152a3fa 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -32,6 +32,7 @@ static plain_get_float_s getF_plain[] = { {"fanOffTemperature", &engineConfiguration->fanOffTemperature}, {"driveWheelRevPerKm", &engineConfiguration->driveWheelRevPerKm}, {"idle_derivativeFilterLoss", &engineConfiguration->idle_derivativeFilterLoss}, + {"airByRpmTaper", &engineConfiguration->airByRpmTaper}, {"globalFuelCorrection", &engineConfiguration->globalFuelCorrection}, {"adcVcc", &engineConfiguration->adcVcc}, {"mapCamDetectionAnglePosition", &engineConfiguration->mapCamDetectionAnglePosition}, @@ -675,6 +676,8 @@ float getConfigValueByName(const char *name) { return engineConfiguration->etb.minValue; if (strEqualCaseInsensitive(name, "etb.maxValue")) return engineConfiguration->etb.maxValue; + if (strEqualCaseInsensitive(name, "airTaperRpmRange")) + return engineConfiguration->airTaperRpmRange; if (strEqualCaseInsensitive(name, "tps2Min")) return engineConfiguration->tps2Min; if (strEqualCaseInsensitive(name, "tps2Max")) @@ -2152,6 +2155,11 @@ void setConfigValueByName(const char *name, float value) { engineConfiguration->etb.maxValue = (int)value; return; } + if (strEqualCaseInsensitive(name, "airTaperRpmRange")) + { + engineConfiguration->airTaperRpmRange = (int)value; + return; + } if (strEqualCaseInsensitive(name, "tps2Min")) { engineConfiguration->tps2Min = (int)value; diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 37eb282cc5..bb37329ffc 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.all.1234869343" + signature = "rusEFI 2022.08.19.all.2178032719" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.all.1234869343" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.all.2178032719" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:36:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:25 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5554,9 +5554,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index b823be1dca..302d4f5377 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.48way.1589482512" + signature = "rusEFI 2022.08.19.48way.2532649984" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.48way.1589482512" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.48way.2532649984" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:36:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:07 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",72="Camshaft Input (E6)",47="CrankShaft Input (C13)" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5551,9 +5551,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index fda9e3455b..15bf658b57 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.alphax-2chan.2072510771" + signature = "rusEFI 2022.08.19.alphax-2chan.3015751971" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.alphax-2chan.2072510771" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.alphax-2chan.3015751971" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:40 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",80="C2 - Crank- (hall)",19="C2/C3 Crank Sensor VR",78="C3 - Crank+ (hall)",8="C7 - CAM Hall/Digital" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5548,9 +5548,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 90afbe4acd..884c3459df 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.alphax-4chan.2970627480" + signature = "rusEFI 2022.08.19.alphax-4chan.2035848584" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.alphax-4chan.2970627480" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.alphax-4chan.2035848584" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:41 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",80="C2 - Crank- (hall)",19="C2/C3 Crank Sensor VR",78="C3 - Crank+ (hall)",8="C7 - CAM Hall/Digital",91="E5/E6 Cam Sensor VR",81="E6 - Cam+ (hall)",9="E7 - Flex" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5549,9 +5549,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index cc8333336c..ea1d21080d 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.atlas.1431333240" + signature = "rusEFI 2022.08.19.atlas.2635649384" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.atlas.1431333240" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.atlas.2635649384" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:36:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:21 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5554,9 +5554,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 6fca22d0a7..66c4f32f80 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.core8.3212234150" + signature = "rusEFI 2022.08.19.core8.2000582070" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.core8.3212234150" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.core8.2000582070" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:36:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:05 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",87="Digital Input 1 (F5)",86="Digital Input 2 (F4)",85="Digital Input 3 (F3)",84="Digital Input 4 (F2)",83="Digital Input 5 (F1)",82="Digital Input 6 (F0)",72="Digital Input 7 (E6)",47="Digital Input 8 (C13)",68="VR/Hall 1 (E2)",69="VR/Hall 2 (E3)",70="VR/Hall 3 (E4)",71="VR/Hall 4 (E5)" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5551,9 +5551,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 3f071d8578..87e8e6a6f7 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.cypress.1234869343" + signature = "rusEFI 2022.08.19.cypress.2178032719" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.cypress.1234869343" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.cypress.2178032719" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Aug 18 23:35:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Aug 19 03:07:37 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5554,9 +5554,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 57d351fe27..decd867de8 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.f407-discovery.1234869343" + signature = "rusEFI 2022.08.19.f407-discovery.2178032719" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.f407-discovery.1234869343" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.f407-discovery.2178032719" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:36:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:18 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5554,9 +5554,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 9de4a03dc9..8fdda15174 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.f429-discovery.1234869343" + signature = "rusEFI 2022.08.19.f429-discovery.2178032719" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.f429-discovery.1234869343" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.f429-discovery.2178032719" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:36:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:20 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5554,9 +5554,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 53dd602bd9..dcdfb50a4c 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.frankenso_na6.200695963" + signature = "rusEFI 2022.08.19.frankenso_na6.3284064395" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.frankenso_na6.200695963" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.frankenso_na6.3284064395" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:36:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:09 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5554,9 +5554,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 98782aef88..c5c1ef9793 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.harley81.3110574448" + signature = "rusEFI 2022.08.19.harley81.1898914144" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.harley81.3110574448" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.harley81.1898914144" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:43 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",88="11 Crank VR-",93="51 - VSS" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5550,9 +5550,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index c41f96449f..1fd0fa262b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.hellen-gm-e67.4261222889" + signature = "rusEFI 2022.08.19.hellen-gm-e67.901095929" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.hellen-gm-e67.4261222889" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.hellen-gm-e67.901095929" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:57 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",88="C2-59 - Cam",86="C2-63 - Crank" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5550,9 +5550,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index d2040b4d70..ab99bc7f7d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.hellen-nb1.2417077651" + signature = "rusEFI 2022.08.19.hellen-nb1.1482233219" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.hellen-nb1.2417077651" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.hellen-nb1.1482233219" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:56 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",93="2D - VSS",8="2H - CAM",19="2J - CRANK",78="4B - DIGITAL/FLEX" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5550,9 +5550,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index f500b7934d..459c5f91b8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.hellen121nissan.3242468533" + signature = "rusEFI 2022.08.19.hellen121nissan.151821477" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.hellen121nissan.3242468533" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.hellen121nissan.151821477" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:47 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",19="13 - Crank",8="14 - Cam Left",9="33 - Cam Right" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5550,9 +5550,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 241f1c56e8..0b8ae63f1f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.hellen121vag.968580901" + signature = "rusEFI 2022.08.19.hellen121vag.4059293493" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.hellen121vag.968580901" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.hellen121vag.4059293493" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:46 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",93="54 - VSS",19="82 - VR",8="86 - CAM1",9="87 - CAM2" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5550,9 +5550,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index b21e864546..f231eb71d3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.hellen128.3076825441" + signature = "rusEFI 2022.08.19.hellen128.2133596529" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.hellen128.3076825441" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.hellen128.2133596529" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:44 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",5="C24 - PPS1",38="C25 - PPS2",35="E23 - MAP",36="E29 - Coolant Temp",6="E31 - TPS1",18="E34 - TPS2",19="E37 - Crank Input",8="E40 - IN_CAM",37="E45 - IAT",34="E47 - MAF" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5550,9 +5550,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 8d6e8909dc..228c474f11 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.hellen154hyundai.3520458459" + signature = "rusEFI 2022.08.19.hellen154hyundai.429741771" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.hellen154hyundai.3520458459" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.hellen154hyundai.429741771" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:49 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",9="Cam - K15",8="Cam - K62",19="Crank - K17",93="K40 VSS" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5550,9 +5550,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index dfed011f0b..7e0a5d954f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.hellen72.3148199259" + signature = "rusEFI 2022.08.19.hellen72.1944915275" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.hellen72.3148199259" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.hellen72.1944915275" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:52 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",93="3T - VSS (D5)",8="3V - CAM (A19)",19="3Y - CRANK (A24)",80="4H - Neutral",81="5C - Digital Input",78="5I - Digital Input" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5550,9 +5550,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 96cd603b74..f442f36489 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.hellen81.1798259797" + signature = "rusEFI 2022.08.19.hellen81.2741500997" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.hellen81.1798259797" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.hellen81.2741500997" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:54 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",19="15 - IN_CRANK (A24)",93="59 - IN_VSS",18="74 - IN_AUX1",38="75 - IN_AUX2",39="76 - IN_AUX3",9="77 - IN_AUX4",8="79 - IN_CAM" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5549,9 +5549,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 6b50452411..b2c7a8ecd5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.hellen88bmw.1550815123" + signature = "rusEFI 2022.08.19.hellen88bmw.2485598083" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.hellen88bmw.1550815123" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.hellen88bmw.2485598083" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:50 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",19="16 - CRANK",8="17 - CAM" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5550,9 +5550,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 623446594c..8b014ce043 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.hellenNA6.3406916927" + signature = "rusEFI 2022.08.19.hellenNA6.56218927" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.hellenNA6.3406916927" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.hellenNA6.56218927" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:59 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",93="1M - VSS",85="2L - Flex Fuel",19="3E - CRANK",8="3G - CAM" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5550,9 +5550,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index c044211f59..18db0ba38e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.hellenNA8_96.3918736823" + signature = "rusEFI 2022.08.19.hellenNA8_96.568038823" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.hellenNA8_96.3918736823" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.hellenNA8_96.568038823" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:01 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",93="1M - VSS",19="3F - CRANK",8="3G - CAM",78="4B - DIGITAL/FLEX" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5550,9 +5550,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 3261b67cf7..7ff7b05859 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.kin.558710419" + signature = "rusEFI 2022.08.19.kin.3909453443" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.kin.558710419" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.kin.3909453443" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Aug 18 23:35:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Aug 19 03:07:35 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5554,9 +5554,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 6d68d65e6e..6966dab09f 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.mre_f4.2253131945" + signature = "rusEFI 2022.08.19.mre_f4.1308928185" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.mre_f4.2253131945" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.mre_f4.1308928185" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:04 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",5="22 - AN temp 4",4="24 - AN temp 3",7="25 - Hall Cam",40="45 - VR/Hall Crank" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5551,9 +5551,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 98f0f2a251..70650552e5 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.mre_f7.2253131945" + signature = "rusEFI 2022.08.19.mre_f7.1308928185" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.mre_f7.2253131945" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.mre_f7.1308928185" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:02 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",5="22 - AN temp 4",4="24 - AN temp 3",7="25 - Hall Cam",40="45 - VR/Hall Crank" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5551,9 +5551,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 99efa604b1..797f28defb 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.prometheus_405.426788281" + signature = "rusEFI 2022.08.19.prometheus_405.3510173097" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.prometheus_405.426788281" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.prometheus_405.3510173097" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:36:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:12 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5549,9 +5549,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index c3e6428dcf..ed71ea03fc 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.prometheus_469.426788281" + signature = "rusEFI 2022.08.19.prometheus_469.3510173097" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.prometheus_469.426788281" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.prometheus_469.3510173097" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:36:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:10 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5549,9 +5549,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 49ec575b4f..8be019e252 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.proteus_f4.3965147945" + signature = "rusEFI 2022.08.19.proteus_f4.606069561" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.proteus_f4.3965147945" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.proteus_f4.606069561" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:36:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:15 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5547,9 +5547,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index e57d5ed7be..e4644a3b23 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.proteus_f7.3965147945" + signature = "rusEFI 2022.08.19.proteus_f7.606069561" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.proteus_f7.3965147945" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.proteus_f7.606069561" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:36:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:13 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5547,9 +5547,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index c8cb819321..f561d2759d 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.proteus_h7.3965147945" + signature = "rusEFI 2022.08.19.proteus_h7.606069561" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.proteus_h7.3965147945" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.proteus_h7.606069561" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:36:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:17 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5547,9 +5547,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 4f3f93def1..17ec349996 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.subaru_eg33_f7.128396263" + signature = "rusEFI 2022.08.19.subaru_eg33_f7.3488584695" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.subaru_eg33_f7.128396263" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.subaru_eg33_f7.3488584695" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Aug 18 23:35:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Fri Aug 19 03:07:38 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], 0="NONE",126="A07 - Cam VR+",124="A08 - Crank 1 VR+",75="A08 - Crank 2 VR+",64="B11 - Speed Din" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5550,9 +5550,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 352317b0fa..0698d015f7 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.19.tdg-pdm8.3818017291" + signature = "rusEFI 2022.08.19.tdg-pdm8.735767067" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.19.tdg-pdm8.3818017291" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.19.tdg-pdm8.735767067" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 18 23:36:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:23 UTC 2022 pageSize = 21300 page = 1 @@ -211,7 +211,7 @@ trailingSparkAngle = scalar, S32, 464, "angle", 1, 0, 0, 720, 0 trigger_type = bits, U32, 468, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" trigger_customTotalToothCount = scalar, S32, 472, "number", 1, 0, 0, 500, 0 trigger_customSkippedToothCount = scalar, S32, 476, "number", 1, 0, 0, 500, 0 -unused460 = scalar, S32, 480, "", 1, 0, 0, 100, 0 +airByRpmTaper = scalar, F32, 480, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 484, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" failedMapFallback = scalar, U08, 485, "kPa", 1, 0, 0, 100, 0 boostControlSafeDutyCycle = scalar, U08, 486, "%", 1, 0, 0, 100, 0 @@ -690,7 +690,7 @@ etb_minValue = scalar, S16, 1464, "", 1, 0, -30000, 30000, 0 etb_maxValue = scalar, S16, 1466, "", 1, 0, -30000, 30000, 0 triggerInputDebugPins1 = bits, U16, 1468, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerInputDebugPins2 = bits, U16, 1470, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -unused1452 = scalar, U16, 1472, "", 1, 0, 0, 100, 0 +airTaperRpmRange = scalar, S16, 1472, "", 1, 0, 0, 100, 0 turboSpeedSensorInputPin = bits, U16, 1474, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" tps2Min = scalar, S16, 1476, "ADC", 1, 0, 0, 1023, 0 tps2Max = scalar, S16, 1478, "ADC", 1, 0, 0, 1023, 0 @@ -1449,6 +1449,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 idle_derivativeFilterLoss = "0.1 is a good default value" trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers" + airByRpmTaper = "Extra air taper amount" failedMapFallback = "Single value to be used in event of a failed MAP sensor " boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." globalFuelCorrection = "set global_fuel_correction X" @@ -1698,6 +1699,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 etb_maxValue = "Output Max Duty Cycle" triggerInputDebugPins1 = "triggerInputDebugPins 1" triggerInputDebugPins2 = "triggerInputDebugPins 2" + airTaperRpmRange = "RPM range above upper limit for extra air taper", 1, 0, 0, 1500, 0" tps2Min = "Closed throttle#2. todo: extract these two fields into a structure" tps2Max = "Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!" starterControlPin = "See also startStopButtonPin" @@ -2107,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1204 ; ; see TunerStudioOutputChannels struct @@ -3126,28 +3128,27 @@ unusedBit_22_30 = bits, U32, 1136, [30:30] unusedBit_22_31 = bits, U32, 1136, [31:31] targetRpmByClt = scalar, S32, 1140, "", 1, 0 targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -airTaperRpmRange = scalar, S32, 1148, "", 1, 0 -airByRpmTaper = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +iacByRpmTaper = scalar, F32, 1148 +; total TS size = 1152 +baseDwell = scalar, F32, 1152, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1156, "", 1, 0 +luaTimingAdd = scalar, F32, 1160, "", 1, 0 +luaTimingMult = scalar, F32, 1164, "", 1, 0 +; total TS size = 1168 +idlePosition = scalar, F32, 1168, "", 1, 0 +trim = scalar, F32, 1172, "", 1, 0 +luaAdjustment = scalar, F32, 1176, "", 1, 0 +etbFeedForward = scalar, F32, 1180 +etbIntegralError = scalar, F32, 1184, "", 1, 0 +etbCurrentTarget = scalar, F32, 1188, "%", 1, 0 +; total TS size = 1192 +faultCode = scalar, U08, 1192, "", 1, 0 +heaterDuty = scalar, U08, 1193, "%", 1, 0 +pumpDuty = scalar, U08, 1194, "%", 1, 0 +tempC = scalar, U16, 1196, "C", 1, 0 +nernstVoltage = scalar, U16, 1198, "V", 0.001, 0 +esr = scalar, U16, 1200, "", 1, 0 +; total TS size = 1204 time = { timeNow } @@ -4784,8 +4785,7 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" -entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" -entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" +entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5554,9 +5554,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump - graphLine = airTaperRpmRange - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = airByRpmTaper + graphLine = iacByRpmTaper dialog = ignition_stateDialog, "ignition_state" 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 118ba1719e..6270fc1313 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 Thu Aug 18 23:36:21 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 19 03:08:26 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -72,6 +72,8 @@ public class Fields { public static final int air_pressure_sensor_type_e_MT_MPXH6400 = 14; public static final int air_pressure_sensor_type_e_MT_SUBY_DENSO = 5; public static final int air_pressure_sensor_type_e_MT_TOYOTA_89420_02010 = 8; + public static final int airByRpmTaper_offset = 480; + public static final int airTaperRpmRange_offset = 1472; public static final int alignEngineSnifferAtTDC_offset = 764; public static final int alternatorControl_dFactor_offset = 1436; public static final int alternatorControl_iFactor_offset = 1432; @@ -1887,7 +1889,6 @@ public class Fields { public static final int servoOutputPins7_offset = 2086; public static final int servoOutputPins8_offset = 2088; public static final int showHumanReadableWarning_offset = 960; - public static final int SIGNATURE_HASH = 1234869343; public static final int silentTriggerError_offset = 1360; public static final int skippedWheelOnCam_offset = 1360; public static final int slowAdcAlpha_offset = 1600; @@ -2377,10 +2378,10 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.08.19.all.1234869343"; + public static final String TS_SIGNATURE = "rusEFI 2022.08.19.all.2178032719"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; - public static final int TS_TOTAL_OUTPUT_SIZE = 1208; + public static final int TS_TOTAL_OUTPUT_SIZE = 1204; public static final int TsCalMode_EtbKd = 5; public static final int TsCalMode_EtbKi = 4; public static final int TsCalMode_EtbKp = 3; @@ -2414,10 +2415,8 @@ public class Fields { public static final int unused1128_offset = 1628; public static final int unused1129_offset = 1628; public static final int unused1130_offset = 1628; - public static final int unused1452_offset = 1472; public static final int unused1740b2_offset = 1628; public static final int unused4080_offset = 3121; - public static final int unused460_offset = 480; public static final int unused962_offset = 1040; public static final int unused_1484_bit_27_offset = 1372; public static final int unused_1484_bit_29_offset = 1372; @@ -2702,7 +2701,7 @@ public class Fields { public static final Field TRIGGER_TYPE = Field.create("TRIGGER_TYPE", 468, FieldType.INT, trigger_type_e).setScale(1.0); public static final Field TRIGGER_CUSTOMTOTALTOOTHCOUNT = Field.create("TRIGGER_CUSTOMTOTALTOOTHCOUNT", 472, FieldType.INT).setScale(1.0); public static final Field TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT = Field.create("TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT", 476, FieldType.INT).setScale(1.0); - public static final Field UNUSED460 = Field.create("UNUSED460", 480, FieldType.INT).setScale(1.0); + public static final Field AIRBYRPMTAPER = Field.create("AIRBYRPMTAPER", 480, FieldType.FLOAT); public static final Field HIP9011SPIDEVICE = Field.create("HIP9011SPIDEVICE", 484, FieldType.INT8).setScale(1.0); public static final Field FAILEDMAPFALLBACK = Field.create("FAILEDMAPFALLBACK", 485, FieldType.INT8).setScale(1.0); public static final Field BOOSTCONTROLSAFEDUTYCYCLE = Field.create("BOOSTCONTROLSAFEDUTYCYCLE", 486, FieldType.INT8).setScale(1.0); @@ -3228,7 +3227,7 @@ public class Fields { public static final Field ETB_MAXVALUE = Field.create("ETB_MAXVALUE", 1466, FieldType.INT16).setScale(1.0); public static final Field TRIGGERINPUTDEBUGPINS1 = Field.create("TRIGGERINPUTDEBUGPINS1", 1468, FieldType.INT16, Gpio).setScale(1.0); public static final Field TRIGGERINPUTDEBUGPINS2 = Field.create("TRIGGERINPUTDEBUGPINS2", 1470, FieldType.INT16, Gpio).setScale(1.0); - public static final Field UNUSED1452 = Field.create("UNUSED1452", 1472, FieldType.INT16).setScale(1.0); + public static final Field AIRTAPERRPMRANGE = Field.create("AIRTAPERRPMRANGE", 1472, FieldType.INT16).setScale(1.0); public static final Field TURBOSPEEDSENSORINPUTPIN = Field.create("TURBOSPEEDSENSORINPUTPIN", 1474, FieldType.INT16, brain_input_pin_e).setScale(1.0); public static final Field TPS2MIN = Field.create("TPS2MIN", 1476, FieldType.INT16).setScale(1.0); public static final Field TPS2MAX = Field.create("TPS2MAX", 1478, FieldType.INT16).setScale(1.0); @@ -4078,7 +4077,7 @@ public class Fields { TRIGGER_TYPE, TRIGGER_CUSTOMTOTALTOOTHCOUNT, TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT, - UNUSED460, + AIRBYRPMTAPER, HIP9011SPIDEVICE, FAILEDMAPFALLBACK, BOOSTCONTROLSAFEDUTYCYCLE, @@ -4593,7 +4592,7 @@ public class Fields { ETB_MAXVALUE, TRIGGERINPUTDEBUGPINS1, TRIGGERINPUTDEBUGPINS2, - UNUSED1452, + AIRTAPERRPMRANGE, TURBOSPEEDSENSORINPUTPIN, TPS2MIN, TPS2MAX, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java index b373fb350c..ac8ea15c3d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Mon Aug 15 21:21:43 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Fri Aug 19 03:07:34 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -45,8 +45,7 @@ public class IdleState { public static final Field UNUSEDBIT_22_31 = Field.create("UNUSEDBIT_22_31", 20, FieldType.BIT, 31); public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 24, FieldType.INT).setScale(1.0); public static final Field TARGETRPMACBUMP = Field.create("TARGETRPMACBUMP", 28, FieldType.INT).setScale(1.0); - public static final Field AIRTAPERRPMRANGE = Field.create("AIRTAPERRPMRANGE", 32, FieldType.INT).setScale(1.0); - public static final Field AIRBYRPMTAPER = Field.create("AIRBYRPMTAPER", 36, FieldType.FLOAT); + public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 32, FieldType.FLOAT); public static final Field[] VALUES = { IDLESTATE, CURRENTIDLEPOSITION, @@ -87,7 +86,6 @@ public class IdleState { UNUSEDBIT_22_31, TARGETRPMBYCLT, TARGETRPMACBUMP, - AIRTAPERRPMRANGE, - AIRBYRPMTAPER, + IACBYRPMTAPER, }; }