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 ab72bb9379..3b14d55cef 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ 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 @@ - +