From f61f3e28346a705fce9311b3c9fde69e383bb50e Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 29 Nov 2021 06:00:58 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 +- ...ngine_configuration_generated_structures.h | 4 +- ...ngine_configuration_generated_structures.h | 4 +- .../console/binary/generated/data_logs.ini | 13 +++ firmware/console/binary/generated/gauges.ini | 48 +++------ .../binary/generated/output_channels.ini | 48 +++------ .../console/binary/ts_outputs_generated.h | 58 ++++++++++- ...ngine_configuration_generated_structures.h | 4 +- firmware/tunerstudio/generated/cache.zip | Bin 2193517 -> 2196318 bytes firmware/tunerstudio/generated/rusefi.ini | 93 ++++++++---------- .../tunerstudio/generated/rusefi_atlas.ini | 93 ++++++++---------- .../generated/rusefi_f429-discovery.ini | 93 ++++++++---------- .../generated/rusefi_frankenso_na6.ini | 93 ++++++++---------- .../generated/rusefi_hellen-nb1.ini | 93 ++++++++---------- .../generated/rusefi_hellen121nissan.ini | 93 ++++++++---------- .../generated/rusefi_hellen121vag.ini | 93 ++++++++---------- .../generated/rusefi_hellen128mercedes.ini | 93 ++++++++---------- .../generated/rusefi_hellen154hyundai.ini | 93 ++++++++---------- .../tunerstudio/generated/rusefi_hellen72.ini | 93 ++++++++---------- .../generated/rusefi_hellen88bmw.ini | 93 ++++++++---------- .../generated/rusefi_hellenNA6.ini | 93 ++++++++---------- .../generated/rusefi_hellen_cypress.ini | 93 ++++++++---------- .../tunerstudio/generated/rusefi_kinetis.ini | 93 ++++++++---------- .../tunerstudio/generated/rusefi_mre_f4.ini | 93 ++++++++---------- .../tunerstudio/generated/rusefi_mre_f7.ini | 93 ++++++++---------- .../generated/rusefi_prometheus_405.ini | 93 ++++++++---------- .../generated/rusefi_prometheus_469.ini | 93 ++++++++---------- .../generated/rusefi_proteus_f4.ini | 93 ++++++++---------- .../generated/rusefi_proteus_f7.ini | 93 ++++++++---------- .../generated/rusefi_subaru_eg33_f7.ini | 93 ++++++++---------- .../com/rusefi/config/generated/Fields.java | 2 +- java_console/rusefi.xml | 2 +- 32 files changed, 944 insertions(+), 1196 deletions(-) diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 6768c4d55d..2a5a677a42 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 29 05:40:27 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 29 05:59:38 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4546,4 +4546,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 29 05:40:27 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 29 05:59:38 UTC 2021 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 68e21bbc8f..fe3064af12 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 29 05:40:25 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 29 05:59:35 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4540,4 +4540,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 29 05:40:25 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 29 05:59:35 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 86eb24a653..2d11c152c4 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:30 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:41 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4546,4 +4546,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:30 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:41 UTC 2021 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index d231fd103c..392b76f9e3 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -68,7 +68,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -180,6 +182,17 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" entry = idleState, "idleState", int, "%d" entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index d91944d575..de940360ba 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -69,9 +69,9 @@ baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "%" currentEnginePhaseGauge = currentEnginePhase,"Engine Phase", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 wallFuelAmountGauge = wallFuelAmount,"fuel: wall corr ms", "mg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 wallFuelCorrectionGauge = wallFuelCorrection,"fuel: wall amount", "mg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unused76Gauge = unused76,"unused76", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +revolutionCounterSinceStartGauge = revolutionCounterSinceStart,"revolutionCounterSinceStart", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 deltaTpsGauge = deltaTps,"fuel: TPS change", "ratio", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unused80Gauge = unused80,"unused80", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 tpsAccelFuelGauge = tpsAccelFuel,"fuel: TPS acceleration extra fuel ms", "ms", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 ignitionAdvanceGauge = ignitionAdvance,"timing", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 sparkDwellValueGauge = sparkDwellValue,"dwell: coil charge time", "ms", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 @@ -388,38 +388,18 @@ unusedAtTheEnd201Gauge = unusedAtTheEnd201,"unusedAtTheEnd201", "", 0.0,0.0, 0.0 unusedAtTheEnd202Gauge = unusedAtTheEnd202,"unusedAtTheEnd202", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd203Gauge = unusedAtTheEnd203,"unusedAtTheEnd203", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd204Gauge = unusedAtTheEnd204,"unusedAtTheEnd204", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd205Gauge = unusedAtTheEnd205,"unusedAtTheEnd205", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd206Gauge = unusedAtTheEnd206,"unusedAtTheEnd206", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd207Gauge = unusedAtTheEnd207,"unusedAtTheEnd207", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd208Gauge = unusedAtTheEnd208,"unusedAtTheEnd208", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd209Gauge = unusedAtTheEnd209,"unusedAtTheEnd209", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd210Gauge = unusedAtTheEnd210,"unusedAtTheEnd210", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd211Gauge = unusedAtTheEnd211,"unusedAtTheEnd211", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd212Gauge = unusedAtTheEnd212,"unusedAtTheEnd212", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd213Gauge = unusedAtTheEnd213,"unusedAtTheEnd213", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd214Gauge = unusedAtTheEnd214,"unusedAtTheEnd214", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd215Gauge = unusedAtTheEnd215,"unusedAtTheEnd215", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd216Gauge = unusedAtTheEnd216,"unusedAtTheEnd216", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd217Gauge = unusedAtTheEnd217,"unusedAtTheEnd217", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd218Gauge = unusedAtTheEnd218,"unusedAtTheEnd218", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd219Gauge = unusedAtTheEnd219,"unusedAtTheEnd219", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd220Gauge = unusedAtTheEnd220,"unusedAtTheEnd220", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd221Gauge = unusedAtTheEnd221,"unusedAtTheEnd221", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd222Gauge = unusedAtTheEnd222,"unusedAtTheEnd222", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd223Gauge = unusedAtTheEnd223,"unusedAtTheEnd223", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd224Gauge = unusedAtTheEnd224,"unusedAtTheEnd224", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd225Gauge = unusedAtTheEnd225,"unusedAtTheEnd225", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd226Gauge = unusedAtTheEnd226,"unusedAtTheEnd226", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd227Gauge = unusedAtTheEnd227,"unusedAtTheEnd227", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd228Gauge = unusedAtTheEnd228,"unusedAtTheEnd228", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd229Gauge = unusedAtTheEnd229,"unusedAtTheEnd229", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd230Gauge = unusedAtTheEnd230,"unusedAtTheEnd230", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd231Gauge = unusedAtTheEnd231,"unusedAtTheEnd231", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd232Gauge = unusedAtTheEnd232,"unusedAtTheEnd232", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd233Gauge = unusedAtTheEnd233,"unusedAtTheEnd233", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd234Gauge = unusedAtTheEnd234,"unusedAtTheEnd234", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd235Gauge = unusedAtTheEnd235,"unusedAtTheEnd235", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd236Gauge = unusedAtTheEnd236,"unusedAtTheEnd236", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +triggerPrimaryFallGauge = triggerPrimaryFall,"triggerPrimaryFall", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +triggerPrimaryRiseGauge = triggerPrimaryRise,"triggerPrimaryRise", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +triggerSecondaryFallGauge = triggerSecondaryFall,"triggerSecondaryFall", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +triggerSecondaryRiseGauge = triggerSecondaryRise,"triggerSecondaryRise", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +triggerVvtFallGauge = triggerVvtFall,"triggerVvtFall", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +triggerVvtRiseGauge = triggerVvtRise,"triggerVvtRise", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +startStopStateToggleCounterGauge = startStopStateToggleCounter,"startStopStateToggleCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +starterStateGauge = starterState,"starterState", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +starterRelayDisableGauge = starterRelayDisable,"starterRelayDisable", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +unusedStarterRelayDisableGauge = unusedStarterRelayDisable,"unusedStarterRelayDisable", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 idleStateGauge = idleState,"idleState", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 injectorFlowPressureRatioGauge = injectorFlowPressureRatio,"injectorFlowPressureRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 injectorFlowPressureDeltaGauge = injectorFlowPressureDelta,"injectorFlowPressureDelta", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index ffda9368d4..f40bc20d1c 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -69,9 +69,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -388,38 +388,18 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 idleState = scalar, S32, 556, "", 1, 0 injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index 5bee842746..1c5225a40c 100644 --- a/firmware/console/binary/ts_outputs_generated.h +++ b/firmware/console/binary/ts_outputs_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Nov 29 05:41:44 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Nov 29 05:58:39 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -362,7 +362,7 @@ struct ts_outputs_s { /** * offset 76 */ - uint16_t unused76 = (uint16_t)0; + uint16_t revolutionCounterSinceStart = (uint16_t)0; /** * @@GAUGE_NAME_FUEL_TPS_ROC@@ ratio @@ -372,7 +372,7 @@ struct ts_outputs_s { /** * offset 80 */ - uint16_t unused80 = (uint16_t)0; + uint16_t canReadCounter = (uint16_t)0; /** * @@GAUGE_NAME_FUEL_TPS_EXTRA@@ ms @@ -824,7 +824,55 @@ struct ts_outputs_s { /** * offset 320 */ - uint8_t unusedAtTheEnd[236]; + uint8_t unusedAtTheEnd[204]; + /** + * offset 524 + */ + uint16_t canWriteOk = (uint16_t)0; + /** + * offset 526 + */ + uint16_t canWriteNotOk = (uint16_t)0; + /** + * offset 528 + */ + int triggerPrimaryFall = (int)0; + /** + * offset 532 + */ + int triggerPrimaryRise = (int)0; + /** + * offset 536 + */ + int triggerSecondaryFall = (int)0; + /** + * offset 540 + */ + int triggerSecondaryRise = (int)0; + /** + * offset 544 + */ + int triggerVvtFall = (int)0; + /** + * offset 548 + */ + int triggerVvtRise = (int)0; + /** + * offset 552 + */ + uint8_t startStopStateToggleCounter = (uint8_t)0; + /** + * offset 553 + */ + uint8_t starterState = (uint8_t)0; + /** + * offset 554 + */ + uint8_t starterRelayDisable = (uint8_t)0; + /** + * offset 555 + */ + uint8_t unusedStarterRelayDisable = (uint8_t)0; /** * offset 556 */ @@ -865,4 +913,4 @@ struct ts_outputs_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Nov 29 05:41:44 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Nov 29 05:58:39 UTC 2021 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 29c9d0a216..2cc49ed087 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:23 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:32 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4546,4 +4546,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:23 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:32 UTC 2021 diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 3b14d55cef4aef835d3c33c8acdf57362d0db28a..c7871c2f3aab5a76e8857bb9ae2d78a8a12b90ff 100644 GIT binary patch delta 144649 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 F`X8e#a&!Oy diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 38e78de8f4..3b5cbcfefe 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:23 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:32 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index e60dd2743d..1da8d1183d 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:20 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:29 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 2c752db4b9..84b9cf3c03 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:39:41 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:58:41 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 9a04db3986..d83edf8f8e 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:08 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:13 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 13158f22bb..a92141ee48 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:39:58 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:01 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index bdaf03b880..9085433b00 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:39:48 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:58:50 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index c6d17c7ef9..87344e9e9a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:39:45 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:58:47 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 5a0eecc808..271989d6cf 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:39:43 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:58:44 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 66e5776a47..3774040f69 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:39:50 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:58:52 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index a7713aa869..20340eb89d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:39:55 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:58:58 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 8af579ed09..397069477a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:39:53 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:58:55 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 2c86585bff..b819b5acc7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:00 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:04 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 7a527771f2..9b7489dfe1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 29 05:40:27 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 29 05:59:38 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 117ed50838..4fa286e646 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 29 05:40:25 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 29 05:59:35 UTC 2021 pageSize = 19972 page = 1 @@ -1932,7 +1932,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1953,9 +1953,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -1976,7 +1976,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2272,54 +2272,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3287,6 +3255,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3307,7 +3276,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3328,6 +3299,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3418,6 +3390,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 873355aea9..eed90e125e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:05 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:10 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 55287acfc4..6dc1544c44 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:03 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:07 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f4073d13d9..2230aee694 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:13 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:19 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 21a98bd55f..3e46362e89 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:10 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:16 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index f3d262b548..cb281db2cf 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:18 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:25 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 791286174b..5c39c6889e 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:15 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:22 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 9d192035e7..6e9f79b11a 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:30 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:41 UTC 2021 pageSize = 20000 page = 1 @@ -1966,7 +1966,7 @@ MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 knockRetard = scalar, U08, 36, "deg", 0.1, 0 -unused37 = scalar, U08, 37, "", 1, 0 +idleCurrentPosition = scalar, U08, 37, "", 1, 0 VBatt = scalar, U16, 38, "V", 0.001, 0 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0 @@ -1987,9 +1987,9 @@ baroCorrection = scalar, U16, 68, "%", 0.01, 0 currentEnginePhase = scalar, U16, 70, "deg", 1, 0 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0 wallFuelCorrection = scalar, S16, 74, "mg", 0.01, 0 -unused76 = scalar, U16, 76, "", 1, 0 +revolutionCounterSinceStart = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 -unused80 = scalar, U16, 80, "", 1, 0 +canReadCounter = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 @@ -2010,7 +2010,7 @@ firmwareVersion = scalar, U32, 120, "version_f", 1, 0 tsConfigVersion = scalar, U32, 124, "", 1, 0 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 -unusedPadding = scalar, U08, 133, "", 1, 0 +idleTargetPosition = scalar, U08, 133, "", 1, 0 fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 @@ -2306,54 +2306,22 @@ unusedAtTheEnd201 = scalar, U08, 520, "", 1, 0 unusedAtTheEnd202 = scalar, U08, 521, "", 1, 0 unusedAtTheEnd203 = scalar, U08, 522, "", 1, 0 unusedAtTheEnd204 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd205 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd206 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd207 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd208 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd209 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd210 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd211 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd212 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd213 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd214 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd215 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd216 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd217 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd218 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd219 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd220 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd221 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd222 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd223 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd224 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd225 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd226 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd227 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd228 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd229 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd230 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd231 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd232 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd233 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd234 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd235 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd236 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd237 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd238 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd239 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd240 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd241 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd242 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd243 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd244 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd245 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd246 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd247 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd248 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 +canWriteOk = scalar, U16, 524, "", 1, 0 +canWriteNotOk = scalar, U16, 526, "", 1, 0 +triggerPrimaryFall = scalar, S32, 528, "", 1, 0 +triggerPrimaryRise = scalar, S32, 532, "", 1, 0 +triggerSecondaryFall = scalar, S32, 536, "", 1, 0 +triggerSecondaryRise = scalar, S32, 540, "", 1, 0 +triggerVvtFall = scalar, S32, 544, "", 1, 0 +triggerVvtRise = scalar, S32, 548, "", 1, 0 +startStopStateToggleCounter = scalar, U08, 552, "", 1, 0 +starterState = scalar, U08, 553, "", 1, 0 +starterRelayDisable = scalar, U08, 554, "", 1, 0 +unusedStarterRelayDisable = scalar, U08, 555, "", 1, 0 +idleState = scalar, S32, 556, "", 1, 0 +injectorFlowPressureRatio = scalar, F32, 560, "", 1, 0 +injectorFlowPressureDelta = scalar, F32, 564, "", 1, 0 +etbFeedForward = scalar, F32, 568, "", 1, 0 etbIntegralError = scalar, F32, 572, "", 1, 0 etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 @@ -3321,6 +3289,7 @@ entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" entry = knockRetard, "knockRetard", float, "%.3f" +entry = idleCurrentPosition, "idleCurrentPosition", int, "%d" entry = VBatt, "VBatt", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" @@ -3341,7 +3310,9 @@ entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f" entry = currentEnginePhase, "Engine Phase", int, "%d" entry = wallFuelAmount, "fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection, "fuel: wall amount", float, "%.3f" +entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" entry = deltaTps, "fuel: TPS change", float, "%.3f" +entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", float, "%.3f" entry = ignitionAdvance, "timing", float, "%.3f" entry = sparkDwellValue, "dwell: coil charge time", float, "%.3f" @@ -3362,6 +3333,7 @@ entry = firmwareVersion, "firmware", int, "%d" entry = tsConfigVersion, "tsConfigVersion", int, "%d" entry = calibrationValue, "calibrationValue", float, "%.3f" entry = calibrationMode, "calibrationMode", int, "%d" +entry = idleTargetPosition, "idleTargetPosition", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" entry = ignitionLoad, "ign: load", float, "%.3f" entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" @@ -3452,6 +3424,21 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = canWriteOk, "canWriteOk", int, "%d" +entry = canWriteNotOk, "canWriteNotOk", int, "%d" +entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" +entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" +entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" +entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" +entry = triggerVvtFall, "triggerVvtFall", int, "%d" +entry = triggerVvtRise, "triggerVvtRise", int, "%d" +entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = starterState, "starterState", int, "%d" +entry = starterRelayDisable, "starterRelayDisable", int, "%d" +entry = idleState, "idleState", int, "%d" +entry = injectorFlowPressureRatio, "injectorFlowPressureRatio", float, "%.3f" +entry = injectorFlowPressureDelta, "injectorFlowPressureDelta", float, "%.3f" +entry = etbFeedForward, "etbFeedForward", float, "%.3f" entry = etbIntegralError, "etbIntegralError", float, "%.3f" entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 502f89699b..6d1f663849 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:23 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:59:32 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index d131f1111a..19a1b1ca7d 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +