From 247a772f7f11197604cea5ec340e77c8def9455b Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 29 Nov 2021 05:41:48 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 +-- .../controllers/algo/rusefi_generated.h | 4 +-- ...ngine_configuration_generated_structures.h | 4 +-- .../controllers/algo/rusefi_generated.h | 4 +-- ...ngine_configuration_generated_structures.h | 4 +-- .../controllers/algo/rusefi_generated.h | 4 +-- .../console/binary/generated/data_logs.ini | 6 ++++ firmware/console/binary/generated/gauges.ini | 24 ++++------------ .../binary/generated/output_channels.ini | 24 ++++------------ .../console/binary/ts_outputs_generated.h | 26 ++++++++++++++---- ...ngine_configuration_generated_structures.h | 4 +-- .../controllers/generated/rusefi_generated.h | 4 +-- .../controllers/generated/signature_all.h | 4 +-- .../controllers/generated/signature_atlas.h | 4 +-- .../generated/signature_f429-discovery.h | 4 +-- .../generated/signature_frankenso_na6.h | 4 +-- .../generated/signature_hellen-nb1.h | 4 +-- .../generated/signature_hellen121nissan.h | 4 +-- .../generated/signature_hellen121vag.h | 4 +-- .../generated/signature_hellen128.h | 4 +-- .../generated/signature_hellen154hyundai.h | 4 +-- .../generated/signature_hellen72.h | 4 +-- .../generated/signature_hellen88bmw.h | 4 +-- .../generated/signature_hellenNA6.h | 4 +-- .../generated/signature_hellen_cypress.h | 4 +-- .../controllers/generated/signature_kin.h | 4 +-- .../controllers/generated/signature_mre_f4.h | 4 +-- .../controllers/generated/signature_mre_f7.h | 4 +-- .../generated/signature_prometheus_405.h | 4 +-- .../generated/signature_prometheus_469.h | 4 +-- .../generated/signature_proteus_f4.h | 4 +-- .../generated/signature_proteus_f7.h | 4 +-- .../generated/signature_subaru_eg33_f7.h | 4 +-- firmware/tunerstudio/generated/cache.zip | Bin 2193524 -> 2193517 bytes firmware/tunerstudio/generated/rusefi.ini | 18 +++++------- .../tunerstudio/generated/rusefi_atlas.ini | 18 +++++------- .../generated/rusefi_f429-discovery.ini | 18 +++++------- .../generated/rusefi_frankenso_na6.ini | 18 +++++------- .../generated/rusefi_hellen-nb1.ini | 18 +++++------- .../generated/rusefi_hellen121nissan.ini | 18 +++++------- .../generated/rusefi_hellen121vag.ini | 18 +++++------- .../generated/rusefi_hellen128mercedes.ini | 18 +++++------- .../generated/rusefi_hellen154hyundai.ini | 18 +++++------- .../tunerstudio/generated/rusefi_hellen72.ini | 18 +++++------- .../generated/rusefi_hellen88bmw.ini | 18 +++++------- .../generated/rusefi_hellenNA6.ini | 18 +++++------- .../generated/rusefi_hellen_cypress.ini | 18 +++++------- .../tunerstudio/generated/rusefi_kinetis.ini | 18 +++++------- .../tunerstudio/generated/rusefi_mre_f4.ini | 18 +++++------- .../tunerstudio/generated/rusefi_mre_f7.ini | 18 +++++------- .../generated/rusefi_prometheus_405.ini | 18 +++++------- .../generated/rusefi_prometheus_469.ini | 18 +++++------- .../generated/rusefi_proteus_f4.ini | 18 +++++------- .../generated/rusefi_proteus_f7.ini | 18 +++++------- .../generated/rusefi_subaru_eg33_f7.ini | 18 +++++------- .../com/rusefi/config/generated/Fields.java | 5 ++-- java_console/rusefi.xml | 2 +- 57 files changed, 248 insertions(+), 333 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 4718898569..6768c4d55d 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 04:23:45 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:40:27 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 04:23:45 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:40:27 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 446b835e85..e37d3fdce3 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -1818,7 +1818,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 4032726228 +#define SIGNATURE_HASH 299072679 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2336,7 +2336,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.29.hellen_cypress.4032726228" +#define TS_SIGNATURE "rusEFI 2021.11.29.hellen_cypress.299072679" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 f18d198ab4..68e21bbc8f 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 04:23:42 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:40:25 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 04:23:42 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:40:25 UTC 2021 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index e8cb91b856..9efac97cdb 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1803,7 +1803,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 268126248 +#define SIGNATURE_HASH 4000755803 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2321,7 +2321,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.29.kin.268126248" +#define TS_SIGNATURE "rusEFI 2021.11.29.kin.4000755803" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 e32b20abaa..86eb24a653 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 04:23:47 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:40:30 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 04:23:47 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:40:30 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index fd0f895bb5..ac7e4d6aee 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1831,7 +1831,7 @@ #define show_test_presets false #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 152139064 +#define SIGNATURE_HASH 3902573899 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2349,7 +2349,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.11.29.subaru_eg33_f7.152139064" +#define TS_SIGNATURE "rusEFI 2021.11.29.subaru_eg33_f7.3902573899" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 6199799100..d231fd103c 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -47,6 +47,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" @@ -88,6 +89,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" @@ -178,6 +180,10 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", 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/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index cc4c1e9126..d91944d575 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -48,7 +48,7 @@ MAPValueGauge = MAPValue,"MAP", "kPa", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 baroPressureGauge = baroPressure,"baroPressure", "kPa", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 lambdaValueGauge = lambdaValue,"Lambda", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 knockRetardGauge = knockRetard,"knockRetard", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unused37Gauge = unused37,"unused37", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +idleCurrentPositionGauge = idleCurrentPosition,"idleCurrentPosition", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 VBattGauge = VBatt,"VBatt", "V", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 oilPressureGauge = oilPressure,"Oil Pressure", "kPa", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 vvtPositionB1IGauge = vvtPositionB1I,"VVT: bank 1 intake", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 @@ -92,7 +92,7 @@ firmwareVersionGauge = firmwareVersion,"firmware", "version_f", 0.0,0.0, 0.0,0.0 tsConfigVersionGauge = tsConfigVersion,"tsConfigVersion", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 calibrationValueGauge = calibrationValue,"calibrationValue", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 calibrationModeGauge = calibrationMode,"calibrationMode", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedPaddingGauge = unusedPadding,"unusedPadding", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +idleTargetPositionGauge = idleTargetPosition,"idleTargetPosition", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 fuelingLoadGauge = fuelingLoad,"fuel: load", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 ignitionLoadGauge = ignitionLoad,"ign: load", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 engineMakeCodeNameCrc16Gauge = engineMakeCodeNameCrc16,"Engine CRC16", "crc16", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 @@ -420,22 +420,10 @@ unusedAtTheEnd233Gauge = unusedAtTheEnd233,"unusedAtTheEnd233", "", 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 -unusedAtTheEnd237Gauge = unusedAtTheEnd237,"unusedAtTheEnd237", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd238Gauge = unusedAtTheEnd238,"unusedAtTheEnd238", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd239Gauge = unusedAtTheEnd239,"unusedAtTheEnd239", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd240Gauge = unusedAtTheEnd240,"unusedAtTheEnd240", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd241Gauge = unusedAtTheEnd241,"unusedAtTheEnd241", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd242Gauge = unusedAtTheEnd242,"unusedAtTheEnd242", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd243Gauge = unusedAtTheEnd243,"unusedAtTheEnd243", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd244Gauge = unusedAtTheEnd244,"unusedAtTheEnd244", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd245Gauge = unusedAtTheEnd245,"unusedAtTheEnd245", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd246Gauge = unusedAtTheEnd246,"unusedAtTheEnd246", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd247Gauge = unusedAtTheEnd247,"unusedAtTheEnd247", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd248Gauge = unusedAtTheEnd248,"unusedAtTheEnd248", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd249Gauge = unusedAtTheEnd249,"unusedAtTheEnd249", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd250Gauge = unusedAtTheEnd250,"unusedAtTheEnd250", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd251Gauge = unusedAtTheEnd251,"unusedAtTheEnd251", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd252Gauge = unusedAtTheEnd252,"unusedAtTheEnd252", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +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 +etbFeedForwardGauge = etbFeedForward,"etbFeedForward", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbIntegralErrorGauge = etbIntegralError,"etbIntegralError", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 etbCurrentTargetGauge = etbCurrentTarget,"etbCurrentTarget", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 alternatorStatus_iTermGauge = alternatorStatus_iTerm,"alternatorStatus_ iTerm", "", -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 73f70342dc..ffda9368d4 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -48,7 +48,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 @@ -92,7 +92,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 @@ -420,22 +420,10 @@ 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 +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 diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index 77e31668bb..5bee842746 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:25:21 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:41:44 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -236,7 +236,7 @@ struct ts_outputs_s { /** * offset 37 */ - uint8_t unused37 = (uint8_t)0; + uint8_t idleCurrentPosition = (uint8_t)0; /** * @@GAUGE_NAME_VBAT@@ V @@ -488,7 +488,7 @@ struct ts_outputs_s { /** * offset 133 */ - scaled_channel unusedPadding = (uint8_t)0; + scaled_channel idleTargetPosition = (uint8_t)0; /** * @@GAUGE_NAME_FUEL_LOAD@@ % @@ -824,7 +824,23 @@ struct ts_outputs_s { /** * offset 320 */ - uint8_t unusedAtTheEnd[252]; + uint8_t unusedAtTheEnd[236]; + /** + * offset 556 + */ + int idleState = (int)0; + /** + * offset 560 + */ + float injectorFlowPressureRatio = (float)0; + /** + * offset 564 + */ + float injectorFlowPressureDelta = (float)0; + /** + * offset 568 + */ + float etbFeedForward = (float)0; /** * offset 572 */ @@ -849,4 +865,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:25:21 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:41:44 UTC 2021 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 87ab014fc0..29c9d0a216 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 04:23:39 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:40:23 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 04:23:39 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:40:23 UTC 2021 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 699531f68e..2ce8ae8f85 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1818,7 +1818,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 3400229736 +#define SIGNATURE_HASH 723950363 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2336,7 +2336,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.29.all.3400229736" +#define TS_SIGNATURE "rusEFI 2021.11.29.all.723950363" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index a994e5a70d..f013b0f869 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3400229736 -#define TS_SIGNATURE "rusEFI 2021.11.29.all.3400229736" +#define SIGNATURE_HASH 723950363 +#define TS_SIGNATURE "rusEFI 2021.11.29.all.723950363" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 6c6fec672a..52a295465f 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3596719695 -#define TS_SIGNATURE "rusEFI 2021.11.29.atlas.3596719695" +#define SIGNATURE_HASH 938241596 +#define TS_SIGNATURE "rusEFI 2021.11.29.atlas.938241596" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 557fa38817..47972f164b 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3400229736 -#define TS_SIGNATURE "rusEFI 2021.11.29.f429-discovery.3400229736" +#define SIGNATURE_HASH 723950363 +#define TS_SIGNATURE "rusEFI 2021.11.29.f429-discovery.723950363" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 7de71b0875..267be459de 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2962830977 -#define TS_SIGNATURE "rusEFI 2021.11.29.frankenso_na6.2962830977" +#define SIGNATURE_HASH 1360318194 +#define TS_SIGNATURE "rusEFI 2021.11.29.frankenso_na6.1360318194" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 54504e2635..ba2dd20b0a 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1870222305 -#define TS_SIGNATURE "rusEFI 2021.11.29.hellen-nb1.1870222305" +#define SIGNATURE_HASH 2398399378 +#define TS_SIGNATURE "rusEFI 2021.11.29.hellen-nb1.2398399378" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 6a16919e10..a21a671279 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1898906057 -#define TS_SIGNATURE "rusEFI 2021.11.29.hellen121nissan.1898906057" +#define SIGNATURE_HASH 2426599866 +#define TS_SIGNATURE "rusEFI 2021.11.29.hellen121nissan.2426599866" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index bf992b2baf..e614b8a1a9 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2500347746 -#define TS_SIGNATURE "rusEFI 2021.11.29.hellen121vag.2500347746" +#define SIGNATURE_HASH 1954922257 +#define TS_SIGNATURE "rusEFI 2021.11.29.hellen121vag.1954922257" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 76477d2f6d..b22ed4640c 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1349322959 -#define TS_SIGNATURE "rusEFI 2021.11.29.hellen128.1349322959" +#define SIGNATURE_HASH 2984308924 +#define TS_SIGNATURE "rusEFI 2021.11.29.hellen128.2984308924" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 532c0c70e1..0e0655ae00 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3900662222 -#define TS_SIGNATURE "rusEFI 2021.11.29.hellen154hyundai.3900662222" +#define SIGNATURE_HASH 166894013 +#define TS_SIGNATURE "rusEFI 2021.11.29.hellen154hyundai.166894013" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index ae2c36ed2f..4e5a93dbab 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1041687768 -#define TS_SIGNATURE "rusEFI 2021.11.29.hellen72.1041687768" +#define SIGNATURE_HASH 3751484587 +#define TS_SIGNATURE "rusEFI 2021.11.29.hellen72.3751484587" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 740fc62037..7a8cd5e3e2 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1802236471 -#define TS_SIGNATURE "rusEFI 2021.11.29.hellen88bmw.1802236471" +#define SIGNATURE_HASH 2330331716 +#define TS_SIGNATURE "rusEFI 2021.11.29.hellen88bmw.2330331716" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 5754068ce7..af10b8ba8c 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3163956672 -#define TS_SIGNATURE "rusEFI 2021.11.29.hellenNA6.3163956672" +#define SIGNATURE_HASH 1562107315 +#define TS_SIGNATURE "rusEFI 2021.11.29.hellenNA6.1562107315" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index d297964740..53f378a8c3 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 4032726228 -#define TS_SIGNATURE "rusEFI 2021.11.29.hellen_cypress.4032726228" +#define SIGNATURE_HASH 299072679 +#define TS_SIGNATURE "rusEFI 2021.11.29.hellen_cypress.299072679" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 92e50d6940..a132de2624 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 268126248 -#define TS_SIGNATURE "rusEFI 2021.11.29.kin.268126248" +#define SIGNATURE_HASH 4000755803 +#define TS_SIGNATURE "rusEFI 2021.11.29.kin.4000755803" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 77f5979e2c..2663bd9555 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2039224796 -#define TS_SIGNATURE "rusEFI 2021.11.29.mre_f4.2039224796" +#define SIGNATURE_HASH 2550260143 +#define TS_SIGNATURE "rusEFI 2021.11.29.mre_f4.2550260143" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index f810da49da..72b3285f7c 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2039224796 -#define TS_SIGNATURE "rusEFI 2021.11.29.mre_f7.2039224796" +#define SIGNATURE_HASH 2550260143 +#define TS_SIGNATURE "rusEFI 2021.11.29.mre_f7.2550260143" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 086a946794..c921d9d846 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2587998862 -#define TS_SIGNATURE "rusEFI 2021.11.29.prometheus_405.2587998862" +#define SIGNATURE_HASH 2076984061 +#define TS_SIGNATURE "rusEFI 2021.11.29.prometheus_405.2076984061" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 6995e9861a..4e63c1c760 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2587998862 -#define TS_SIGNATURE "rusEFI 2021.11.29.prometheus_469.2587998862" +#define SIGNATURE_HASH 2076984061 +#define TS_SIGNATURE "rusEFI 2021.11.29.prometheus_469.2076984061" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 2834f54214..4acd5527e2 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1641285865 -#define TS_SIGNATURE "rusEFI 2021.11.29.proteus_f4.1641285865" +#define SIGNATURE_HASH 2153377946 +#define TS_SIGNATURE "rusEFI 2021.11.29.proteus_f4.2153377946" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index c5d62dd448..a73d10979e 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1641285865 -#define TS_SIGNATURE "rusEFI 2021.11.29.proteus_f7.1641285865" +#define SIGNATURE_HASH 2153377946 +#define TS_SIGNATURE "rusEFI 2021.11.29.proteus_f7.2153377946" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 12d91d8137..2fc9c29f1f 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 152139064 -#define TS_SIGNATURE "rusEFI 2021.11.29.subaru_eg33_f7.152139064" +#define SIGNATURE_HASH 3902573899 +#define TS_SIGNATURE "rusEFI 2021.11.29.subaru_eg33_f7.3902573899" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index ab72bb93790370a7f5bd050c8a13f37b9cd25674..3b14d55cef4aef835d3c33c8acdf57362d0db28a 100644 GIT binary patch delta 127964 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 z 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 CYWn#A delta 128147 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 H$lv}CHLDS4 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 80442eda80..38e78de8f4 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.all.3400229736" + signature = "rusEFI 2021.11.29.all.723950363" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.all.3400229736" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.all.723950363" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:39 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:40:23 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index e7d4091675..e60dd2743d 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.atlas.3596719695" + signature = "rusEFI 2021.11.29.atlas.938241596" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.atlas.3596719695" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.atlas.938241596" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:36 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:40:20 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index e0fa4a28fa..2c752db4b9 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.f429-discovery.3400229736" + signature = "rusEFI 2021.11.29.f429-discovery.723950363" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.f429-discovery.3400229736" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.f429-discovery.723950363" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:22: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:39:41 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index c244a8cc60..9a04db3986 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.frankenso_na6.2962830977" + signature = "rusEFI 2021.11.29.frankenso_na6.1360318194" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.frankenso_na6.2962830977" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.frankenso_na6.1360318194" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:21 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:40:08 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 39d232cd1c..13158f22bb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.hellen-nb1.1870222305" + signature = "rusEFI 2021.11.29.hellen-nb1.2398399378" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.hellen-nb1.1870222305" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.hellen-nb1.2398399378" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23: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:39:58 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index babc22363b..bdaf03b880 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.hellen121nissan.1898906057" + signature = "rusEFI 2021.11.29.hellen121nissan.2426599866" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.hellen121nissan.1898906057" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.hellen121nissan.2426599866" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:22:54 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:39:48 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 248136c29f..c6d17c7ef9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.hellen121vag.2500347746" + signature = "rusEFI 2021.11.29.hellen121vag.1954922257" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.hellen121vag.2500347746" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.hellen121vag.1954922257" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:22:51 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:39:45 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 5c51a66240..5a0eecc808 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.hellen128.1349322959" + signature = "rusEFI 2021.11.29.hellen128.2984308924" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.hellen128.1349322959" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.hellen128.2984308924" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:22: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:39:43 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 08a859ad27..66e5776a47 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.hellen154hyundai.3900662222" + signature = "rusEFI 2021.11.29.hellen154hyundai.166894013" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.hellen154hyundai.3900662222" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.hellen154hyundai.166894013" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:22: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:39:50 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index a025a5ce31..a7713aa869 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.hellen72.1041687768" + signature = "rusEFI 2021.11.29.hellen72.3751484587" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.hellen72.1041687768" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.hellen72.3751484587" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:04 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:39:55 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 74f9aeaa5b..8af579ed09 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.hellen88bmw.1802236471" + signature = "rusEFI 2021.11.29.hellen88bmw.2330331716" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.hellen88bmw.1802236471" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.hellen88bmw.2330331716" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:01 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:39:53 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 4e702c6623..2c86585bff 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.hellenNA6.3163956672" + signature = "rusEFI 2021.11.29.hellenNA6.1562107315" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.hellenNA6.3163956672" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.hellenNA6.1562107315" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:11 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:00 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 4dfc6c16e3..7a527771f2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.hellen_cypress.4032726228" + signature = "rusEFI 2021.11.29.hellen_cypress.299072679" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.hellen_cypress.4032726228" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.hellen_cypress.299072679" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:45 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:40:27 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index aafb5c352e..117ed50838 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.kin.268126248" + signature = "rusEFI 2021.11.29.kin.4000755803" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.kin.268126248" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.kin.4000755803" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:42 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:40:25 UTC 2021 pageSize = 19972 page = 1 @@ -2320,14 +2320,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3424,6 +3418,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index afe7e47a33..873355aea9 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.mre_f4.2039224796" + signature = "rusEFI 2021.11.29.mre_f4.2550260143" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.mre_f4.2039224796" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.mre_f4.2550260143" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:17 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:05 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index e259db5e05..55287acfc4 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.mre_f7.2039224796" + signature = "rusEFI 2021.11.29.mre_f7.2550260143" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.mre_f7.2039224796" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.mre_f7.2550260143" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:14 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 29 05:40:03 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 9569901257..f4073d13d9 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.prometheus_405.2587998862" + signature = "rusEFI 2021.11.29.prometheus_405.2076984061" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.prometheus_405.2587998862" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.prometheus_405.2076984061" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:27 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:40:13 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 5d0263bf5f..21a98bd55f 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.prometheus_469.2587998862" + signature = "rusEFI 2021.11.29.prometheus_469.2076984061" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.prometheus_469.2587998862" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.prometheus_469.2076984061" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:24 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:40:10 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index d9d968b597..f3d262b548 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.proteus_f4.1641285865" + signature = "rusEFI 2021.11.29.proteus_f4.2153377946" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.proteus_f4.1641285865" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.proteus_f4.2153377946" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:33 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:40:18 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 20f1e6cbfd..791286174b 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.proteus_f7.1641285865" + signature = "rusEFI 2021.11.29.proteus_f7.2153377946" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.proteus_f7.1641285865" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.proteus_f7.2153377946" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:30 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:40:15 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index eb35b4af20..9d192035e7 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.29.subaru_eg33_f7.152139064" + signature = "rusEFI 2021.11.29.subaru_eg33_f7.3902573899" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.29.subaru_eg33_f7.152139064" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.29.subaru_eg33_f7.3902573899" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 04:23:47 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:40:30 UTC 2021 pageSize = 20000 page = 1 @@ -2354,14 +2354,8 @@ unusedAtTheEnd249 = scalar, U08, 568, "", 1, 0 unusedAtTheEnd250 = scalar, U08, 569, "", 1, 0 unusedAtTheEnd251 = scalar, U08, 570, "", 1, 0 unusedAtTheEnd252 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd253 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd254 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd255 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd256 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd257 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd258 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd259 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd260 = scalar, U08, 579, "", 1, 0 +etbIntegralError = scalar, F32, 572, "", 1, 0 +etbCurrentTarget = scalar, F32, 576, "", 1, 0 alternatorStatus_iTerm = scalar, F32, 580, "", 1, 0 alternatorStatus_dTerm = scalar, F32, 584, "", 1, 0 alternatorStatus_output = scalar, F32, 588, "", 1, 0 @@ -3458,6 +3452,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d" entry = vvtTargets3, "vvtTargets3", int, "%d" entry = vvtTargets4, "vvtTargets4", int, "%d" entry = turboSpeed, "Turbocharger Speed", int, "%d" +entry = etbIntegralError, "etbIntegralError", float, "%.3f" +entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" entry = alternatorStatus_iTerm, "iTerm", float, "%.3f" entry = alternatorStatus_dTerm, "dTerm", float, "%.3f" entry = alternatorStatus_output, "output", 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 306a8e5f6c..502f89699b 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 04:23:39 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:40:23 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1745,6 +1745,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; + public static final int SIGNATURE_HASH = 723950363; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -2207,7 +2208,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.11.29.all.3400229736"; + public static final String TS_SIGNATURE = "rusEFI 2021.11.29.all.723950363"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 728; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 8caec5cec6..d131f1111a 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +