diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h index 12bdb45532..e75d3d2591 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h @@ -832,7 +832,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1735027491 +#define SIGNATURE_HASH 4058461404 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1159,7 +1159,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.02.28.cypress.1735027491" +#define TS_SIGNATURE "rusEFI master.2024.02.29.cypress.4058461404" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h index abfc5b9fa0..bc0f7cc473 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h @@ -832,7 +832,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 633056397 +#define SIGNATURE_HASH 3006722930 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1159,7 +1159,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.02.28.kin.633056397" +#define TS_SIGNATURE "rusEFI master.2024.02.29.kin.3006722930" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h index 37b0b5453d..d1cae8ac82 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h @@ -1069,7 +1069,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3565977035 +#define SIGNATURE_HASH 1107370548 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1396,7 +1396,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.02.28.subaru_eg33_f7.3565977035" +#define TS_SIGNATURE "rusEFI master.2024.02.29.subaru_eg33_f7.1107370548" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index b72ee0aa2b..b8c18b942b 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -401,7 +401,7 @@ entry = idealEngineTorque, "idealEngineTorque", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" -entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" +entry = dwellDurationAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ign: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ign: IAT correction", float, "%.3f" entry = timingPidCorrection, "Idle: Timing adjustment", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index dfec0eb2cd..bc4c383b6d 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -34,7 +34,7 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_1_Graph, "Graph", South graphLine = baseDwell graphLine = sparkDwell - graphLine = dwellAngle + graphLine = dwellDurationAngle graphLine = cltTimingCorrection liveGraph = ignition_state_2_Graph, "Graph", South graphLine = timingIatCorrection diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 6690b25953..65ae4a8527 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -10,7 +10,7 @@ targetAFRGauge = targetAFR,"Fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10 gaugeCategory = "Timing" baseDwellGauge = baseDwell,"Ignition: base dwell", "ms", 0.0,30.0, 0.0,30.0, 0.0,30.0, 1,1 sparkDwellGauge = sparkDwell,"Ignition: coil charge time", "ms", 0.0,30.0, 0.0,30.0, 0.0,30.0, 1,1 -dwellAngleGauge = dwellAngle,"Ignition: dwell duration", "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1 +dwellDurationAngleGauge = dwellDurationAngle,"Ignition: dwell duration", "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1 cltTimingCorrectionGauge = cltTimingCorrection,"Ign: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ign: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingPidCorrectionGauge = timingPidCorrection,"Idle: Timing adjustment", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index e936a87242..613de83ca3 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -493,7 +493,7 @@ injectorHwIssue = bits, U32, 844, [0:0] ; total TS size = 848 baseDwell = scalar, F32, 848, "ms", 1,0 sparkDwell = scalar, F32, 852, "ms", 1,0 -dwellAngle = scalar, F32, 856, "deg", 1,0 +dwellDurationAngle = scalar, F32, 856, "deg", 1,0 cltTimingCorrection = scalar, S16, 860, "deg", 0.01,0 timingIatCorrection = scalar, S16, 862, "deg", 0.01,0 timingPidCorrection = scalar, S16, 864, "deg", 0.01,0 diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index 8102eb8dd9..cb9dc61f2f 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -353,7 +353,7 @@ static const LogField fields[] = { #endif {engine->ignitionState.baseDwell, "Ignition: base dwell", "ms", 1, "Timing"}, {engine->ignitionState.sparkDwell, "Ignition: coil charge time", "ms", 1, "Timing"}, - {engine->ignitionState.dwellAngle, "Ignition: dwell duration", "deg", 1, "Timing"}, + {engine->ignitionState.dwellDurationAngle, "Ignition: dwell duration", "deg", 1, "Timing"}, {engine->ignitionState.cltTimingCorrection, "Ign: CLT correction", "deg", 2, "Timing"}, {engine->ignitionState.timingIatCorrection, "Ign: IAT correction", "deg", 2, "Timing"}, {engine->ignitionState.timingPidCorrection, "Idle: Timing adjustment", "deg", 2, "Timing"}, diff --git a/firmware/controllers/algo/ignition_state_generated.h b/firmware/controllers/algo/ignition_state_generated.h index 58af6742d4..1f878abea8 100644 --- a/firmware/controllers/algo/ignition_state_generated.h +++ b/firmware/controllers/algo/ignition_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/ignition_state.txt Sat Feb 03 21:42:28 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition_state.txt Thu Feb 29 00:39:49 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -25,7 +25,7 @@ struct ignition_state_s { * units: deg * offset 8 */ - angle_t dwellAngle = (angle_t)0; + angle_t dwellDurationAngle = (angle_t)0; /** * Ign: CLT correction * units: deg @@ -180,4 +180,4 @@ struct ignition_state_s { static_assert(sizeof(ignition_state_s) == 40); // end -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/ignition_state.txt Sat Feb 03 21:42:28 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition_state.txt Thu Feb 29 00:39:49 UTC 2024 diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index 27208a6bc9..5bddb66931 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 3570063612 +#define SIGNATURE_HASH 1111983875 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1485,7 +1485,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.02.29.f407-discovery.3570063612" +#define TS_SIGNATURE "rusEFI master.2024.02.29.f407-discovery.1111983875" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index d48c2de38b..ec44a9f886 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 1735027491 -#define TS_SIGNATURE "rusEFI master.2024.02.28.cypress.1735027491" +#define SIGNATURE_HASH 4058461404 +#define TS_SIGNATURE "rusEFI master.2024.02.29.cypress.4058461404" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index b53a4dc00c..bb54b69f48 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3570063612 -#define TS_SIGNATURE "rusEFI master.2024.02.29.f407-discovery.3570063612" +#define SIGNATURE_HASH 1111983875 +#define TS_SIGNATURE "rusEFI master.2024.02.29.f407-discovery.1111983875" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index e22644ff8a..cdb029a643 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 config_definition-all.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 633056397 -#define TS_SIGNATURE "rusEFI master.2024.02.28.kin.633056397" +#define SIGNATURE_HASH 3006722930 +#define TS_SIGNATURE "rusEFI master.2024.02.29.kin.3006722930" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 58293ee27c..e35e918407 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 config_definition-all.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3565977035 -#define TS_SIGNATURE "rusEFI master.2024.02.28.subaru_eg33_f7.3565977035" +#define SIGNATURE_HASH 1107370548 +#define TS_SIGNATURE "rusEFI master.2024.02.29.subaru_eg33_f7.1107370548" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 1c227081c5..1802a983d2 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -828,9 +828,9 @@ float getOutputValueByName(const char *name) { // sparkDwell case -903101570: return engine->ignitionState.sparkDwell; -// dwellAngle - case -1573373756: - return engine->ignitionState.dwellAngle; +// dwellDurationAngle + case -1208021110: + return engine->ignitionState.dwellDurationAngle; // cltTimingCorrection case 256951528: return engine->ignitionState.cltTimingCorrection; diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 7f6620b842..f0a537a473 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.02.28.f407-discovery.3570063612" + signature = "rusEFI master.2024.02.29.f407-discovery.1111983875" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.02.28.f407-discovery.3570063612" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.02.29.f407-discovery.1111983875" ; 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 @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Wed Feb 28 17:20:16 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 00:40:36 UTC 2024 pageSize = 22236 page = 1 @@ -2974,7 +2974,7 @@ injectorHwIssue = bits, U32, 844, [0:0] ; total TS size = 848 baseDwell = scalar, F32, 848, "ms", 1,0 sparkDwell = scalar, F32, 852, "ms", 1,0 -dwellAngle = scalar, F32, 856, "deg", 1,0 +dwellDurationAngle = scalar, F32, 856, "deg", 1,0 cltTimingCorrection = scalar, S16, 860, "deg", 0.01,0 timingIatCorrection = scalar, S16, 862, "deg", 0.01,0 timingPidCorrection = scalar, S16, 864, "deg", 0.01,0 @@ -4416,7 +4416,7 @@ targetAFRGauge = targetAFR,"Fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10 gaugeCategory = "Timing" baseDwellGauge = baseDwell,"Ignition: base dwell", "ms", 0.0,30.0, 0.0,30.0, 0.0,30.0, 1,1 sparkDwellGauge = sparkDwell,"Ignition: coil charge time", "ms", 0.0,30.0, 0.0,30.0, 0.0,30.0, 1,1 -dwellAngleGauge = dwellAngle,"Ignition: dwell duration", "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1 +dwellDurationAngleGauge = dwellDurationAngle,"Ignition: dwell duration", "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1 cltTimingCorrectionGauge = cltTimingCorrection,"Ign: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ign: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingPidCorrectionGauge = timingPidCorrection,"Idle: Timing adjustment", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -5249,7 +5249,7 @@ entry = idealEngineTorque, "idealEngineTorque", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" -entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" +entry = dwellDurationAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ign: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ign: IAT correction", float, "%.3f" entry = timingPidCorrection, "Idle: Timing adjustment", float, "%.3f" @@ -6164,7 +6164,7 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_1_Graph, "Graph", South graphLine = baseDwell graphLine = sparkDwell - graphLine = dwellAngle + graphLine = dwellDurationAngle graphLine = cltTimingCorrection liveGraph = ignition_state_2_Graph, "Graph", South graphLine = timingIatCorrection diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 41daee8595..8962c582e1 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.02.28.cypress.1735027491" + signature = "rusEFI master.2024.02.29.cypress.4058461404" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.02.28.cypress.1735027491" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.02.29.cypress.4058461404" ; 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 @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Wed Feb 28 17:19:14 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 00:39:58 UTC 2024 pageSize = 22236 page = 1 @@ -2974,7 +2974,7 @@ injectorHwIssue = bits, U32, 844, [0:0] ; total TS size = 848 baseDwell = scalar, F32, 848, "ms", 1,0 sparkDwell = scalar, F32, 852, "ms", 1,0 -dwellAngle = scalar, F32, 856, "deg", 1,0 +dwellDurationAngle = scalar, F32, 856, "deg", 1,0 cltTimingCorrection = scalar, S16, 860, "deg", 0.01,0 timingIatCorrection = scalar, S16, 862, "deg", 0.01,0 timingPidCorrection = scalar, S16, 864, "deg", 0.01,0 @@ -4416,7 +4416,7 @@ targetAFRGauge = targetAFR,"Fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10 gaugeCategory = "Timing" baseDwellGauge = baseDwell,"Ignition: base dwell", "ms", 0.0,30.0, 0.0,30.0, 0.0,30.0, 1,1 sparkDwellGauge = sparkDwell,"Ignition: coil charge time", "ms", 0.0,30.0, 0.0,30.0, 0.0,30.0, 1,1 -dwellAngleGauge = dwellAngle,"Ignition: dwell duration", "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1 +dwellDurationAngleGauge = dwellDurationAngle,"Ignition: dwell duration", "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1 cltTimingCorrectionGauge = cltTimingCorrection,"Ign: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ign: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingPidCorrectionGauge = timingPidCorrection,"Idle: Timing adjustment", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -5248,7 +5248,7 @@ entry = idealEngineTorque, "idealEngineTorque", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" -entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" +entry = dwellDurationAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ign: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ign: IAT correction", float, "%.3f" entry = timingPidCorrection, "Idle: Timing adjustment", float, "%.3f" @@ -6159,7 +6159,7 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_1_Graph, "Graph", South graphLine = baseDwell graphLine = sparkDwell - graphLine = dwellAngle + graphLine = dwellDurationAngle graphLine = cltTimingCorrection liveGraph = ignition_state_2_Graph, "Graph", South graphLine = timingIatCorrection diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index a0912b5b46..9814557fb9 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.02.28.kin.633056397" + signature = "rusEFI master.2024.02.29.kin.3006722930" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.02.28.kin.633056397" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.02.29.kin.3006722930" ; 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 @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Wed Feb 28 17:19:13 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 00:39:57 UTC 2024 pageSize = 20860 page = 1 @@ -2974,7 +2974,7 @@ injectorHwIssue = bits, U32, 844, [0:0] ; total TS size = 848 baseDwell = scalar, F32, 848, "ms", 1,0 sparkDwell = scalar, F32, 852, "ms", 1,0 -dwellAngle = scalar, F32, 856, "deg", 1,0 +dwellDurationAngle = scalar, F32, 856, "deg", 1,0 cltTimingCorrection = scalar, S16, 860, "deg", 0.01,0 timingIatCorrection = scalar, S16, 862, "deg", 0.01,0 timingPidCorrection = scalar, S16, 864, "deg", 0.01,0 @@ -4416,7 +4416,7 @@ targetAFRGauge = targetAFR,"Fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10 gaugeCategory = "Timing" baseDwellGauge = baseDwell,"Ignition: base dwell", "ms", 0.0,30.0, 0.0,30.0, 0.0,30.0, 1,1 sparkDwellGauge = sparkDwell,"Ignition: coil charge time", "ms", 0.0,30.0, 0.0,30.0, 0.0,30.0, 1,1 -dwellAngleGauge = dwellAngle,"Ignition: dwell duration", "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1 +dwellDurationAngleGauge = dwellDurationAngle,"Ignition: dwell duration", "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1 cltTimingCorrectionGauge = cltTimingCorrection,"Ign: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ign: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingPidCorrectionGauge = timingPidCorrection,"Idle: Timing adjustment", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -5248,7 +5248,7 @@ entry = idealEngineTorque, "idealEngineTorque", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" -entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" +entry = dwellDurationAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ign: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ign: IAT correction", float, "%.3f" entry = timingPidCorrection, "Idle: Timing adjustment", float, "%.3f" @@ -6159,7 +6159,7 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_1_Graph, "Graph", South graphLine = baseDwell graphLine = sparkDwell - graphLine = dwellAngle + graphLine = dwellDurationAngle graphLine = cltTimingCorrection liveGraph = ignition_state_2_Graph, "Graph", South graphLine = timingIatCorrection diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index e238f0d064..aafda11ec4 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.02.28.subaru_eg33_f7.3565977035" + signature = "rusEFI master.2024.02.29.subaru_eg33_f7.1107370548" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.02.28.subaru_eg33_f7.3565977035" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.02.29.subaru_eg33_f7.1107370548" ; 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 @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","AUX0_18 - MAP Ain","INVALID","INVALID","B05 - MAF Ain","INVALID","AUX0_19 - IAT Ain","A02 - VBat","INVALID","A06 - Oxyg 2 Ain","A04 - EGR t Ain","INVALID","A18 - AUX0 Ain","B02 - TPS Ain","INVALID","A03 - Coolant t Ain","A06 - Oxyg 1 Ain" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Wed Feb 28 17:19:16 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 00:39:59 UTC 2024 pageSize = 22236 page = 1 @@ -2974,7 +2974,7 @@ injectorHwIssue = bits, U32, 844, [0:0] ; total TS size = 848 baseDwell = scalar, F32, 848, "ms", 1,0 sparkDwell = scalar, F32, 852, "ms", 1,0 -dwellAngle = scalar, F32, 856, "deg", 1,0 +dwellDurationAngle = scalar, F32, 856, "deg", 1,0 cltTimingCorrection = scalar, S16, 860, "deg", 0.01,0 timingIatCorrection = scalar, S16, 862, "deg", 0.01,0 timingPidCorrection = scalar, S16, 864, "deg", 0.01,0 @@ -4416,7 +4416,7 @@ targetAFRGauge = targetAFR,"Fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10 gaugeCategory = "Timing" baseDwellGauge = baseDwell,"Ignition: base dwell", "ms", 0.0,30.0, 0.0,30.0, 0.0,30.0, 1,1 sparkDwellGauge = sparkDwell,"Ignition: coil charge time", "ms", 0.0,30.0, 0.0,30.0, 0.0,30.0, 1,1 -dwellAngleGauge = dwellAngle,"Ignition: dwell duration", "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1 +dwellDurationAngleGauge = dwellDurationAngle,"Ignition: dwell duration", "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1 cltTimingCorrectionGauge = cltTimingCorrection,"Ign: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ign: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingPidCorrectionGauge = timingPidCorrection,"Idle: Timing adjustment", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -5248,7 +5248,7 @@ entry = idealEngineTorque, "idealEngineTorque", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" -entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" +entry = dwellDurationAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ign: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ign: IAT correction", float, "%.3f" entry = timingPidCorrection, "Idle: Timing adjustment", float, "%.3f" @@ -6161,7 +6161,7 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_1_Graph, "Graph", South graphLine = baseDwell graphLine = sparkDwell - graphLine = dwellAngle + graphLine = dwellDurationAngle graphLine = cltTimingCorrection liveGraph = ignition_state_2_Graph, "Graph", South graphLine = timingIatCorrection 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 687a18f84d..b51eae26ef 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 config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Wed Feb 28 17:20:16 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 00:40:36 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1095,6 +1095,7 @@ public class Fields { public static final int SentEtbType_FORD_TYPE_1 = 2; public static final int SentEtbType_GM_TYPE_1 = 1; public static final int SentEtbType_NONE = 0; + public static final int SIGNATURE_HASH = 1111983875; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1341,7 +1342,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 master.2024.02.28.f407-discovery.3570063612"; + public static final String TS_SIGNATURE = "rusEFI master.2024.02.29.f407-discovery.1111983875"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java index 9e4c09d688..993ff2b5d9 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/ignition_state.txt Sat Feb 03 21:42:28 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition_state.txt Thu Feb 29 00:39:49 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -174,7 +174,7 @@ public class IgnitionState { public static final int VE_BLEND_COUNT = 4; public static final Field BASEDWELL = Field.create("BASEDWELL", 0, FieldType.FLOAT).setBaseOffset(848); public static final Field SPARKDWELL = Field.create("SPARKDWELL", 4, FieldType.FLOAT).setBaseOffset(848); - public static final Field DWELLANGLE = Field.create("DWELLANGLE", 8, FieldType.FLOAT).setBaseOffset(848); + public static final Field DWELLDURATIONANGLE = Field.create("DWELLDURATIONANGLE", 8, FieldType.FLOAT).setBaseOffset(848); public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 12, FieldType.INT16).setScale(0.01).setBaseOffset(848); public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 14, FieldType.INT16).setScale(0.01).setBaseOffset(848); public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 16, FieldType.INT16).setScale(0.01).setBaseOffset(848); @@ -188,7 +188,7 @@ public class IgnitionState { public static final Field[] VALUES = { BASEDWELL, SPARKDWELL, - DWELLANGLE, + DWELLDURATIONANGLE, CLTTIMINGCORRECTION, TIMINGIATCORRECTION, TIMINGPIDCORRECTION,