From dd41e87877d333e84538362dd7585b89d6a7dd0e Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Fri, 26 Aug 2022 00:41:14 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../console/binary/generated/data_logs.ini | 4 +- .../binary/generated/fancy_content.ini | 3 +- firmware/console/binary/generated/gauges.ini | 8 +-- .../binary/generated/output_channels.ini | 40 +++++------ .../binary/output_channels_generated.h | 12 ++-- .../actuators/idle_state_generated.h | 39 +++++------ .../lua/generated/output_lookup_generated.cpp | 2 - firmware/tunerstudio/generated/rusefi.ini | 49 +++++++------- .../tunerstudio/generated/rusefi_48way.ini | 49 +++++++------- .../generated/rusefi_alphax-2chan.ini | 49 +++++++------- .../generated/rusefi_alphax-4chan.ini | 49 +++++++------- .../tunerstudio/generated/rusefi_atlas.ini | 49 +++++++------- .../tunerstudio/generated/rusefi_core8.ini | 49 +++++++------- .../tunerstudio/generated/rusefi_cypress.ini | 49 +++++++------- .../generated/rusefi_f407-discovery.ini | 49 +++++++------- .../generated/rusefi_f429-discovery.ini | 49 +++++++------- .../generated/rusefi_frankenso_na6.ini | 49 +++++++------- .../tunerstudio/generated/rusefi_harley81.ini | 49 +++++++------- .../generated/rusefi_hellen-gm-e67.ini | 49 +++++++------- .../generated/rusefi_hellen-nb1.ini | 49 +++++++------- .../generated/rusefi_hellen121nissan.ini | 49 +++++++------- .../generated/rusefi_hellen121vag.ini | 49 +++++++------- .../generated/rusefi_hellen128mercedes.ini | 49 +++++++------- .../generated/rusefi_hellen154hyundai.ini | 49 +++++++------- .../tunerstudio/generated/rusefi_hellen72.ini | 49 +++++++------- .../tunerstudio/generated/rusefi_hellen81.ini | 49 +++++++------- .../generated/rusefi_hellen88bmw.ini | 49 +++++++------- .../generated/rusefi_hellenNA6.ini | 49 +++++++------- .../generated/rusefi_hellenNA8_96.ini | 49 +++++++------- firmware/tunerstudio/generated/rusefi_kin.ini | 49 +++++++------- .../tunerstudio/generated/rusefi_mre_f4.ini | 49 +++++++------- .../tunerstudio/generated/rusefi_mre_f7.ini | 49 +++++++------- .../generated/rusefi_prometheus_405.ini | 49 +++++++------- .../generated/rusefi_prometheus_469.ini | 49 +++++++------- .../generated/rusefi_proteus_f4.ini | 49 +++++++------- .../generated/rusefi_proteus_f7.ini | 49 +++++++------- .../generated/rusefi_proteus_h7.ini | 49 +++++++------- .../generated/rusefi_subaru_eg33_f7.ini | 49 +++++++------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 49 +++++++------- .../rusefi/config/generated/IdleState.java | 66 +++++++++---------- .../rusefi/config/generated/TsOutputs.java | 18 ++--- 41 files changed, 896 insertions(+), 864 deletions(-) diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 218cd16f83..c2c68dec8e 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -23,7 +23,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -425,7 +424,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -438,6 +437,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index d09da95ff0..78182f12cc 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -242,7 +242,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -255,6 +255,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 13c42d7599..4218c42334 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -26,10 +26,10 @@ isKnockChipOkGauge = isKnockChipOk,"isKnockChipOk", "", -1.0,-1.0, -1.0,-1.0, -1 launchTriggeredGauge = launchTriggered,"launchTriggered", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 isTps2ErrorGauge = isTps2Error,"isTps2Error", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 isIdleClosedLoopGauge = isIdleClosedLoop,"isIdleClosedLoop", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -isIdleCoastingGauge = isIdleCoasting,"isIdleCoasting", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_29_29Gauge = unusedBit_29_29,"unusedBit_29_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_29_30Gauge = unusedBit_29_30,"unusedBit_29_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_29_31Gauge = unusedBit_29_31,"unusedBit_29_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_28_28Gauge = unusedBit_28_28,"unusedBit_28_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_28_29Gauge = unusedBit_28_29,"unusedBit_28_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_28_30Gauge = unusedBit_28_30,"unusedBit_28_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_28_31Gauge = unusedBit_28_31,"unusedBit_28_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 RPMValueGauge = RPMValue,"RPM", "RPM", 0.0,8000.0, 0.0,8000.0, 0.0,8000.0, 0,0 rpmAccelerationGauge = rpmAcceleration,"dRPM", "RPM/s", 0.0,5.0, 0.0,5.0, 0.0,5.0, 0,0 speedToRpmRatioGauge = speedToRpmRatio,"Gearbox Ratio", "value", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 48955b2a48..a7645f77ae 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -26,10 +26,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -1019,7 +1019,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -1032,21 +1032,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index 5f14fccfb1..cc1bf62fe9 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Aug 23 23:49:26 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Aug 26 00:40:04 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -121,16 +121,16 @@ struct output_channels_s { bool isIdleClosedLoop : 1 {}; /** offset 0 bit 28 */ - bool isIdleCoasting : 1 {}; + bool unusedBit_28_28 : 1 {}; /** offset 0 bit 29 */ - bool unusedBit_29_29 : 1 {}; + bool unusedBit_28_29 : 1 {}; /** offset 0 bit 30 */ - bool unusedBit_29_30 : 1 {}; + bool unusedBit_28_30 : 1 {}; /** offset 0 bit 31 */ - bool unusedBit_29_31 : 1 {}; + bool unusedBit_28_31 : 1 {}; /** * @@GAUGE_NAME_RPM@@ RPM @@ -1318,4 +1318,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 756); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Aug 23 23:49:26 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Aug 26 00:40:04 UTC 2022 diff --git a/firmware/controllers/actuators/idle_state_generated.h b/firmware/controllers/actuators/idle_state_generated.h index 0a79d6872a..a36d7a795b 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 Sun Aug 21 04:23:45 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Fri Aug 26 00:40:05 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -54,9 +54,9 @@ struct idle_state_s { offset 20 bit 3 */ bool mustResetPid : 1 {}; /** - * idle: coasting + * idle: cranking offset 20 bit 4 */ - bool isCoasting : 1 {}; + bool isCranking : 1 {}; /** offset 20 bit 5 */ bool useIacTableForCoasting : 1 {}; @@ -96,50 +96,51 @@ struct idle_state_s { offset 20 bit 16 */ bool isVerboseIAC : 1 {}; /** + * idle: coasting offset 20 bit 17 */ - bool unusedBit_22_17 : 1 {}; + bool isIdleCoasting : 1 {}; /** offset 20 bit 18 */ - bool unusedBit_22_18 : 1 {}; + bool unusedBit_23_18 : 1 {}; /** offset 20 bit 19 */ - bool unusedBit_22_19 : 1 {}; + bool unusedBit_23_19 : 1 {}; /** offset 20 bit 20 */ - bool unusedBit_22_20 : 1 {}; + bool unusedBit_23_20 : 1 {}; /** offset 20 bit 21 */ - bool unusedBit_22_21 : 1 {}; + bool unusedBit_23_21 : 1 {}; /** offset 20 bit 22 */ - bool unusedBit_22_22 : 1 {}; + bool unusedBit_23_22 : 1 {}; /** offset 20 bit 23 */ - bool unusedBit_22_23 : 1 {}; + bool unusedBit_23_23 : 1 {}; /** offset 20 bit 24 */ - bool unusedBit_22_24 : 1 {}; + bool unusedBit_23_24 : 1 {}; /** offset 20 bit 25 */ - bool unusedBit_22_25 : 1 {}; + bool unusedBit_23_25 : 1 {}; /** offset 20 bit 26 */ - bool unusedBit_22_26 : 1 {}; + bool unusedBit_23_26 : 1 {}; /** offset 20 bit 27 */ - bool unusedBit_22_27 : 1 {}; + bool unusedBit_23_27 : 1 {}; /** offset 20 bit 28 */ - bool unusedBit_22_28 : 1 {}; + bool unusedBit_23_28 : 1 {}; /** offset 20 bit 29 */ - bool unusedBit_22_29 : 1 {}; + bool unusedBit_23_29 : 1 {}; /** offset 20 bit 30 */ - bool unusedBit_22_30 : 1 {}; + bool unusedBit_23_30 : 1 {}; /** offset 20 bit 31 */ - bool unusedBit_22_31 : 1 {}; + bool unusedBit_23_31 : 1 {}; /** * idle: target by CLT * offset 24 @@ -164,4 +165,4 @@ struct idle_state_s { static_assert(sizeof(idle_state_s) == 40); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Sun Aug 21 04:23:45 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Fri Aug 26 00:40:05 UTC 2022 diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index acc3a99fca..8aadbcf661 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -51,8 +51,6 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.isTps2Error; if (strEqualCaseInsensitive(name, "isIdleClosedLoop")) return engine->outputChannels.isIdleClosedLoop; - if (strEqualCaseInsensitive(name, "isIdleCoasting")) - return engine->outputChannels.isIdleCoasting; if (strEqualCaseInsensitive(name, "RPMValue")) return engine->outputChannels.RPMValue; if (strEqualCaseInsensitive(name, "rpmAcceleration")) diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 6eaca1b1f5..db9cf3db1b 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -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 Fri Aug 26 00:09:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:59 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5583,7 +5583,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5596,6 +5596,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index b3d3add8ab..a02a185531 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -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 Fri Aug 26 00:08:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:40 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5580,7 +5580,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5593,6 +5593,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index e4182248bc..41d193aa8c 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -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 Fri Aug 26 00:07:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:11 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5577,7 +5577,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5590,6 +5590,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 264ac769ee..c1cdabffe7 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -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 Fri Aug 26 00:08:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:13 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5579,7 +5579,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5592,6 +5592,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 2479661e5b..33501ca187 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -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 Fri Aug 26 00:08:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:55 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5583,7 +5583,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5596,6 +5596,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 178714c872..387214551a 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -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 Fri Aug 26 00:08:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:39 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5580,7 +5580,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5593,6 +5593,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 5d27ef82a8..67b674cc4c 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -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 Fri Aug 26 00:07:54 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 26 00:40:08 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5583,7 +5583,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5596,6 +5596,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index d1e83d62f9..03d92c40b8 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -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 Fri Aug 26 00:08:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:52 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5583,7 +5583,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5596,6 +5596,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index fc79d09a61..d6b3c65fd5 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -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 Fri Aug 26 00:08:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:54 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5583,7 +5583,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5596,6 +5596,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index d8c08ca1d2..ad951e6d91 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -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 Fri Aug 26 00:08:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:42 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5583,7 +5583,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5596,6 +5596,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 065ad896eb..ad09b74ff4 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -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 Fri Aug 26 00:08:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:14 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5579,7 +5579,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5592,6 +5592,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index da5bcd55bd..f0518bc72d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -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 Fri Aug 26 00:08:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:30 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5579,7 +5579,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5592,6 +5592,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index cf80970530..3dcbeb73a6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -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 Fri Aug 26 00:08:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:28 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5579,7 +5579,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5592,6 +5592,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 33c474006a..08a498408b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -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 Fri Aug 26 00:08:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:20 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5579,7 +5579,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5592,6 +5592,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index d4a8d8ff15..7f152ade03 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -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 Fri Aug 26 00:08:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:18 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5579,7 +5579,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5592,6 +5592,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 9666c82c62..40da88034f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -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 Fri Aug 26 00:08:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:16 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5579,7 +5579,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5592,6 +5592,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 9a95c14bb5..887fb2e66d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -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 Fri Aug 26 00:08:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:21 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5579,7 +5579,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5592,6 +5592,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 27da0901b5..32f2563d49 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -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 Fri Aug 26 00:08:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:25 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5579,7 +5579,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5592,6 +5592,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 4c7fe797e3..ace413b8dd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -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 Fri Aug 26 00:08:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:27 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5578,7 +5578,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5591,6 +5591,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index a74f740bbc..1904db5dab 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -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 Fri Aug 26 00:08:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:23 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5579,7 +5579,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5592,6 +5592,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 61a20de1dc..48f0d9052b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -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 Fri Aug 26 00:08:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:32 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5579,7 +5579,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5592,6 +5592,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index de208dd131..b9e727fe87 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -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 Fri Aug 26 00:08:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:34 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5579,7 +5579,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5592,6 +5592,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index e9626b13af..c14e323da2 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -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 Fri Aug 26 00:07:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Aug 26 00:40:06 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5583,7 +5583,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5596,6 +5596,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index b45b7afb59..63c97e63fc 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -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 Fri Aug 26 00:08:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:37 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5580,7 +5580,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5593,6 +5593,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index f6d5d68244..12c23373f5 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -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 Fri Aug 26 00:08:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:35 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5580,7 +5580,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5593,6 +5593,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 12fb4bc81f..a8f6dea120 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -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 Fri Aug 26 00:08:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:45 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5578,7 +5578,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5591,6 +5591,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index aa5f904314..912fb6de1c 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -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 Fri Aug 26 00:08:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:44 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5578,7 +5578,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5591,6 +5591,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index bcd0f3e65c..3398a42851 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -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 Fri Aug 26 00:08:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:49 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5576,7 +5576,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5589,6 +5589,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index f794cf8cf5..6dda33e3ee 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -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 Fri Aug 26 00:08:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:47 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5576,7 +5576,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5589,6 +5589,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index b4d1b8cfb8..ff156f2f85 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -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 Fri Aug 26 00:08:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:50 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5576,7 +5576,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5589,6 +5589,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 64929a9575..afb0d7ce4d 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -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 Fri Aug 26 00:07:56 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 26 00:40:09 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5579,7 +5579,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5592,6 +5592,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index d5f50926e1..4fc5d2147a 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -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 Fri Aug 26 00:08:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 26 00:40:57 UTC 2022 pageSize = 21300 page = 1 @@ -2143,10 +2143,10 @@ isKnockChipOk = bits, U32, 0, [24:24] launchTriggered = bits, U32, 0, [25:25] isTps2Error = bits, U32, 0, [26:26] isIdleClosedLoop = bits, U32, 0, [27:27] -isIdleCoasting = bits, U32, 0, [28:28] -unusedBit_29_29 = bits, U32, 0, [29:29] -unusedBit_29_30 = bits, U32, 0, [30:30] -unusedBit_29_31 = bits, U32, 0, [31:31] +unusedBit_28_28 = bits, U32, 0, [28:28] +unusedBit_28_29 = bits, U32, 0, [29:29] +unusedBit_28_30 = bits, U32, 0, [30:30] +unusedBit_28_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3136,7 +3136,7 @@ mightResetPid = bits, U32, 1160, [0:0] shouldResetPid = bits, U32, 1160, [1:1] wasResetPid = bits, U32, 1160, [2:2] mustResetPid = bits, U32, 1160, [3:3] -isCoasting = bits, U32, 1160, [4:4] +isCranking = bits, U32, 1160, [4:4] useIacTableForCoasting = bits, U32, 1160, [5:5] notIdling = bits, U32, 1160, [6:6] needReset = bits, U32, 1160, [7:7] @@ -3149,21 +3149,21 @@ looksLikeCoasting = bits, U32, 1160, [13:13] looksLikeCrankToIdle = bits, U32, 1160, [14:14] useInstantRpmForIdle = bits, U32, 1160, [15:15] isVerboseIAC = bits, U32, 1160, [16:16] -unusedBit_22_17 = bits, U32, 1160, [17:17] -unusedBit_22_18 = bits, U32, 1160, [18:18] -unusedBit_22_19 = bits, U32, 1160, [19:19] -unusedBit_22_20 = bits, U32, 1160, [20:20] -unusedBit_22_21 = bits, U32, 1160, [21:21] -unusedBit_22_22 = bits, U32, 1160, [22:22] -unusedBit_22_23 = bits, U32, 1160, [23:23] -unusedBit_22_24 = bits, U32, 1160, [24:24] -unusedBit_22_25 = bits, U32, 1160, [25:25] -unusedBit_22_26 = bits, U32, 1160, [26:26] -unusedBit_22_27 = bits, U32, 1160, [27:27] -unusedBit_22_28 = bits, U32, 1160, [28:28] -unusedBit_22_29 = bits, U32, 1160, [29:29] -unusedBit_22_30 = bits, U32, 1160, [30:30] -unusedBit_22_31 = bits, U32, 1160, [31:31] +isIdleCoasting = bits, U32, 1160, [17:17] +unusedBit_23_18 = bits, U32, 1160, [18:18] +unusedBit_23_19 = bits, U32, 1160, [19:19] +unusedBit_23_20 = bits, U32, 1160, [20:20] +unusedBit_23_21 = bits, U32, 1160, [21:21] +unusedBit_23_22 = bits, U32, 1160, [22:22] +unusedBit_23_23 = bits, U32, 1160, [23:23] +unusedBit_23_24 = bits, U32, 1160, [24:24] +unusedBit_23_25 = bits, U32, 1160, [25:25] +unusedBit_23_26 = bits, U32, 1160, [26:26] +unusedBit_23_27 = bits, U32, 1160, [27:27] +unusedBit_23_28 = bits, U32, 1160, [28:28] +unusedBit_23_29 = bits, U32, 1160, [29:29] +unusedBit_23_30 = bits, U32, 1160, [30:30] +unusedBit_23_31 = bits, U32, 1160, [31:31] targetRpmByClt = scalar, S32, 1164, "", 1, 0 targetRpmAcBump = scalar, S32, 1168, "", 1, 0 iacByRpmTaper = scalar, F32, 1172 @@ -4408,7 +4408,6 @@ entry = isKnockChipOk, "isKnockChipOk", int, "%d" entry = launchTriggered, "launchTriggered", int, "%d" entry = isTps2Error, "isTps2Error", int, "%d" entry = isIdleClosedLoop, "isIdleClosedLoop", int, "%d" -entry = isIdleCoasting, "isIdleCoasting", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -4810,7 +4809,7 @@ entry = mightResetPid, "The idea of 'mightResetPid' is to reset PID only once - entry = shouldResetPid, "idle: shouldResetPid", int, "%d" entry = wasResetPid, "idle: wasResetPid", int, "%d" entry = mustResetPid, "idle: mustResetPid", int, "%d" -entry = isCoasting, "idle: coasting", int, "%d" +entry = isCranking, "idle: cranking", int, "%d" entry = useIacTableForCoasting, "useIacTableForCoasting", int, "%d" entry = notIdling, "notIdling", int, "%d" entry = needReset, "idle: reset", int, "%d" @@ -4823,6 +4822,7 @@ entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" +entry = isIdleCoasting, "idle: coasting", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion of idle", float, "%.3f" @@ -5583,7 +5583,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCoasting}, "isCoasting No", "isCoasting Yes" + indicator = {isCranking}, "isCranking No", "isCranking Yes" indicator = {useIacTableForCoasting}, "useIacTableForCoasting No", "useIacTableForCoasting Yes" indicator = {notIdling}, "notIdling No", "notIdling Yes" indicator = {needReset}, "needReset No", "needReset Yes" @@ -5596,6 +5596,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" indicator = {useInstantRpmForIdle}, "useInstantRpmForIdle No", "useInstantRpmForIdle Yes" indicator = {isVerboseIAC}, "isVerboseIAC No", "isVerboseIAC Yes" + indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel 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 82d3b65429..ad716ddec8 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 Sun Aug 21 04:23:45 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Fri Aug 26 00:40:05 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -15,7 +15,7 @@ public class IdleState { public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 20, FieldType.BIT, 1); public static final Field WASRESETPID = Field.create("WASRESETPID", 20, FieldType.BIT, 2); public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 20, FieldType.BIT, 3); - public static final Field ISCOASTING = Field.create("ISCOASTING", 20, FieldType.BIT, 4); + public static final Field ISCRANKING = Field.create("ISCRANKING", 20, FieldType.BIT, 4); public static final Field USEIACTABLEFORCOASTING = Field.create("USEIACTABLEFORCOASTING", 20, FieldType.BIT, 5); public static final Field NOTIDLING = Field.create("NOTIDLING", 20, FieldType.BIT, 6); public static final Field NEEDRESET = Field.create("NEEDRESET", 20, FieldType.BIT, 7); @@ -28,21 +28,21 @@ public class IdleState { public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 20, FieldType.BIT, 14); public static final Field USEINSTANTRPMFORIDLE = Field.create("USEINSTANTRPMFORIDLE", 20, FieldType.BIT, 15); public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 20, FieldType.BIT, 16); - public static final Field UNUSEDBIT_22_17 = Field.create("UNUSEDBIT_22_17", 20, FieldType.BIT, 17); - public static final Field UNUSEDBIT_22_18 = Field.create("UNUSEDBIT_22_18", 20, FieldType.BIT, 18); - public static final Field UNUSEDBIT_22_19 = Field.create("UNUSEDBIT_22_19", 20, FieldType.BIT, 19); - public static final Field UNUSEDBIT_22_20 = Field.create("UNUSEDBIT_22_20", 20, FieldType.BIT, 20); - public static final Field UNUSEDBIT_22_21 = Field.create("UNUSEDBIT_22_21", 20, FieldType.BIT, 21); - public static final Field UNUSEDBIT_22_22 = Field.create("UNUSEDBIT_22_22", 20, FieldType.BIT, 22); - public static final Field UNUSEDBIT_22_23 = Field.create("UNUSEDBIT_22_23", 20, FieldType.BIT, 23); - public static final Field UNUSEDBIT_22_24 = Field.create("UNUSEDBIT_22_24", 20, FieldType.BIT, 24); - public static final Field UNUSEDBIT_22_25 = Field.create("UNUSEDBIT_22_25", 20, FieldType.BIT, 25); - public static final Field UNUSEDBIT_22_26 = Field.create("UNUSEDBIT_22_26", 20, FieldType.BIT, 26); - public static final Field UNUSEDBIT_22_27 = Field.create("UNUSEDBIT_22_27", 20, FieldType.BIT, 27); - public static final Field UNUSEDBIT_22_28 = Field.create("UNUSEDBIT_22_28", 20, FieldType.BIT, 28); - public static final Field UNUSEDBIT_22_29 = Field.create("UNUSEDBIT_22_29", 20, FieldType.BIT, 29); - public static final Field UNUSEDBIT_22_30 = Field.create("UNUSEDBIT_22_30", 20, FieldType.BIT, 30); - public static final Field UNUSEDBIT_22_31 = Field.create("UNUSEDBIT_22_31", 20, FieldType.BIT, 31); + public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 20, FieldType.BIT, 17); + public static final Field UNUSEDBIT_23_18 = Field.create("UNUSEDBIT_23_18", 20, FieldType.BIT, 18); + public static final Field UNUSEDBIT_23_19 = Field.create("UNUSEDBIT_23_19", 20, FieldType.BIT, 19); + public static final Field UNUSEDBIT_23_20 = Field.create("UNUSEDBIT_23_20", 20, FieldType.BIT, 20); + public static final Field UNUSEDBIT_23_21 = Field.create("UNUSEDBIT_23_21", 20, FieldType.BIT, 21); + public static final Field UNUSEDBIT_23_22 = Field.create("UNUSEDBIT_23_22", 20, FieldType.BIT, 22); + public static final Field UNUSEDBIT_23_23 = Field.create("UNUSEDBIT_23_23", 20, FieldType.BIT, 23); + public static final Field UNUSEDBIT_23_24 = Field.create("UNUSEDBIT_23_24", 20, FieldType.BIT, 24); + public static final Field UNUSEDBIT_23_25 = Field.create("UNUSEDBIT_23_25", 20, FieldType.BIT, 25); + public static final Field UNUSEDBIT_23_26 = Field.create("UNUSEDBIT_23_26", 20, FieldType.BIT, 26); + public static final Field UNUSEDBIT_23_27 = Field.create("UNUSEDBIT_23_27", 20, FieldType.BIT, 27); + public static final Field UNUSEDBIT_23_28 = Field.create("UNUSEDBIT_23_28", 20, FieldType.BIT, 28); + public static final Field UNUSEDBIT_23_29 = Field.create("UNUSEDBIT_23_29", 20, FieldType.BIT, 29); + public static final Field UNUSEDBIT_23_30 = Field.create("UNUSEDBIT_23_30", 20, FieldType.BIT, 30); + public static final Field UNUSEDBIT_23_31 = Field.create("UNUSEDBIT_23_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 IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 32, FieldType.FLOAT); @@ -57,7 +57,7 @@ public class IdleState { SHOULDRESETPID, WASRESETPID, MUSTRESETPID, - ISCOASTING, + ISCRANKING, USEIACTABLEFORCOASTING, NOTIDLING, NEEDRESET, @@ -70,21 +70,21 @@ public class IdleState { LOOKSLIKECRANKTOIDLE, USEINSTANTRPMFORIDLE, ISVERBOSEIAC, - UNUSEDBIT_22_17, - UNUSEDBIT_22_18, - UNUSEDBIT_22_19, - UNUSEDBIT_22_20, - UNUSEDBIT_22_21, - UNUSEDBIT_22_22, - UNUSEDBIT_22_23, - UNUSEDBIT_22_24, - UNUSEDBIT_22_25, - UNUSEDBIT_22_26, - UNUSEDBIT_22_27, - UNUSEDBIT_22_28, - UNUSEDBIT_22_29, - UNUSEDBIT_22_30, - UNUSEDBIT_22_31, + ISIDLECOASTING, + UNUSEDBIT_23_18, + UNUSEDBIT_23_19, + UNUSEDBIT_23_20, + UNUSEDBIT_23_21, + UNUSEDBIT_23_22, + UNUSEDBIT_23_23, + UNUSEDBIT_23_24, + UNUSEDBIT_23_25, + UNUSEDBIT_23_26, + UNUSEDBIT_23_27, + UNUSEDBIT_23_28, + UNUSEDBIT_23_29, + UNUSEDBIT_23_30, + UNUSEDBIT_23_31, TARGETRPMBYCLT, TARGETRPMACBUMP, IACBYRPMTAPER, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index 0fd2ea36cb..e10f5ca7f6 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Aug 24 16:15:07 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Aug 26 00:40:04 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -414,10 +414,10 @@ public class TsOutputs { public static final Field LAUNCHTRIGGERED = Field.create("LAUNCHTRIGGERED", 0, FieldType.BIT, 25); public static final Field ISTPS2ERROR = Field.create("ISTPS2ERROR", 0, FieldType.BIT, 26); public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 0, FieldType.BIT, 27); - public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 0, FieldType.BIT, 28); - public static final Field UNUSEDBIT_29_29 = Field.create("UNUSEDBIT_29_29", 0, FieldType.BIT, 29); - public static final Field UNUSEDBIT_29_30 = Field.create("UNUSEDBIT_29_30", 0, FieldType.BIT, 30); - public static final Field UNUSEDBIT_29_31 = Field.create("UNUSEDBIT_29_31", 0, FieldType.BIT, 31); + public static final Field UNUSEDBIT_28_28 = Field.create("UNUSEDBIT_28_28", 0, FieldType.BIT, 28); + public static final Field UNUSEDBIT_28_29 = Field.create("UNUSEDBIT_28_29", 0, FieldType.BIT, 29); + public static final Field UNUSEDBIT_28_30 = Field.create("UNUSEDBIT_28_30", 0, FieldType.BIT, 30); + public static final Field UNUSEDBIT_28_31 = Field.create("UNUSEDBIT_28_31", 0, FieldType.BIT, 31); public static final Field RPMVALUE = Field.create("RPMVALUE", 4, FieldType.INT16).setScale(1.0); public static final Field RPMACCELERATION = Field.create("RPMACCELERATION", 6, FieldType.INT16).setScale(1.0); public static final Field SPEEDTORPMRATIO = Field.create("SPEEDTORPMRATIO", 8, FieldType.INT16).setScale(0.01); @@ -938,10 +938,10 @@ public class TsOutputs { LAUNCHTRIGGERED, ISTPS2ERROR, ISIDLECLOSEDLOOP, - ISIDLECOASTING, - UNUSEDBIT_29_29, - UNUSEDBIT_29_30, - UNUSEDBIT_29_31, + UNUSEDBIT_28_28, + UNUSEDBIT_28_29, + UNUSEDBIT_28_30, + UNUSEDBIT_28_31, RPMVALUE, RPMACCELERATION, SPEEDTORPMRATIO,