From 5f85a7df2019f2a832a68b105754c5ea7ac26e5a Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Sat, 29 Apr 2023 21:01:58 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 16 +- .../controllers/algo/rusefi_generated.h | 16 +- .../controllers/algo/rusefi_generated.h | 16 +- .../console/binary/generated/data_logs.ini | 12 +- firmware/console/binary/generated/gauges.ini | 2 +- .../console/binary/generated/sensors.java | 12 +- .../binary/output_channels_generated.h | 6 +- .../console/binary_log/log_fields_generated.h | 10 +- .../controllers/generated/rusefi_generated.h | 16 +- .../controllers/generated/signature_48way.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../generated/signature_alphax-8chan.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../controllers/generated/signature_core8.h | 4 +- .../controllers/generated/signature_cypress.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_harley81.h | 4 +- .../generated/signature_hellen-gm-e67.h | 4 +- .../generated/signature_hellen-honda-k.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_m74_9.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_nucleo_f429.h | 4 +- .../generated/signature_nucleo_f767.h | 4 +- .../generated/signature_nucleo_h743.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../controllers/generated/signature_s105.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- firmware/tunerstudio/generated/rusefi.ini | 28 +- .../tunerstudio/generated/rusefi_48way.ini | 28 +- .../generated/rusefi_alphax-2chan.ini | 28 +- .../generated/rusefi_alphax-4chan.ini | 28 +- .../generated/rusefi_alphax-8chan.ini | 28 +- .../tunerstudio/generated/rusefi_atlas.ini | 28 +- .../tunerstudio/generated/rusefi_core8.ini | 28 +- .../tunerstudio/generated/rusefi_cypress.ini | 28 +- .../generated/rusefi_f407-discovery.ini | 28 +- .../generated/rusefi_f429-discovery.ini | 28 +- .../generated/rusefi_frankenso_na6.ini | 28 +- .../tunerstudio/generated/rusefi_harley81.ini | 28 +- .../generated/rusefi_hellen-gm-e67.ini | 28 +- .../generated/rusefi_hellen-honda-k.ini | 28 +- .../generated/rusefi_hellen-nb1.ini | 28 +- .../generated/rusefi_hellen121nissan.ini | 28 +- .../generated/rusefi_hellen121vag.ini | 28 +- .../generated/rusefi_hellen128mercedes.ini | 28 +- .../generated/rusefi_hellen154hyundai.ini | 28 +- .../tunerstudio/generated/rusefi_hellen72.ini | 28 +- .../tunerstudio/generated/rusefi_hellen81.ini | 28 +- .../generated/rusefi_hellen88bmw.ini | 28 +- .../generated/rusefi_hellenNA6.ini | 28 +- .../generated/rusefi_hellenNA8_96.ini | 28 +- firmware/tunerstudio/generated/rusefi_kin.ini | 28 +- .../tunerstudio/generated/rusefi_m74_9.ini | 28 +- .../tunerstudio/generated/rusefi_mre_f4.ini | 28 +- .../tunerstudio/generated/rusefi_mre_f7.ini | 28 +- .../generated/rusefi_nucleo_f429.ini | 28 +- .../generated/rusefi_nucleo_f767.ini | 28 +- .../generated/rusefi_nucleo_h743.ini | 28 +- .../generated/rusefi_prometheus_405.ini | 28 +- .../generated/rusefi_prometheus_469.ini | 28 +- .../generated/rusefi_proteus_f4.ini | 28 +- .../generated/rusefi_proteus_f7.ini | 28 +- .../generated/rusefi_proteus_h7.ini | 28 +- .../tunerstudio/generated/rusefi_s105.ini | 28 +- .../generated/rusefi_subaru_eg33_f7.ini | 28 +- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 28 +- .../rusefi/config/generated/AcControl.java | 248 +----------------- .../config/generated/AntilagSystem.java | 248 +----------------- .../rusefi/config/generated/BoostControl.java | 248 +----------------- .../com/rusefi/config/generated/DcMotors.java | 248 +----------------- .../config/generated/ElectronicThrottle.java | 248 +----------------- .../rusefi/config/generated/EngineState.java | 248 +----------------- .../com/rusefi/config/generated/Fields.java | 17 +- .../rusefi/config/generated/FuelComputer.java | 248 +----------------- .../config/generated/IgnitionState.java | 248 +----------------- .../rusefi/config/generated/SentState.java | 248 +----------------- .../rusefi/config/generated/TriggerState.java | 248 +----------------- .../config/generated/TriggerStatePrimary.java | 248 +----------------- .../rusefi/config/generated/TsOutputs.java | 248 +----------------- 99 files changed, 768 insertions(+), 3575 deletions(-) diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index db39d74449..043485b573 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -411,7 +411,7 @@ #define GAUGE_CATEGORY_FUEL_MATH "Fuel: math" #define GAUGE_CATEGORY_SYNC "Sync" #define GAUGE_CATEGORY_TIMING "Timing" -#define GAUGE_COIL_DWELL_TIME "Ignition: coil charge time" +#define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" #define GAUGE_NAME_ACCEL_ROLL "Acceleration: Roll" #define GAUGE_NAME_ACCEL_X "Acceleration: X" #define GAUGE_NAME_ACCEL_Y "Acceleration: Y" @@ -450,7 +450,7 @@ #define GAUGE_NAME_DEBUG_I5 "debug i5" #define GAUGE_NAME_DESIRED_GEAR "Desired Gear" #define GAUGE_NAME_DETECTED_GEAR "Detected Gear" -#define GAUGE_NAME_DWELL_DUTY "Ignition: coil duty cycle" +#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_NAME_ECU_TEMPERATURE "ECU temperature" #define GAUGE_NAME_ENGINE_CRC16 "Engine CRC16" #define GAUGE_NAME_ETB_DUTY "ETB Duty" @@ -467,7 +467,7 @@ #define GAUGE_NAME_FUEL_FLOW "fuel: Flow rate" #define GAUGE_NAME_FUEL_IAT_CORR "fuel: IAT correction" #define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle" -#define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: Last Inj Pulsewidth" +#define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: Last injection" #define GAUGE_NAME_FUEL_LEVEL "fuel level" #define GAUGE_NAME_FUEL_LOAD "fuel: load" #define GAUGE_NAME_FUEL_PRESSURE_HIGH "Fuel pressure (high)" @@ -487,7 +487,7 @@ #define GAUGE_NAME_IAC "Idle Air Valve" #define GAUGE_NAME_IAT "IAT" #define GAUGE_NAME_IDLE_POSITION "Idle position sensor" -#define GAUGE_NAME_IGNITION_LOAD "Ignition: load" +#define GAUGE_NAME_IGNITION_LOAD "ign: load" #define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag" #define GAUGE_NAME_ISS "Input Shaft Speed" #define GAUGE_NAME_KNOCK_1 "knock 1" @@ -521,11 +521,11 @@ #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" #define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position" #define GAUGE_NAME_TIME "Time" -#define GAUGE_NAME_TIMING_ADVANCE "Timing: base ignition" +#define GAUGE_NAME_TIMING_ADVANCE "timing" #define GAUGE_NAME_TPS "TPS" #define GAUGE_NAME_TPS2 "TPS2" #define GAUGE_NAME_TRG_ERR "Trigger Error Counter" -#define GAUGE_NAME_TRG_GAP "Sync: Trigger Latest Ratio" +#define GAUGE_NAME_TRG_GAP "Trigger Sync Latest Ratio" #define GAUGE_NAME_TUNE_CRC16 "Tune CRC16" #define GAUGE_NAME_TURBO_SPEED "Turbocharger Speed" #define GAUGE_NAME_UPTIME "Uptime" @@ -1066,7 +1066,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3272369387 +#define SIGNATURE_HASH 2085139798 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 #define spi_device_e_SPI_DEVICE_2 2 @@ -1357,7 +1357,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.04.29.cypress.3272369387" +#define TS_SIGNATURE "rusEFI master.2023.04.29.cypress.2085139798" #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/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 2bba914248..bf1f922642 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -411,7 +411,7 @@ #define GAUGE_CATEGORY_FUEL_MATH "Fuel: math" #define GAUGE_CATEGORY_SYNC "Sync" #define GAUGE_CATEGORY_TIMING "Timing" -#define GAUGE_COIL_DWELL_TIME "Ignition: coil charge time" +#define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" #define GAUGE_NAME_ACCEL_ROLL "Acceleration: Roll" #define GAUGE_NAME_ACCEL_X "Acceleration: X" #define GAUGE_NAME_ACCEL_Y "Acceleration: Y" @@ -450,7 +450,7 @@ #define GAUGE_NAME_DEBUG_I5 "debug i5" #define GAUGE_NAME_DESIRED_GEAR "Desired Gear" #define GAUGE_NAME_DETECTED_GEAR "Detected Gear" -#define GAUGE_NAME_DWELL_DUTY "Ignition: coil duty cycle" +#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_NAME_ECU_TEMPERATURE "ECU temperature" #define GAUGE_NAME_ENGINE_CRC16 "Engine CRC16" #define GAUGE_NAME_ETB_DUTY "ETB Duty" @@ -467,7 +467,7 @@ #define GAUGE_NAME_FUEL_FLOW "fuel: Flow rate" #define GAUGE_NAME_FUEL_IAT_CORR "fuel: IAT correction" #define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle" -#define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: Last Inj Pulsewidth" +#define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: Last injection" #define GAUGE_NAME_FUEL_LEVEL "fuel level" #define GAUGE_NAME_FUEL_LOAD "fuel: load" #define GAUGE_NAME_FUEL_PRESSURE_HIGH "Fuel pressure (high)" @@ -487,7 +487,7 @@ #define GAUGE_NAME_IAC "Idle Air Valve" #define GAUGE_NAME_IAT "IAT" #define GAUGE_NAME_IDLE_POSITION "Idle position sensor" -#define GAUGE_NAME_IGNITION_LOAD "Ignition: load" +#define GAUGE_NAME_IGNITION_LOAD "ign: load" #define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag" #define GAUGE_NAME_ISS "Input Shaft Speed" #define GAUGE_NAME_KNOCK_1 "knock 1" @@ -521,11 +521,11 @@ #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" #define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position" #define GAUGE_NAME_TIME "Time" -#define GAUGE_NAME_TIMING_ADVANCE "Timing: base ignition" +#define GAUGE_NAME_TIMING_ADVANCE "timing" #define GAUGE_NAME_TPS "TPS" #define GAUGE_NAME_TPS2 "TPS2" #define GAUGE_NAME_TRG_ERR "Trigger Error Counter" -#define GAUGE_NAME_TRG_GAP "Sync: Trigger Latest Ratio" +#define GAUGE_NAME_TRG_GAP "Trigger Sync Latest Ratio" #define GAUGE_NAME_TUNE_CRC16 "Tune CRC16" #define GAUGE_NAME_TURBO_SPEED "Turbocharger Speed" #define GAUGE_NAME_UPTIME "Uptime" @@ -1066,7 +1066,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2883307047 +#define SIGNATURE_HASH 345970586 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 #define spi_device_e_SPI_DEVICE_2 2 @@ -1357,7 +1357,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.04.29.kin.2883307047" +#define TS_SIGNATURE "rusEFI master.2023.04.29.kin.345970586" #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/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index e902ec7b56..8caeec1c97 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 @@ -405,7 +405,7 @@ #define GAUGE_CATEGORY_FUEL_MATH "Fuel: math" #define GAUGE_CATEGORY_SYNC "Sync" #define GAUGE_CATEGORY_TIMING "Timing" -#define GAUGE_COIL_DWELL_TIME "Ignition: coil charge time" +#define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" #define GAUGE_NAME_ACCEL_ROLL "Acceleration: Roll" #define GAUGE_NAME_ACCEL_X "Acceleration: X" #define GAUGE_NAME_ACCEL_Y "Acceleration: Y" @@ -444,7 +444,7 @@ #define GAUGE_NAME_DEBUG_I5 "debug i5" #define GAUGE_NAME_DESIRED_GEAR "Desired Gear" #define GAUGE_NAME_DETECTED_GEAR "Detected Gear" -#define GAUGE_NAME_DWELL_DUTY "Ignition: coil duty cycle" +#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_NAME_ECU_TEMPERATURE "ECU temperature" #define GAUGE_NAME_ENGINE_CRC16 "Engine CRC16" #define GAUGE_NAME_ETB_DUTY "ETB Duty" @@ -461,7 +461,7 @@ #define GAUGE_NAME_FUEL_FLOW "fuel: Flow rate" #define GAUGE_NAME_FUEL_IAT_CORR "fuel: IAT correction" #define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle" -#define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: Last Inj Pulsewidth" +#define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: Last injection" #define GAUGE_NAME_FUEL_LEVEL "fuel level" #define GAUGE_NAME_FUEL_LOAD "fuel: load" #define GAUGE_NAME_FUEL_PRESSURE_HIGH "Fuel pressure (high)" @@ -481,7 +481,7 @@ #define GAUGE_NAME_IAC "Idle Air Valve" #define GAUGE_NAME_IAT "IAT" #define GAUGE_NAME_IDLE_POSITION "Idle position sensor" -#define GAUGE_NAME_IGNITION_LOAD "Ignition: load" +#define GAUGE_NAME_IGNITION_LOAD "ign: load" #define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag" #define GAUGE_NAME_ISS "Input Shaft Speed" #define GAUGE_NAME_KNOCK_1 "knock 1" @@ -515,11 +515,11 @@ #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" #define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position" #define GAUGE_NAME_TIME "Time" -#define GAUGE_NAME_TIMING_ADVANCE "Timing: base ignition" +#define GAUGE_NAME_TIMING_ADVANCE "timing" #define GAUGE_NAME_TPS "TPS" #define GAUGE_NAME_TPS2 "TPS2" #define GAUGE_NAME_TRG_ERR "Trigger Error Counter" -#define GAUGE_NAME_TRG_GAP "Sync: Trigger Latest Ratio" +#define GAUGE_NAME_TRG_GAP "Trigger Sync Latest Ratio" #define GAUGE_NAME_TUNE_CRC16 "Tune CRC16" #define GAUGE_NAME_TURBO_SPEED "Turbocharger Speed" #define GAUGE_NAME_UPTIME "Uptime" @@ -1017,7 +1017,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3293042239 +#define SIGNATURE_HASH 2063796098 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 #define spi_device_e_SPI_DEVICE_2 2 @@ -1309,7 +1309,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.04.29.subaru_eg33_f7.3293042239" +#define TS_SIGNATURE "rusEFI master.2023.04.29.subaru_eg33_f7.2063796098" #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 0fb59005bc..8577635897 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -45,7 +45,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -60,7 +60,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -330,12 +330,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -469,7 +469,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -506,7 +506,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index e71f49eef4..3852771042 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -9,7 +9,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index d6fe062407..5ea6cc1a18 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -24,7 +24,7 @@ chargeAirMass("air mass", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 44, 0.0 crankingFuelMs("crankingFuelMs\nairmass in mg, 0-65 grams", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 46, 0.01, 0.0, 0.0, "ms"), baseFuel("fuel: base mass"\nThis is the raw value we take from the fuel map or base fuel algorithm, before the corrections, SensorCategory.SENSOR_INPUTS, FieldType.INT16, 48, 0.01, 0.0, 0.0, "mg"), fuelRunning("fuel: running"\nTotal fuel with CLT IAT and TPS acceleration without injector lag corrections per cycle, as pulse per cycle, SensorCategory.SENSOR_INPUTS, FieldType.INT16, 50, 0.01, 0.0, 0.0, "mg"), -actualLastInjection("fuel: Last Inj Pulsewidth"\nActual last injection time - including all compensation and injection mode, SensorCategory.SENSOR_INPUTS, FieldType.INT16, 52, 0.0033333333333333335, 0.0, 0.0, "ms"), +actualLastInjection("fuel: Last injection"\nActual last injection time - including all compensation and injection mode, SensorCategory.SENSOR_INPUTS, FieldType.INT16, 52, 0.0033333333333333335, 0.0, 0.0, "ms"), injectorDutyCycle("fuel: injector duty cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 54, 0.5, 0.0, 0.0, "%"), veValue("fuel: VE", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 55, 0.5, 0.0, 0.0, "ratio"), injectionOffset("injectionOffset", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 56, 1.0, 0.0, 0.0, "deg"), @@ -39,7 +39,7 @@ canReadCounter("canReadCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, tpsAccelFuel("fuel: TPS acceleration add fuel ms", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 74, 0.0033333333333333335, 0.0, 0.0, "ms"), warningCounter("warning: counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 76, 1.0, 0.0, 0.0, "count"), lastErrorCode("warning: last", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 78, 1.0, 0.0, 0.0, "error"), -coilDutyCycle("Ignition: coil duty cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 80, 0.01, 0.0, 0.0, "%"), +coilDutyCycle("dwell: coil duty cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 80, 0.01, 0.0, 0.0, "%"), idleAirValvePosition("Idle Air Valve", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 82, 0.01, 0.0, 0.0, "%"), etbTarget("ETB Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 84, 0.01, 0.0, 0.0, "%"), etb1DutyCycle("ETB Duty", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 86, 0.01, 0.0, 0.0, "%"), @@ -386,12 +386,12 @@ stoichiometricRatio("fuel: stoich ratio", SensorCategory.SENSOR_INPUTS, FieldTyp sdTcharge_coff("sdTcharge_coff", SensorCategory.SENSOR_INPUTS, FieldType.INT, 812, 1.0, -1.0, -1.0, ""), sdAirMassInOneCylinder("SD cylinder mass\nSpeed-density logic: calculated air mass in one cylinder, in grams", SensorCategory.SENSOR_INPUTS, FieldType.INT, 816, 1.0, -1.0, -1.0, ""), baseDwell("Ignition: base dwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 824, 1.0, 0.0, 30.0, "ms"), -sparkDwell("Ignition: coil charge time", SensorCategory.SENSOR_INPUTS, FieldType.INT, 828, 1.0, 0.0, 30.0, "ms"), +sparkDwell("dwell: coil charge time", SensorCategory.SENSOR_INPUTS, FieldType.INT, 828, 1.0, 0.0, 30.0, "ms"), dwellAngle("Ignition: dwell duration\nas crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 832, 1.0, 0.0, 120.0, "deg"), cltTimingCorrection("Ignition: CLT correction", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 836, 0.01, -20.0, 20.0, "deg"), timingIatCorrection("Ignition: IAT correction", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 838, 0.01, -20.0, 20.0, "deg"), timingPidCorrection("Ignition: PID correction", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 840, 0.01, -20.0, 20.0, "deg"), -baseIgnitionAdvance("Timing: base ignition", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 842, 0.02, 0.0, 0.0, "deg"), +baseIgnitionAdvance("timing", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 842, 0.02, 0.0, 0.0, "deg"), correctedIgnitionAdvance("Timing: ignition", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 844, 0.02, 0.0, 0.0, "deg"), alignmentFill_at_22("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 846, 1.0, -20.0, 100.0, "units"), dwellVoltageCorrection("Ignition: dwell corr", SensorCategory.SENSOR_INPUTS, FieldType.INT, 848, 1.0, -1.0, -1.0, ""), @@ -457,7 +457,7 @@ alignmentFill_at_98("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, Field fuelInjectionCounter("fuelInjectionCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1096, 1.0, -1.0, -1.0, ""), sparkCounter("sparkCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1100, 1.0, -1.0, -1.0, ""), fuelingLoad("fuel: load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1104, 1.0, -1.0, -1.0, ""), -ignitionLoad("Ignition: load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1108, 1.0, -1.0, -1.0, ""), +ignitionLoad("ign: load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1108, 1.0, -1.0, -1.0, ""), veTableYAxis("veTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1112, 0.01, 0.0, 0.0, "%"), alignmentFill_at_118("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1114, 1.0, -20.0, 100.0, "units"), tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1116, 1.0, -1.0, -1.0, ""), @@ -491,7 +491,7 @@ crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank rev vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1220, 1.0, -10000.0, 10000.0, ""), vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1224, 1.0, 0.0, 100000.0, "us"), vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1228, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Sync: Trigger Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1232, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1232, 1.0, -10000.0, 10000.0, ""), triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1236, 1.0, -1.0, -1.0, ""), vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1237, 1.0, -1.0, -1.0, ""), camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1238, 1.0, -1.0, -1.0, ""), diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index ed271163fb..bce57eb5cc 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Apr 23 00:31:50 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Apr 29 21:01:06 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1205,7 +1205,7 @@ struct output_channels_s { V * offset 550 */ - scaled_channel rawAnalogInput[LUA_DIGITAL_INPUT_COUNT]; + scaled_channel rawAnalogInput[LUA_ANALOG_INPUT_COUNT]; /** * GPPWM Output % @@ -1383,4 +1383,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 776); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Apr 23 00:31:50 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Apr 29 21:01:06 UTC 2023 diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index 81ca12f3bd..9223d75748 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -24,7 +24,7 @@ static constexpr LogField fields[] = { {engine->outputChannels.crankingFuelMs, "crankingFuelMs", "ms", 2}, {engine->outputChannels.baseFuel, "fuel: base mass", "mg", 3}, {engine->outputChannels.fuelRunning, "fuel: running", "mg", 3}, - {engine->outputChannels.actualLastInjection, "fuel: Last Inj Pulsewidth", "ms", 3}, + {engine->outputChannels.actualLastInjection, "fuel: Last injection", "ms", 3}, {engine->outputChannels.injectorDutyCycle, "fuel: injector duty cycle", "%", 0}, {engine->outputChannels.veValue, "fuel: VE", "ratio", 1}, {engine->outputChannels.injectionOffset, "injectionOffset", "deg", 0}, @@ -39,7 +39,7 @@ static constexpr LogField fields[] = { {engine->outputChannels.tpsAccelFuel, "fuel: TPS acceleration add fuel ms", "ms", 3}, {engine->outputChannels.warningCounter, "warning: counter", "count", 0}, {engine->outputChannels.lastErrorCode, "warning: last", "error", 0}, - {engine->outputChannels.coilDutyCycle, "Ignition: coil duty cycle", "%", 0}, + {engine->outputChannels.coilDutyCycle, "dwell: coil duty cycle", "%", 0}, {engine->outputChannels.idleAirValvePosition, "Idle Air Valve", "%", 1}, {engine->outputChannels.etbTarget, "ETB Target", "%", 2}, {engine->outputChannels.etb1DutyCycle, "ETB Duty", "%", 1}, @@ -273,12 +273,12 @@ static constexpr LogField fields[] = { {engine->fuelComputer.sdTcharge_coff, "sdTcharge_coff", "", 0}, {engine->fuelComputer.sdAirMassInOneCylinder, "SD cylinder mass", "", 0}, {engine->ignitionState.baseDwell, "Ignition: base dwell", "ms", 1, "Timing"}, - {engine->ignitionState.sparkDwell, "Ignition: coil charge time", "ms", 1, "Timing"}, + {engine->ignitionState.sparkDwell, "dwell: coil charge time", "ms", 1, "Timing"}, {engine->ignitionState.dwellAngle, "Ignition: dwell duration", "deg", 1, "Timing"}, {engine->ignitionState.cltTimingCorrection, "Ignition: CLT correction", "deg", 2, "Timing"}, {engine->ignitionState.timingIatCorrection, "Ignition: IAT correction", "deg", 2, "Timing"}, {engine->ignitionState.timingPidCorrection, "Ignition: PID correction", "deg", 2, "Timing"}, - {engine->ignitionState.baseIgnitionAdvance, "Timing: base ignition", "deg", 1}, + {engine->ignitionState.baseIgnitionAdvance, "timing", "deg", 1}, {engine->ignitionState.correctedIgnitionAdvance, "Timing: ignition", "deg", 1}, {engine->ignitionState.dwellVoltageCorrection, "Ignition: dwell corr", "", 0}, {engine->ignitionState.luaTimingAdd, "Ignition: Lua add", "deg", 2, "Timing"}, @@ -328,7 +328,7 @@ static constexpr LogField fields[] = { {engine->engineState.fuelInjectionCounter, "fuelInjectionCounter", "", 0}, {engine->engineState.sparkCounter, "sparkCounter", "", 0}, {engine->engineState.fuelingLoad, "fuel: load", "", 0}, - {engine->engineState.ignitionLoad, "Ignition: load", "", 0}, + {engine->engineState.ignitionLoad, "ign: load", "", 0}, {engine->engineState.veTableYAxis, "veTableYAxis", "%", 0}, {engine->triggerCentral.hwEventCounters[0], "Hardware events since boot 1", "", 0}, {engine->triggerCentral.hwEventCounters[1], "Hardware events since boot 2", "", 0}, diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 7d1cec2403..87a67425d9 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -411,7 +411,7 @@ #define GAUGE_CATEGORY_FUEL_MATH "Fuel: math" #define GAUGE_CATEGORY_SYNC "Sync" #define GAUGE_CATEGORY_TIMING "Timing" -#define GAUGE_COIL_DWELL_TIME "Ignition: coil charge time" +#define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" #define GAUGE_NAME_ACCEL_ROLL "Acceleration: Roll" #define GAUGE_NAME_ACCEL_X "Acceleration: X" #define GAUGE_NAME_ACCEL_Y "Acceleration: Y" @@ -450,7 +450,7 @@ #define GAUGE_NAME_DEBUG_I5 "debug i5" #define GAUGE_NAME_DESIRED_GEAR "Desired Gear" #define GAUGE_NAME_DETECTED_GEAR "Detected Gear" -#define GAUGE_NAME_DWELL_DUTY "Ignition: coil duty cycle" +#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_NAME_ECU_TEMPERATURE "ECU temperature" #define GAUGE_NAME_ENGINE_CRC16 "Engine CRC16" #define GAUGE_NAME_ETB_DUTY "ETB Duty" @@ -467,7 +467,7 @@ #define GAUGE_NAME_FUEL_FLOW "fuel: Flow rate" #define GAUGE_NAME_FUEL_IAT_CORR "fuel: IAT correction" #define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle" -#define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: Last Inj Pulsewidth" +#define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: Last injection" #define GAUGE_NAME_FUEL_LEVEL "fuel level" #define GAUGE_NAME_FUEL_LOAD "fuel: load" #define GAUGE_NAME_FUEL_PRESSURE_HIGH "Fuel pressure (high)" @@ -487,7 +487,7 @@ #define GAUGE_NAME_IAC "Idle Air Valve" #define GAUGE_NAME_IAT "IAT" #define GAUGE_NAME_IDLE_POSITION "Idle position sensor" -#define GAUGE_NAME_IGNITION_LOAD "Ignition: load" +#define GAUGE_NAME_IGNITION_LOAD "ign: load" #define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag" #define GAUGE_NAME_ISS "Input Shaft Speed" #define GAUGE_NAME_KNOCK_1 "knock 1" @@ -521,11 +521,11 @@ #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" #define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position" #define GAUGE_NAME_TIME "Time" -#define GAUGE_NAME_TIMING_ADVANCE "Timing: base ignition" +#define GAUGE_NAME_TIMING_ADVANCE "timing" #define GAUGE_NAME_TPS "TPS" #define GAUGE_NAME_TPS2 "TPS2" #define GAUGE_NAME_TRG_ERR "Trigger Error Counter" -#define GAUGE_NAME_TRG_GAP "Sync: Trigger Latest Ratio" +#define GAUGE_NAME_TRG_GAP "Trigger Sync Latest Ratio" #define GAUGE_NAME_TUNE_CRC16 "Tune CRC16" #define GAUGE_NAME_TURBO_SPEED "Turbocharger Speed" #define GAUGE_NAME_UPTIME "Uptime" @@ -1066,7 +1066,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2873326157 +#define SIGNATURE_HASH 336047088 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 #define spi_device_e_SPI_DEVICE_2 2 @@ -1357,7 +1357,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.04.29.f407-discovery.2873326157" +#define TS_SIGNATURE "rusEFI master.2023.04.29.f407-discovery.336047088" #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_48way.h b/firmware/controllers/generated/signature_48way.h index eb8f49a4c9..be9b8fa55a 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3919250608 -#define TS_SIGNATURE "rusEFI master.2023.04.29.48way.3919250608" +#define SIGNATURE_HASH 1457509645 +#define TS_SIGNATURE "rusEFI master.2023.04.29.48way.1457509645" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 0eea9c96f6..3a7ff74306 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1455665336 -#define TS_SIGNATURE "rusEFI master.2023.04.29.alphax-2chan.1455665336" +#define SIGNATURE_HASH 3917963525 +#define TS_SIGNATURE "rusEFI master.2023.04.29.alphax-2chan.3917963525" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 13b9fa2c32..006568bc2c 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2866528055 -#define TS_SIGNATURE "rusEFI master.2023.04.29.alphax-4chan.2866528055" +#define SIGNATURE_HASH 362770058 +#define TS_SIGNATURE "rusEFI master.2023.04.29.alphax-4chan.362770058" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 0cd031ccf8..a931e7f462 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3140842216 -#define TS_SIGNATURE "rusEFI master.2023.04.29.alphax-8chan.3140842216" +#define SIGNATURE_HASH 74556245 +#define TS_SIGNATURE "rusEFI master.2023.04.29.alphax-8chan.74556245" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 219ba87efd..cdf4fea21d 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 by SignatureConsumer // -#define SIGNATURE_HASH 3754332620 -#define TS_SIGNATURE "rusEFI master.2023.04.29.atlas.3754332620" +#define SIGNATURE_HASH 1619148913 +#define TS_SIGNATURE "rusEFI master.2023.04.29.atlas.1619148913" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 9b6e37e246..5a434d8394 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2506523068 -#define TS_SIGNATURE "rusEFI master.2023.04.29.core8.2506523068" +#define SIGNATURE_HASH 706891777 +#define TS_SIGNATURE "rusEFI master.2023.04.29.core8.706891777" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 5611f9540c..1df8346bb9 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 ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 3272369387 -#define TS_SIGNATURE "rusEFI master.2023.04.29.cypress.3272369387" +#define SIGNATURE_HASH 2085139798 +#define TS_SIGNATURE "rusEFI master.2023.04.29.cypress.2085139798" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index b3eb93e77a..cd82c06b05 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 ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2873326157 -#define TS_SIGNATURE "rusEFI master.2023.04.29.f407-discovery.2873326157" +#define SIGNATURE_HASH 336047088 +#define TS_SIGNATURE "rusEFI master.2023.04.29.f407-discovery.336047088" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 15beecc9b2..f21824483e 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 by SignatureConsumer // -#define SIGNATURE_HASH 3272369387 -#define TS_SIGNATURE "rusEFI master.2023.04.29.f429-discovery.3272369387" +#define SIGNATURE_HASH 2085139798 +#define TS_SIGNATURE "rusEFI master.2023.04.29.f429-discovery.2085139798" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index d5d80bbde0..aacc80b413 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 by SignatureConsumer // -#define SIGNATURE_HASH 3781067809 -#define TS_SIGNATURE "rusEFI master.2023.04.29.frankenso_na6.3781067809" +#define SIGNATURE_HASH 1578784156 +#define TS_SIGNATURE "rusEFI master.2023.04.29.frankenso_na6.1578784156" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index c93d92bf55..ef19af8d22 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2534833399 -#define TS_SIGNATURE "rusEFI master.2023.04.29.harley81.2534833399" +#define SIGNATURE_HASH 676506954 +#define TS_SIGNATURE "rusEFI master.2023.04.29.harley81.676506954" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 8642815034..86e2fd213c 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 180156706 -#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen-gm-e67.180156706" +#define SIGNATURE_HASH 3052939423 +#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen-gm-e67.3052939423" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 310b47c885..21ed15c4a8 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 473483655 -#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen-honda-k.473483655" +#define SIGNATURE_HASH 2742818874 +#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen-honda-k.2742818874" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index a23c37c58f..97cdf96d2c 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 by SignatureConsumer // -#define SIGNATURE_HASH 366957120 -#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen-nb1.366957120" +#define SIGNATURE_HASH 2862318589 +#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen-nb1.2862318589" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 92d9ef584d..ba37f03399 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 by SignatureConsumer // -#define SIGNATURE_HASH 88946117 -#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen121nissan.88946117" +#define SIGNATURE_HASH 3121210488 +#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen121nissan.3121210488" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 02a41ea742..46a631db31 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 by SignatureConsumer // -#define SIGNATURE_HASH 420598302 -#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen121vag.420598302" +#define SIGNATURE_HASH 2790589347 +#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen121vag.2790589347" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 0707e27dd6..37ebcd8d56 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 by SignatureConsumer // -#define SIGNATURE_HASH 1626812013 -#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen128.1626812013" +#define SIGNATURE_HASH 3753115600 +#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen128.3753115600" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index ca43f5feb8..ce2c93e5d5 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 by SignatureConsumer // -#define SIGNATURE_HASH 633847087 -#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen154hyundai.633847087" +#define SIGNATURE_HASH 2592304274 +#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen154hyundai.2592304274" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 6f9a511a4e..273a45c4ab 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 by SignatureConsumer // -#define SIGNATURE_HASH 3686567068 -#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen72.3686567068" +#define SIGNATURE_HASH 1693998369 +#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen72.1693998369" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index cedd59867c..2308dcf3bc 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3327555077 -#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen81.3327555077" +#define SIGNATURE_HASH 2031265720 +#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen81.2031265720" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index c8dd66d17d..dbc46f0660 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 by SignatureConsumer // -#define SIGNATURE_HASH 1223871426 -#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen88bmw.1223871426" +#define SIGNATURE_HASH 4155906687 +#define TS_SIGNATURE "rusEFI master.2023.04.29.hellen88bmw.4155906687" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index d0106b1271..d59fae0d84 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 by SignatureConsumer // -#define SIGNATURE_HASH 642738002 -#define TS_SIGNATURE "rusEFI master.2023.04.29.hellenNA6.642738002" +#define SIGNATURE_HASH 2567681775 +#define TS_SIGNATURE "rusEFI master.2023.04.29.hellenNA6.2567681775" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index b588baf0d9..fe15f5da54 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1234940294 -#define TS_SIGNATURE "rusEFI master.2023.04.29.hellenNA8_96.1234940294" +#define SIGNATURE_HASH 4141834299 +#define TS_SIGNATURE "rusEFI master.2023.04.29.hellenNA8_96.4141834299" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index f575612135..58cf174df6 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 by SignatureConsumer // -#define SIGNATURE_HASH 2883307047 -#define TS_SIGNATURE "rusEFI master.2023.04.29.kin.2883307047" +#define SIGNATURE_HASH 345970586 +#define TS_SIGNATURE "rusEFI master.2023.04.29.kin.345970586" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index b6bad832d0..2723fe0b4f 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 478329296 -#define TS_SIGNATURE "rusEFI master.2023.04.29.m74_9.478329296" +#define SIGNATURE_HASH 2747689069 +#define TS_SIGNATURE "rusEFI master.2023.04.29.m74_9.2747689069" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index e395d482d6..4b151de2f8 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 by SignatureConsumer // -#define SIGNATURE_HASH 1325086603 -#define TS_SIGNATURE "rusEFI master.2023.04.29.mre_f4.1325086603" +#define SIGNATURE_HASH 4055885366 +#define TS_SIGNATURE "rusEFI master.2023.04.29.mre_f4.4055885366" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index d58423753c..38c7cbae59 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 by SignatureConsumer // -#define SIGNATURE_HASH 1325086603 -#define TS_SIGNATURE "rusEFI master.2023.04.29.mre_f7.1325086603" +#define SIGNATURE_HASH 4055885366 +#define TS_SIGNATURE "rusEFI master.2023.04.29.mre_f7.4055885366" diff --git a/firmware/controllers/generated/signature_nucleo_f429.h b/firmware/controllers/generated/signature_nucleo_f429.h index 58a63adb41..7bc6506725 100644 --- a/firmware/controllers/generated/signature_nucleo_f429.h +++ b/firmware/controllers/generated/signature_nucleo_f429.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3272369387 -#define TS_SIGNATURE "rusEFI master.2023.04.29.nucleo_f429.3272369387" +#define SIGNATURE_HASH 2085139798 +#define TS_SIGNATURE "rusEFI master.2023.04.29.nucleo_f429.2085139798" diff --git a/firmware/controllers/generated/signature_nucleo_f767.h b/firmware/controllers/generated/signature_nucleo_f767.h index 6bd5f92f67..e0dc375594 100644 --- a/firmware/controllers/generated/signature_nucleo_f767.h +++ b/firmware/controllers/generated/signature_nucleo_f767.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3272369387 -#define TS_SIGNATURE "rusEFI master.2023.04.29.nucleo_f767.3272369387" +#define SIGNATURE_HASH 2085139798 +#define TS_SIGNATURE "rusEFI master.2023.04.29.nucleo_f767.2085139798" diff --git a/firmware/controllers/generated/signature_nucleo_h743.h b/firmware/controllers/generated/signature_nucleo_h743.h index 5f82f02a30..c2715d57ad 100644 --- a/firmware/controllers/generated/signature_nucleo_h743.h +++ b/firmware/controllers/generated/signature_nucleo_h743.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3272369387 -#define TS_SIGNATURE "rusEFI master.2023.04.29.nucleo_h743.3272369387" +#define SIGNATURE_HASH 2085139798 +#define TS_SIGNATURE "rusEFI master.2023.04.29.nucleo_h743.2085139798" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 792b44063f..d176143807 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 by SignatureConsumer // -#define SIGNATURE_HASH 4086868347 -#define TS_SIGNATURE "rusEFI master.2023.04.29.prometheus_405.4086868347" +#define SIGNATURE_HASH 1289517254 +#define TS_SIGNATURE "rusEFI master.2023.04.29.prometheus_405.1289517254" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 22fa6e25a8..932f543a6f 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 by SignatureConsumer // -#define SIGNATURE_HASH 4086868347 -#define TS_SIGNATURE "rusEFI master.2023.04.29.prometheus_469.4086868347" +#define SIGNATURE_HASH 1289517254 +#define TS_SIGNATURE "rusEFI master.2023.04.29.prometheus_469.1289517254" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 41b8062628..cbc729a54b 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 by SignatureConsumer // -#define SIGNATURE_HASH 4046732774 -#define TS_SIGNATURE "rusEFI master.2023.04.29.proteus_f4.4046732774" +#define SIGNATURE_HASH 1316023387 +#define TS_SIGNATURE "rusEFI master.2023.04.29.proteus_f4.1316023387" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 2a070e9fd9..757d3c4814 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 by SignatureConsumer // -#define SIGNATURE_HASH 4046732774 -#define TS_SIGNATURE "rusEFI master.2023.04.29.proteus_f7.4046732774" +#define SIGNATURE_HASH 1316023387 +#define TS_SIGNATURE "rusEFI master.2023.04.29.proteus_f7.1316023387" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index c00bd1702f..cfa70d7a47 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4046732774 -#define TS_SIGNATURE "rusEFI master.2023.04.29.proteus_h7.4046732774" +#define SIGNATURE_HASH 1316023387 +#define TS_SIGNATURE "rusEFI master.2023.04.29.proteus_h7.1316023387" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 4c37c3dc94..a7b2a610f4 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4223701330 -#define TS_SIGNATURE "rusEFI master.2023.04.29.s105.4223701330" +#define SIGNATURE_HASH 1149518063 +#define TS_SIGNATURE "rusEFI master.2023.04.29.s105.1149518063" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 02a9b889e6..f5213d675a 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_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3293042239 -#define TS_SIGNATURE "rusEFI master.2023.04.29.subaru_eg33_f7.3293042239" +#define SIGNATURE_HASH 2063796098 +#define TS_SIGNATURE "rusEFI master.2023.04.29.subaru_eg33_f7.2063796098" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index a45e7a1e33..3da68fc528 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1235372233 -#define TS_SIGNATURE "rusEFI master.2023.04.29.tdg-pdm8.1235372233" +#define SIGNATURE_HASH 4142307700 +#define TS_SIGNATURE "rusEFI master.2023.04.29.tdg-pdm8.4142307700" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index d58a7385d2..65522efaf9 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.f407-discovery.2873326157" + signature = "rusEFI master.2023.04.29.f407-discovery.336047088" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.f407-discovery.2873326157" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.f407-discovery.336047088" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:27 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:54 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index c3c389af03..b0faef900b 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.48way.3919250608" + signature = "rusEFI master.2023.04.29.48way.1457509645" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.48way.3919250608" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.48way.1457509645" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:08 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:35 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 23ccc2f79d..ae6c80f6b9 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.alphax-2chan.1455665336" + signature = "rusEFI master.2023.04.29.alphax-2chan.3917963525" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.alphax-2chan.1455665336" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.alphax-2chan.3917963525" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:44 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:10 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index c12794b72f..2f95d88ba0 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.alphax-4chan.2866528055" + signature = "rusEFI master.2023.04.29.alphax-4chan.362770058" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.alphax-4chan.2866528055" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.alphax-4chan.362770058" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:45 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:11 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 4071bbc841..ab7fcd7482 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.alphax-8chan.3140842216" + signature = "rusEFI master.2023.04.29.alphax-8chan.74556245" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.alphax-8chan.3140842216" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.alphax-8chan.74556245" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:47 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:12 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index e87a55a34f..e02695ea48 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.atlas.3754332620" + signature = "rusEFI master.2023.04.29.atlas.1619148913" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.atlas.3754332620" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.atlas.1619148913" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:24 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:51 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 5f4632a601..b64570f100 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.core8.2506523068" + signature = "rusEFI master.2023.04.29.core8.706891777" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.core8.2506523068" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.core8.706891777" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:07 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:33 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 50673b9842..330ad9acc6 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.cypress.3272369387" + signature = "rusEFI master.2023.04.29.cypress.2085139798" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.cypress.3272369387" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.cypress.2085139798" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Apr 29 19:54:42 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Apr 29 21:01:08 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index ebb0d74188..93a3dcda8b 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.f407-discovery.2873326157" + signature = "rusEFI master.2023.04.29.f407-discovery.336047088" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.f407-discovery.2873326157" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.f407-discovery.336047088" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:19 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:46 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 92bd103ead..ae3f67fafd 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.f429-discovery.3272369387" + signature = "rusEFI master.2023.04.29.f429-discovery.2085139798" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.f429-discovery.3272369387" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.f429-discovery.2085139798" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:20 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:47 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index acfc208ad5..4940d5e968 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.frankenso_na6.3781067809" + signature = "rusEFI master.2023.04.29.frankenso_na6.1578784156" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.frankenso_na6.3781067809" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.frankenso_na6.1578784156" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:11 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:38 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 861be044d9..9f84ed453b 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.harley81.2534833399" + signature = "rusEFI master.2023.04.29.harley81.676506954" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.harley81.2534833399" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.harley81.676506954" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:48 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:14 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index cc20261af5..947b7dfaa7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.hellen-gm-e67.180156706" + signature = "rusEFI master.2023.04.29.hellen-gm-e67.3052939423" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.hellen-gm-e67.180156706" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.hellen-gm-e67.3052939423" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:00 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:27 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 0c00c79eae..b575edf1a8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.hellen-honda-k.473483655" + signature = "rusEFI master.2023.04.29.hellen-honda-k.2742818874" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.hellen-honda-k.473483655" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.hellen-honda-k.2742818874" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:53 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:19 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index a592f88639..0d4332f18b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.hellen-nb1.366957120" + signature = "rusEFI master.2023.04.29.hellen-nb1.2862318589" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.hellen-nb1.366957120" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.hellen-nb1.2862318589" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:59 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:26 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 1b225275c4..04ca6f2a3b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.hellen121nissan.88946117" + signature = "rusEFI master.2023.04.29.hellen121nissan.3121210488" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.hellen121nissan.88946117" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.hellen121nissan.3121210488" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:52 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:18 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 3f6d481f8a..d52a5a867b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.hellen121vag.420598302" + signature = "rusEFI master.2023.04.29.hellen121vag.2790589347" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.hellen121vag.420598302" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.hellen121vag.2790589347" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:51 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:16 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index e3b961b5d1..0253d18769 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.hellen128.1626812013" + signature = "rusEFI master.2023.04.29.hellen128.3753115600" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.hellen128.1626812013" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.hellen128.3753115600" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:49 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:15 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index ed11754b4a..bda4baf1e6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.hellen154hyundai.633847087" + signature = "rusEFI master.2023.04.29.hellen154hyundai.2592304274" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.hellen154hyundai.633847087" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.hellen154hyundai.2592304274" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:54 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:21 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 5af6df54f0..1aee72caeb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.hellen72.3686567068" + signature = "rusEFI master.2023.04.29.hellen72.1693998369" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.hellen72.3686567068" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.hellen72.1693998369" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:57 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:23 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index cb1ad8387d..011c448f7f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.hellen81.3327555077" + signature = "rusEFI master.2023.04.29.hellen81.2031265720" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.hellen81.3327555077" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.hellen81.2031265720" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:58 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:24 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index c095b992de..27dbed89fc 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.hellen88bmw.1223871426" + signature = "rusEFI master.2023.04.29.hellen88bmw.4155906687" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.hellen88bmw.1223871426" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.hellen88bmw.4155906687" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:56 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:22 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index f1834ef9f8..4a699b9919 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.hellenNA6.642738002" + signature = "rusEFI master.2023.04.29.hellenNA6.2567681775" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.hellenNA6.642738002" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.hellenNA6.2567681775" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:02 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:28 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index ce466190a2..248fec3762 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.hellenNA8_96.1234940294" + signature = "rusEFI master.2023.04.29.hellenNA8_96.4141834299" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.hellenNA8_96.1234940294" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.hellenNA8_96.4141834299" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:03 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:29 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index e3c7d00403..2e4e646b99 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.kin.2883307047" + signature = "rusEFI master.2023.04.29.kin.345970586" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.kin.2883307047" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.kin.345970586" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Apr 29 19:54:41 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Apr 29 21:01:07 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 8b8db45215..00ec5dfb0f 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.m74_9.478329296" + signature = "rusEFI master.2023.04.29.m74_9.2747689069" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.m74_9.478329296" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.m74_9.2747689069" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:09 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:36 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index f8beb9c9bd..e445c98c19 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.mre_f4.1325086603" + signature = "rusEFI master.2023.04.29.mre_f4.4055885366" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.mre_f4.1325086603" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.mre_f4.4055885366" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:05 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:32 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4440,7 +4440,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4455,7 +4455,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4725,12 +4725,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4864,7 +4864,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4901,7 +4901,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 718fc3084f..28a5afa4d0 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.mre_f7.1325086603" + signature = "rusEFI master.2023.04.29.mre_f7.4055885366" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.mre_f7.1325086603" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.mre_f7.4055885366" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:04 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:31 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4440,7 +4440,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4455,7 +4455,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4725,12 +4725,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4864,7 +4864,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4901,7 +4901,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini index 3e887f7137..9beb8c4a96 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.nucleo_f429.3272369387" + signature = "rusEFI master.2023.04.29.nucleo_f429.2085139798" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.nucleo_f429.3272369387" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.nucleo_f429.2085139798" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:21 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:48 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini index 7a772b8f2d..61aee1a8d3 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.nucleo_f767.3272369387" + signature = "rusEFI master.2023.04.29.nucleo_f767.2085139798" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.nucleo_f767.3272369387" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.nucleo_f767.2085139798" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:22 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:49 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini index 863041c2f8..3211e6fda6 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.nucleo_h743.3272369387" + signature = "rusEFI master.2023.04.29.nucleo_h743.2085139798" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.nucleo_h743.3272369387" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.nucleo_h743.2085139798" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:23 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:50 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index b51d76c233..c6fa3dd3ec 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.prometheus_405.4086868347" + signature = "rusEFI master.2023.04.29.prometheus_405.1289517254" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.prometheus_405.4086868347" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.prometheus_405.1289517254" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:14 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:41 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 5f5ea828e2..96683e93c2 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.prometheus_469.4086868347" + signature = "rusEFI master.2023.04.29.prometheus_469.1289517254" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.prometheus_469.4086868347" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.prometheus_469.1289517254" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:13 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:40 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 7e1b0cee96..77fabae03f 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.proteus_f4.4046732774" + signature = "rusEFI master.2023.04.29.proteus_f4.1316023387" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.proteus_f4.4046732774" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.proteus_f4.1316023387" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:16 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:43 UTC 2023 pageSize = 26380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index cdb4441ed2..73dc290138 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.proteus_f7.4046732774" + signature = "rusEFI master.2023.04.29.proteus_f7.1316023387" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.proteus_f7.4046732774" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.proteus_f7.1316023387" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:15 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:42 UTC 2023 pageSize = 26380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index c76034aa8f..767a49d294 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.proteus_h7.4046732774" + signature = "rusEFI master.2023.04.29.proteus_h7.1316023387" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.proteus_h7.4046732774" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.proteus_h7.1316023387" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:17 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:44 UTC 2023 pageSize = 26380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 68ea1b61e8..26298e25e1 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.s105.4223701330" + signature = "rusEFI master.2023.04.29.s105.1149518063" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.s105.4223701330" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.s105.1149518063" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:10 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:37 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index f229eb31f3..a2cab54dc8 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.subaru_eg33_f7.3293042239" + signature = "rusEFI master.2023.04.29.subaru_eg33_f7.2063796098" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.subaru_eg33_f7.3293042239" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.subaru_eg33_f7.2063796098" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sat Apr 29 19:54:43 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:09 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 18ec0136a0..ea6a4e86a5 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.29.tdg-pdm8.1235372233" + signature = "rusEFI master.2023.04.29.tdg-pdm8.4142307700" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.29.tdg-pdm8.1235372233" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.29.tdg-pdm8.4142307700" ; 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 @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 19:55:25 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:53 UTC 2023 pageSize = 22380 page = 1 @@ -3975,7 +3975,7 @@ targetLambdaGauge = targetLambda,"fuel: target lambda", "", 0.5,1.5, 0.5,1.5, 0. targetAFRGauge = targetAFR,"fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10.0,20.0, 2,2 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 +sparkDwellGauge = sparkDwell,"dwell: 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 cltTimingCorrectionGauge = cltTimingCorrection,"Ignition: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ignition: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -4165,11 +4165,11 @@ gaugeCategory = VVT gaugeCategory = Ignition sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - baseIgnAdvGauge = baseIgnitionAdvance, "Timing: base ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 + baseIgnAdvGauge = baseIgnitionAdvance, "timing", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 correctedIgnAdvGauge = correctedIgnitionAdvance, "Timing: ignition", "degrees", -100, 100, -999, -999, 999, 999, 1, 1 dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1 - coilDutyCycleGauge = coilDutyCycle, "Ignition: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 - ignitionLoadGauge = ignitionLoad, "Ignition: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "%", 0, 110, 0, 0, 90, 100, 1, 1 + ignitionLoadGauge = ignitionLoad, "ign: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 gaugeCategory = Acceleration Enrichment deltaTpsGauge = deltaTps, "AE: TPS change", "", 0, 120, 10, 10, 100, 100, 1, 1 @@ -4186,7 +4186,7 @@ gaugeCategory = Fueling iatCorrectionGauge = running_intakeTemperatureCoefficient, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = running_coolantTemperatureCoefficient, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 - actualLastInjectionGauge = actualLastInjection, "fuel: Last Inj Pulsewidth", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 @@ -4439,7 +4439,7 @@ entry = chargeAirMass, "air mass", float, "%.3f" entry = crankingFuelMs, "crankingFuelMs", float, "%.3f" entry = baseFuel, "fuel: base mass", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" -entry = actualLastInjection, "fuel: Last Inj Pulsewidth", float, "%.3f" +entry = actualLastInjection, "fuel: Last injection", float, "%.3f" entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectionOffset, "injectionOffset", int, "%d" @@ -4454,7 +4454,7 @@ entry = canReadCounter, "canReadCounter", int, "%d" entry = tpsAccelFuel, "fuel: TPS acceleration add fuel ms", float, "%.3f" entry = warningCounter, "warning: counter", int, "%d" entry = lastErrorCode, "warning: last", int, "%d" -entry = coilDutyCycle, "Ignition: coil duty cycle", float, "%.3f" +entry = coilDutyCycle, "dwell: coil duty cycle", float, "%.3f" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" @@ -4724,12 +4724,12 @@ entry = sdAirMassInOneCylinder, "SD cylinder mass", float, "%.3f" entry = sdIsTChargeAirModel, "sdIsTChargeAirModel", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" -entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" +entry = sparkDwell, "dwell: coil charge time", float, "%.3f" entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ignition: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ignition: IAT correction", float, "%.3f" entry = timingPidCorrection, "Ignition: PID correction", float, "%.3f" -entry = baseIgnitionAdvance, "Timing: base ignition", float, "%.3f" +entry = baseIgnitionAdvance, "timing", float, "%.3f" entry = correctedIgnitionAdvance, "Timing: ignition", float, "%.3f" entry = dwellVoltageCorrection, "Ignition: dwell corr", float, "%.3f" entry = luaTimingAdd, "Ignition: Lua add", float, "%.3f" @@ -4863,7 +4863,7 @@ entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "fuelInjectionCounter", int, "%d" entry = sparkCounter, "sparkCounter", int, "%d" entry = fuelingLoad, "fuel: load", float, "%.3f" -entry = ignitionLoad, "Ignition: load", float, "%.3f" +entry = ignitionLoad, "ign: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4900,7 +4900,7 @@ entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" -entry = triggerSyncGapRatio, "Sync: Trigger Latest Ratio", float, "%.3f" +entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" entry = vvtCounter, "vvtCounter", int, "%d" entry = camResyncCounter, "camResyncCounter", int, "%d" diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java index 1a370e6926..9a59105858 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java @@ -1,114 +1,21 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Apr 29 01:39:32 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Apr 29 21:01:06 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class AcControl { - public static final int ADC_CHANNEL_NONE = 0; - public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; - public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; - public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; - public static final int AUX_DIGITAL_VALVE_COUNT = 2; public static final int BANKS_COUNT = 2; - public static final int BARO_CORR_SIZE = 4; - public static final int BLOCKING_FACTOR = 750; - public static final int BOOST_LOAD_COUNT = 8; - public static final int BOOST_RPM_COUNT = 8; public static final int CAM_INPUTS_COUNT = 4; public static final int CAMS_PER_BANK = 2; - public static final int CAN_DEFAULT_BASE = 0x200; - public static final int CAN_ECU_HW_META = 0xAB1234; - public static final int CAN_ECU_SERIAL_RX_ID = 0x100; - public static final int CAN_ECU_SERIAL_TX_ID = 0x102; - public static final String CAN_RX_PREFIX = "CAN_rx"; - public static final int CLT_CRANKING_CURVE_SIZE = 8; - public static final int CLT_CURVE_SIZE = 16; - public static final int CLT_LIMITER_CURVE_SIZE = 4; - public static final int CLT_TIMING_CURVE_SIZE = 8; - public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; - public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; - public static final String CMD_BOOST_PIN = "set_boost_pin"; - public static final String CMD_BURNCONFIG = "burnconfig"; - public static final String CMD_DATE = "date"; - public static final String CMD_DISABLE = "disable"; - public static final String CMD_ECU_UNLOCK = "unlock"; - public static final String CMD_ENABLE = "enable"; - public static final String CMD_ENGINE_TYPE = "engine_type"; - public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; - public static final String CMD_ETB_DUTY = "set_etb_duty"; - public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; - public static final String CMD_FAN2_BENCH = "fan2bench"; - public static final String CMD_FAN_BENCH = "fanbench"; - public static final String CMD_FUEL_BENCH = "fuelbench"; - public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; - public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; - public static final String CMD_GET = "get"; - public static final String CMD_HPFP_BENCH = "hpfpbench"; - public static final String CMD_IDLE_BENCH = "idlebench"; - public static final String CMD_IDLE_PIN = "set_idle_pin"; - public static final String CMD_IGNITION = "ignition"; - public static final String CMD_IGNITION_PIN = "set_ignition_pin"; - public static final String CMD_INJECTION = "injection"; - public static final String CMD_INJECTION_PIN = "set_injection_pin"; - public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; - public static final String CMD_MIL_BENCH = "milbench"; - public static final String CMD_PINS = "pins"; - public static final String CMD_PWM = "pwm"; - public static final String CMD_REBOOT = "reboot"; - public static final String CMD_REBOOT_DFU = "reboot_dfu"; - public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; - public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; - public static final String CMD_RPM = "rpm"; - public static final String CMD_SELF_STIMULATION = "self_stimulation"; - public static final String CMD_SET = "set"; - public static final String CMD_SPARK_BENCH = "sparkbench"; - public static final String CMD_STARTER_BENCH = "starterbench"; - public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; - public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; - public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; - public static final String CMD_TRIGGERINFO = "triggerinfo"; - public static final String CMD_VSS_PIN = "vss_pin"; - public static final String CMD_WRITECONFIG = "writeconfig"; - public static final int COMPOSITE_PACKET_SIZE = 5; - public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; - public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; - public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; - public static final int CRANKING_CURVE_SIZE = 8; - public static final int CRITICAL_BUFFER_SIZE = 120; - public static final String CRITICAL_PREFIX = "CRITICAL"; - public static final int DC_PER_STEPPER = 2; - public static final int DIGIPOT_COUNT = 4; - public static final int DWELL_CURVE_SIZE = 8; public static final int EGT_CHANNEL_COUNT = 8; - public static final String ENGINE_MAKE_BMW = "BMW"; - public static final String ENGINE_MAKE_GM = "GM"; - public static final String ENGINE_MAKE_HONDA = "Honda"; - public static final String ENGINE_MAKE_Hyundai = "Hyundai"; - public static final String ENGINE_MAKE_LADA = "Lada"; - public static final String ENGINE_MAKE_MAZDA = "Mazda"; - public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; - public static final String ENGINE_MAKE_NISSAN = "Nissan"; - public static final String ENGINE_MAKE_SUBARU = "Subaru"; - public static final String ENGINE_MAKE_TOYOTA = "Toyota"; - public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 16; - public static final int ENGINE_SNIFFER_UNIT_US = 10; - public static final int ETB_BIAS_CURVE_LENGTH = 8; - public static final int ETB_COUNT = 2; - public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10021; - public static final int FUEL_LEVEL_TABLE_COUNT = 8; - public static final int FUEL_LOAD_COUNT = 16; - public static final int FUEL_RPM_COUNT = 16; - public static final int GAP_TRACKING_LENGTH = 18; public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_ETB = "ETB more"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_SYNC = "Sync"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; - public static final String GAUGE_COIL_DWELL_TIME = "Ignition: coil charge time"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -147,7 +54,7 @@ public class AcControl { public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; - public static final String GAUGE_NAME_DWELL_DUTY = "Ignition: coil duty cycle"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; @@ -164,7 +71,7 @@ public class AcControl { public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; - public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last Inj Pulsewidth"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; @@ -184,7 +91,7 @@ public class AcControl { public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_IAT = "IAT"; public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; - public static final String GAUGE_NAME_IGNITION_LOAD = "Ignition: load"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; @@ -218,11 +125,11 @@ public class AcControl { public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; - public static final String GAUGE_NAME_TIMING_ADVANCE = "Timing: base ignition"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; public static final String GAUGE_NAME_TPS2 = "TPS2"; public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; - public static final String GAUGE_NAME_TRG_GAP = "Sync: Trigger Latest Ratio"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; public static final String GAUGE_NAME_UPTIME = "Uptime"; @@ -242,44 +149,14 @@ public class AcControl { public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; public static final int GEARS_COUNT = 8; - public static final int GPPWM_CHANNELS = 4; - public static final int GPPWM_LOAD_COUNT = 8; - public static final int GPPWM_NOTE_SIZE = 16; - public static final int GPPWM_RPM_COUNT = 8; - public static final int HIGH_SPEED_COUNT = 32; - public static final int HPFP_COMPENSATION_SIZE = 10; - public static final int HPFP_DEADTIME_SIZE = 8; - public static final int HPFP_LOBE_PROFILE_SIZE = 16; - public static final int HPFP_TARGET_SIZE = 10; - public static final int HW_MAX_ADC_INDEX = 17; - public static final int IAC_PID_MULT_SIZE = 8; - public static final int IAT_CURVE_SIZE = 16; - public static final int IDLE_ADVANCE_CURVE_SIZE = 8; - public static final int IDLE_VE_SIZE = 4; public static final int IGN_BLEND_COUNT = 4; - public static final int IGN_LOAD_COUNT = 16; - public static final int IGN_RPM_COUNT = 16; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; - public static final String LOG_DELIMITER = "`"; - public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; public static final int LUA_ANALOG_INPUT_COUNT = 8; - public static final int LUA_DIGITAL_INPUT_COUNT = 8; public static final int LUA_GAUGE_COUNT = 2; - public static final int LUA_PWM_COUNT = 8; - public static final int LUA_SCRIPT_SIZE = 8000; - public static final int MAF_DECODING_COUNT = 256; - public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; - public static final int MAP_ANGLE_SIZE = 8; - public static final int MAP_WINDOW_SIZE = 8; public static final int MAX_CYLINDER_COUNT = 12; - public static final int MLQ_FIELD_HEADER_SIZE = 89; - public static final int MLQ_HEADER_SIZE = 24; - public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; - public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; - public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_AFR_CFG = 10; @@ -296,119 +173,8 @@ public class AcControl { public static final int PACK_MULT_TEMPERATURE = 100; public static final int PACK_MULT_VOLTAGE = 1000; public static final int PACK_MULT_VSS = 100; - public static final int PEDAL_TO_TPS_SIZE = 8; - public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; - public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; - public static final String PROTOCOL_CRANK1 = "t1"; - public static final String PROTOCOL_CRANK2 = "t2"; - public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; - public static final String PROTOCOL_ES_DOWN = "d"; - public static final String PROTOCOL_ES_UP = "u"; - public static final String PROTOCOL_HELLO_PREFIX = "***"; - public static final String PROTOCOL_HIP_NAME = "HIP"; - public static final String PROTOCOL_HPFP_NAME = "hpfp"; - public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; - public static final String PROTOCOL_MSG = "msg"; - public static final String PROTOCOL_OUTPIN = "outpin"; - public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; - public static final String PROTOCOL_TACH_NAME = "tach"; - public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; - public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; - public static final String PROTOCOL_VVT1_NAME = "VVT1"; - public static final String PROTOCOL_VVT2_NAME = "VVT2"; - public static final String PROTOCOL_VVT3_NAME = "VVT3"; - public static final String PROTOCOL_VVT4_NAME = "VVT4"; - public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; - public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; - public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; - public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; - public static final int SCRIPT_CURVE_16 = 16; - public static final int SCRIPT_CURVE_8 = 8; - public static final int SCRIPT_CURVE_COUNT = 6; - public static final int SCRIPT_SETTING_COUNT = 8; - public static final int SCRIPT_TABLE_8 = 8; - public static final int SCRIPT_TABLE_COUNT = 4; - public static final int SENT_INPUT_COUNT = 1; - public static final int STFT_BANK_COUNT = 2; - public static final int STFT_CELL_COUNT = 4; - public static final int TCU_GEAR_COUNT = 10; - public static final int TCU_MAGIC_SIZE = 8; - public static final int TCU_SOLENOID_COUNT = 6; - public static final int TOOTH_DATA_LENGTH = 2000; - public static final int TOOTH_PACKET_COUNT = 1000; - public static final int TOOTH_PACKET_SIZE = 2; - public static final String TOP_DEAD_CENTER_MESSAGE = "r"; - public static final int TORQUE_CURVE_SIZE = 6; public static final int TPS_2_BYTE_PACKING_MULT = 100; - public static final int TPS_TPS_ACCEL_CLT_CORR_TABLE = 4; - public static final int TPS_TPS_ACCEL_TABLE = 8; - public static final String TRIGGER_COMMENT = "#"; - public static final String TRIGGER_CYCLE_DURATION = "cycleDuration"; - public static final String TRIGGER_GAP_FROM = "gapFrom"; - public static final String TRIGGER_GAP_TO = "gapTo"; - public static final String TRIGGER_GAPS_COUNT = "gapsCount"; - public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; - public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; - public static final int TRIGGER_INPUT_PIN_COUNT = 2; - public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; - public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; - public static final String TRIGGER_WITH_SYNC = "isSynchronizationNeeded"; - public static final String TRIGGERS_FILE_NAME = "triggers.txt"; - public static final int TRIM_SIZE = 4; - public static final int TS_BLOCK_READ_TIMEOUT = 3000; - public static final char TS_BURN_COMMAND = 'B'; - public static final char TS_CHUNK_WRITE_COMMAND = 'C'; - public static final char TS_COMMAND_F = 'F'; - public static final int TS_COMPOSITE_DISABLE = 2; - public static final int TS_COMPOSITE_ENABLE = 1; - public static final int TS_COMPOSITE_READ = 3; - public static final char TS_CRC_CHECK_COMMAND = 'k'; - public static final char TS_EXECUTE = 'E'; - public static final int TS_FILE_VERSION = 20210312; - public static final int TS_FILE_VERSION_OFFSET = 124; - public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; - public static final char TS_GET_CONFIG_ERROR = 'e'; - public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_OUTPUTS_SIZE = '4'; - public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; - public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; - public static final char TS_GET_TEXT = 'G'; - public static final char TS_HELLO_COMMAND = 'S'; - public static final char TS_IO_TEST_COMMAND = 'Z'; - public static final char TS_ONLINE_PROTOCOL = 'z'; - public static final char TS_OUTPUT_COMMAND = 'O'; - public static final char TS_PAGE_COMMAND = 'P'; - public static final char TS_PERF_TRACE_BEGIN = '_'; - public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; - public static final String TS_PROTOCOL = "001"; - public static final char TS_QUERY_COMMAND = 'Q'; - public static final char TS_READ_COMMAND = 'R'; - public static final int TS_RESPONSE_BURN_OK = 4; - public static final int TS_RESPONSE_COMMAND_OK = 7; - public static final int TS_RESPONSE_CRC_FAILURE = 0x82; - public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; - public static final int TS_RESPONSE_OK = 0; - public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; - 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 char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final char TS_TEST_COMMAND = 't'; - public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; - public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; - public static final int TS_TRIGGER_SCOPE_DISABLE = 5; - public static final int TS_TRIGGER_SCOPE_ENABLE = 4; - public static final int TS_TRIGGER_SCOPE_READ = 6; - public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; - public static final int VEHICLE_INFO_SIZE = 32; - public static final int VIN_NUMBER_SIZE = 17; - public static final int VR_THRESHOLD_COUNT = 2; - public static final int VSS_FILTER_MAX = 200; - public static final int VSS_FILTER_MIN = 3; - public static final int WARNING_BUFFER_SIZE = 120; - public static final int WWAE_TABLE_SIZE = 8; public static final Field ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 0).setBaseOffset(972); public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 1).setBaseOffset(972); public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 2).setBaseOffset(972); diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java index 8edda73f17..fc4d8da742 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java @@ -1,114 +1,21 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Sat Apr 29 01:39:32 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Sat Apr 29 21:01:06 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class AntilagSystem { - public static final int ADC_CHANNEL_NONE = 0; - public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; - public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; - public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; - public static final int AUX_DIGITAL_VALVE_COUNT = 2; public static final int BANKS_COUNT = 2; - public static final int BARO_CORR_SIZE = 4; - public static final int BLOCKING_FACTOR = 750; - public static final int BOOST_LOAD_COUNT = 8; - public static final int BOOST_RPM_COUNT = 8; public static final int CAM_INPUTS_COUNT = 4; public static final int CAMS_PER_BANK = 2; - public static final int CAN_DEFAULT_BASE = 0x200; - public static final int CAN_ECU_HW_META = 0xAB1234; - public static final int CAN_ECU_SERIAL_RX_ID = 0x100; - public static final int CAN_ECU_SERIAL_TX_ID = 0x102; - public static final String CAN_RX_PREFIX = "CAN_rx"; - public static final int CLT_CRANKING_CURVE_SIZE = 8; - public static final int CLT_CURVE_SIZE = 16; - public static final int CLT_LIMITER_CURVE_SIZE = 4; - public static final int CLT_TIMING_CURVE_SIZE = 8; - public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; - public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; - public static final String CMD_BOOST_PIN = "set_boost_pin"; - public static final String CMD_BURNCONFIG = "burnconfig"; - public static final String CMD_DATE = "date"; - public static final String CMD_DISABLE = "disable"; - public static final String CMD_ECU_UNLOCK = "unlock"; - public static final String CMD_ENABLE = "enable"; - public static final String CMD_ENGINE_TYPE = "engine_type"; - public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; - public static final String CMD_ETB_DUTY = "set_etb_duty"; - public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; - public static final String CMD_FAN2_BENCH = "fan2bench"; - public static final String CMD_FAN_BENCH = "fanbench"; - public static final String CMD_FUEL_BENCH = "fuelbench"; - public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; - public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; - public static final String CMD_GET = "get"; - public static final String CMD_HPFP_BENCH = "hpfpbench"; - public static final String CMD_IDLE_BENCH = "idlebench"; - public static final String CMD_IDLE_PIN = "set_idle_pin"; - public static final String CMD_IGNITION = "ignition"; - public static final String CMD_IGNITION_PIN = "set_ignition_pin"; - public static final String CMD_INJECTION = "injection"; - public static final String CMD_INJECTION_PIN = "set_injection_pin"; - public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; - public static final String CMD_MIL_BENCH = "milbench"; - public static final String CMD_PINS = "pins"; - public static final String CMD_PWM = "pwm"; - public static final String CMD_REBOOT = "reboot"; - public static final String CMD_REBOOT_DFU = "reboot_dfu"; - public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; - public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; - public static final String CMD_RPM = "rpm"; - public static final String CMD_SELF_STIMULATION = "self_stimulation"; - public static final String CMD_SET = "set"; - public static final String CMD_SPARK_BENCH = "sparkbench"; - public static final String CMD_STARTER_BENCH = "starterbench"; - public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; - public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; - public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; - public static final String CMD_TRIGGERINFO = "triggerinfo"; - public static final String CMD_VSS_PIN = "vss_pin"; - public static final String CMD_WRITECONFIG = "writeconfig"; - public static final int COMPOSITE_PACKET_SIZE = 5; - public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; - public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; - public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; - public static final int CRANKING_CURVE_SIZE = 8; - public static final int CRITICAL_BUFFER_SIZE = 120; - public static final String CRITICAL_PREFIX = "CRITICAL"; - public static final int DC_PER_STEPPER = 2; - public static final int DIGIPOT_COUNT = 4; - public static final int DWELL_CURVE_SIZE = 8; public static final int EGT_CHANNEL_COUNT = 8; - public static final String ENGINE_MAKE_BMW = "BMW"; - public static final String ENGINE_MAKE_GM = "GM"; - public static final String ENGINE_MAKE_HONDA = "Honda"; - public static final String ENGINE_MAKE_Hyundai = "Hyundai"; - public static final String ENGINE_MAKE_LADA = "Lada"; - public static final String ENGINE_MAKE_MAZDA = "Mazda"; - public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; - public static final String ENGINE_MAKE_NISSAN = "Nissan"; - public static final String ENGINE_MAKE_SUBARU = "Subaru"; - public static final String ENGINE_MAKE_TOYOTA = "Toyota"; - public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 16; - public static final int ENGINE_SNIFFER_UNIT_US = 10; - public static final int ETB_BIAS_CURVE_LENGTH = 8; - public static final int ETB_COUNT = 2; - public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10021; - public static final int FUEL_LEVEL_TABLE_COUNT = 8; - public static final int FUEL_LOAD_COUNT = 16; - public static final int FUEL_RPM_COUNT = 16; - public static final int GAP_TRACKING_LENGTH = 18; public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_ETB = "ETB more"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_SYNC = "Sync"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; - public static final String GAUGE_COIL_DWELL_TIME = "Ignition: coil charge time"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -147,7 +54,7 @@ public class AntilagSystem { public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; - public static final String GAUGE_NAME_DWELL_DUTY = "Ignition: coil duty cycle"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; @@ -164,7 +71,7 @@ public class AntilagSystem { public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; - public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last Inj Pulsewidth"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; @@ -184,7 +91,7 @@ public class AntilagSystem { public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_IAT = "IAT"; public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; - public static final String GAUGE_NAME_IGNITION_LOAD = "Ignition: load"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; @@ -218,11 +125,11 @@ public class AntilagSystem { public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; - public static final String GAUGE_NAME_TIMING_ADVANCE = "Timing: base ignition"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; public static final String GAUGE_NAME_TPS2 = "TPS2"; public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; - public static final String GAUGE_NAME_TRG_GAP = "Sync: Trigger Latest Ratio"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; public static final String GAUGE_NAME_UPTIME = "Uptime"; @@ -242,44 +149,14 @@ public class AntilagSystem { public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; public static final int GEARS_COUNT = 8; - public static final int GPPWM_CHANNELS = 4; - public static final int GPPWM_LOAD_COUNT = 8; - public static final int GPPWM_NOTE_SIZE = 16; - public static final int GPPWM_RPM_COUNT = 8; - public static final int HIGH_SPEED_COUNT = 32; - public static final int HPFP_COMPENSATION_SIZE = 10; - public static final int HPFP_DEADTIME_SIZE = 8; - public static final int HPFP_LOBE_PROFILE_SIZE = 16; - public static final int HPFP_TARGET_SIZE = 10; - public static final int HW_MAX_ADC_INDEX = 17; - public static final int IAC_PID_MULT_SIZE = 8; - public static final int IAT_CURVE_SIZE = 16; - public static final int IDLE_ADVANCE_CURVE_SIZE = 8; - public static final int IDLE_VE_SIZE = 4; public static final int IGN_BLEND_COUNT = 4; - public static final int IGN_LOAD_COUNT = 16; - public static final int IGN_RPM_COUNT = 16; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; - public static final String LOG_DELIMITER = "`"; - public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; public static final int LUA_ANALOG_INPUT_COUNT = 8; - public static final int LUA_DIGITAL_INPUT_COUNT = 8; public static final int LUA_GAUGE_COUNT = 2; - public static final int LUA_PWM_COUNT = 8; - public static final int LUA_SCRIPT_SIZE = 8000; - public static final int MAF_DECODING_COUNT = 256; - public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; - public static final int MAP_ANGLE_SIZE = 8; - public static final int MAP_WINDOW_SIZE = 8; public static final int MAX_CYLINDER_COUNT = 12; - public static final int MLQ_FIELD_HEADER_SIZE = 89; - public static final int MLQ_HEADER_SIZE = 24; - public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; - public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; - public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_AFR_CFG = 10; @@ -296,119 +173,8 @@ public class AntilagSystem { public static final int PACK_MULT_TEMPERATURE = 100; public static final int PACK_MULT_VOLTAGE = 1000; public static final int PACK_MULT_VSS = 100; - public static final int PEDAL_TO_TPS_SIZE = 8; - public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; - public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; - public static final String PROTOCOL_CRANK1 = "t1"; - public static final String PROTOCOL_CRANK2 = "t2"; - public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; - public static final String PROTOCOL_ES_DOWN = "d"; - public static final String PROTOCOL_ES_UP = "u"; - public static final String PROTOCOL_HELLO_PREFIX = "***"; - public static final String PROTOCOL_HIP_NAME = "HIP"; - public static final String PROTOCOL_HPFP_NAME = "hpfp"; - public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; - public static final String PROTOCOL_MSG = "msg"; - public static final String PROTOCOL_OUTPIN = "outpin"; - public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; - public static final String PROTOCOL_TACH_NAME = "tach"; - public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; - public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; - public static final String PROTOCOL_VVT1_NAME = "VVT1"; - public static final String PROTOCOL_VVT2_NAME = "VVT2"; - public static final String PROTOCOL_VVT3_NAME = "VVT3"; - public static final String PROTOCOL_VVT4_NAME = "VVT4"; - public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; - public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; - public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; - public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; - public static final int SCRIPT_CURVE_16 = 16; - public static final int SCRIPT_CURVE_8 = 8; - public static final int SCRIPT_CURVE_COUNT = 6; - public static final int SCRIPT_SETTING_COUNT = 8; - public static final int SCRIPT_TABLE_8 = 8; - public static final int SCRIPT_TABLE_COUNT = 4; - public static final int SENT_INPUT_COUNT = 1; - public static final int STFT_BANK_COUNT = 2; - public static final int STFT_CELL_COUNT = 4; - public static final int TCU_GEAR_COUNT = 10; - public static final int TCU_MAGIC_SIZE = 8; - public static final int TCU_SOLENOID_COUNT = 6; - public static final int TOOTH_DATA_LENGTH = 2000; - public static final int TOOTH_PACKET_COUNT = 1000; - public static final int TOOTH_PACKET_SIZE = 2; - public static final String TOP_DEAD_CENTER_MESSAGE = "r"; - public static final int TORQUE_CURVE_SIZE = 6; public static final int TPS_2_BYTE_PACKING_MULT = 100; - public static final int TPS_TPS_ACCEL_CLT_CORR_TABLE = 4; - public static final int TPS_TPS_ACCEL_TABLE = 8; - public static final String TRIGGER_COMMENT = "#"; - public static final String TRIGGER_CYCLE_DURATION = "cycleDuration"; - public static final String TRIGGER_GAP_FROM = "gapFrom"; - public static final String TRIGGER_GAP_TO = "gapTo"; - public static final String TRIGGER_GAPS_COUNT = "gapsCount"; - public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; - public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; - public static final int TRIGGER_INPUT_PIN_COUNT = 2; - public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; - public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; - public static final String TRIGGER_WITH_SYNC = "isSynchronizationNeeded"; - public static final String TRIGGERS_FILE_NAME = "triggers.txt"; - public static final int TRIM_SIZE = 4; - public static final int TS_BLOCK_READ_TIMEOUT = 3000; - public static final char TS_BURN_COMMAND = 'B'; - public static final char TS_CHUNK_WRITE_COMMAND = 'C'; - public static final char TS_COMMAND_F = 'F'; - public static final int TS_COMPOSITE_DISABLE = 2; - public static final int TS_COMPOSITE_ENABLE = 1; - public static final int TS_COMPOSITE_READ = 3; - public static final char TS_CRC_CHECK_COMMAND = 'k'; - public static final char TS_EXECUTE = 'E'; - public static final int TS_FILE_VERSION = 20210312; - public static final int TS_FILE_VERSION_OFFSET = 124; - public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; - public static final char TS_GET_CONFIG_ERROR = 'e'; - public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_OUTPUTS_SIZE = '4'; - public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; - public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; - public static final char TS_GET_TEXT = 'G'; - public static final char TS_HELLO_COMMAND = 'S'; - public static final char TS_IO_TEST_COMMAND = 'Z'; - public static final char TS_ONLINE_PROTOCOL = 'z'; - public static final char TS_OUTPUT_COMMAND = 'O'; - public static final char TS_PAGE_COMMAND = 'P'; - public static final char TS_PERF_TRACE_BEGIN = '_'; - public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; - public static final String TS_PROTOCOL = "001"; - public static final char TS_QUERY_COMMAND = 'Q'; - public static final char TS_READ_COMMAND = 'R'; - public static final int TS_RESPONSE_BURN_OK = 4; - public static final int TS_RESPONSE_COMMAND_OK = 7; - public static final int TS_RESPONSE_CRC_FAILURE = 0x82; - public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; - public static final int TS_RESPONSE_OK = 0; - public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; - 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 char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final char TS_TEST_COMMAND = 't'; - public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; - public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; - public static final int TS_TRIGGER_SCOPE_DISABLE = 5; - public static final int TS_TRIGGER_SCOPE_ENABLE = 4; - public static final int TS_TRIGGER_SCOPE_READ = 6; - public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; - public static final int VEHICLE_INFO_SIZE = 32; - public static final int VIN_NUMBER_SIZE = 17; - public static final int VR_THRESHOLD_COUNT = 2; - public static final int VSS_FILTER_MAX = 200; - public static final int VSS_FILTER_MIN = 3; - public static final int WARNING_BUFFER_SIZE = 120; - public static final int WWAE_TABLE_SIZE = 8; public static final Field ISANTILAGCONDITION = Field.create("ISANTILAGCONDITION", 0, FieldType.BIT, 0).setBaseOffset(936); public static final Field ALSMINRPMCONDITION = Field.create("ALSMINRPMCONDITION", 0, FieldType.BIT, 1).setBaseOffset(936); public static final Field ALSMAXRPMCONDITION = Field.create("ALSMAXRPMCONDITION", 0, FieldType.BIT, 2).setBaseOffset(936); diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java index 1d5c1cd8b2..a368bb7040 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java @@ -1,114 +1,21 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Sat Apr 29 01:39:32 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Sat Apr 29 21:01:06 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class BoostControl { - public static final int ADC_CHANNEL_NONE = 0; - public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; - public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; - public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; - public static final int AUX_DIGITAL_VALVE_COUNT = 2; public static final int BANKS_COUNT = 2; - public static final int BARO_CORR_SIZE = 4; - public static final int BLOCKING_FACTOR = 750; - public static final int BOOST_LOAD_COUNT = 8; - public static final int BOOST_RPM_COUNT = 8; public static final int CAM_INPUTS_COUNT = 4; public static final int CAMS_PER_BANK = 2; - public static final int CAN_DEFAULT_BASE = 0x200; - public static final int CAN_ECU_HW_META = 0xAB1234; - public static final int CAN_ECU_SERIAL_RX_ID = 0x100; - public static final int CAN_ECU_SERIAL_TX_ID = 0x102; - public static final String CAN_RX_PREFIX = "CAN_rx"; - public static final int CLT_CRANKING_CURVE_SIZE = 8; - public static final int CLT_CURVE_SIZE = 16; - public static final int CLT_LIMITER_CURVE_SIZE = 4; - public static final int CLT_TIMING_CURVE_SIZE = 8; - public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; - public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; - public static final String CMD_BOOST_PIN = "set_boost_pin"; - public static final String CMD_BURNCONFIG = "burnconfig"; - public static final String CMD_DATE = "date"; - public static final String CMD_DISABLE = "disable"; - public static final String CMD_ECU_UNLOCK = "unlock"; - public static final String CMD_ENABLE = "enable"; - public static final String CMD_ENGINE_TYPE = "engine_type"; - public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; - public static final String CMD_ETB_DUTY = "set_etb_duty"; - public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; - public static final String CMD_FAN2_BENCH = "fan2bench"; - public static final String CMD_FAN_BENCH = "fanbench"; - public static final String CMD_FUEL_BENCH = "fuelbench"; - public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; - public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; - public static final String CMD_GET = "get"; - public static final String CMD_HPFP_BENCH = "hpfpbench"; - public static final String CMD_IDLE_BENCH = "idlebench"; - public static final String CMD_IDLE_PIN = "set_idle_pin"; - public static final String CMD_IGNITION = "ignition"; - public static final String CMD_IGNITION_PIN = "set_ignition_pin"; - public static final String CMD_INJECTION = "injection"; - public static final String CMD_INJECTION_PIN = "set_injection_pin"; - public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; - public static final String CMD_MIL_BENCH = "milbench"; - public static final String CMD_PINS = "pins"; - public static final String CMD_PWM = "pwm"; - public static final String CMD_REBOOT = "reboot"; - public static final String CMD_REBOOT_DFU = "reboot_dfu"; - public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; - public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; - public static final String CMD_RPM = "rpm"; - public static final String CMD_SELF_STIMULATION = "self_stimulation"; - public static final String CMD_SET = "set"; - public static final String CMD_SPARK_BENCH = "sparkbench"; - public static final String CMD_STARTER_BENCH = "starterbench"; - public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; - public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; - public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; - public static final String CMD_TRIGGERINFO = "triggerinfo"; - public static final String CMD_VSS_PIN = "vss_pin"; - public static final String CMD_WRITECONFIG = "writeconfig"; - public static final int COMPOSITE_PACKET_SIZE = 5; - public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; - public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; - public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; - public static final int CRANKING_CURVE_SIZE = 8; - public static final int CRITICAL_BUFFER_SIZE = 120; - public static final String CRITICAL_PREFIX = "CRITICAL"; - public static final int DC_PER_STEPPER = 2; - public static final int DIGIPOT_COUNT = 4; - public static final int DWELL_CURVE_SIZE = 8; public static final int EGT_CHANNEL_COUNT = 8; - public static final String ENGINE_MAKE_BMW = "BMW"; - public static final String ENGINE_MAKE_GM = "GM"; - public static final String ENGINE_MAKE_HONDA = "Honda"; - public static final String ENGINE_MAKE_Hyundai = "Hyundai"; - public static final String ENGINE_MAKE_LADA = "Lada"; - public static final String ENGINE_MAKE_MAZDA = "Mazda"; - public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; - public static final String ENGINE_MAKE_NISSAN = "Nissan"; - public static final String ENGINE_MAKE_SUBARU = "Subaru"; - public static final String ENGINE_MAKE_TOYOTA = "Toyota"; - public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 16; - public static final int ENGINE_SNIFFER_UNIT_US = 10; - public static final int ETB_BIAS_CURVE_LENGTH = 8; - public static final int ETB_COUNT = 2; - public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10021; - public static final int FUEL_LEVEL_TABLE_COUNT = 8; - public static final int FUEL_LOAD_COUNT = 16; - public static final int FUEL_RPM_COUNT = 16; - public static final int GAP_TRACKING_LENGTH = 18; public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_ETB = "ETB more"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_SYNC = "Sync"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; - public static final String GAUGE_COIL_DWELL_TIME = "Ignition: coil charge time"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -147,7 +54,7 @@ public class BoostControl { public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; - public static final String GAUGE_NAME_DWELL_DUTY = "Ignition: coil duty cycle"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; @@ -164,7 +71,7 @@ public class BoostControl { public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; - public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last Inj Pulsewidth"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; @@ -184,7 +91,7 @@ public class BoostControl { public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_IAT = "IAT"; public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; - public static final String GAUGE_NAME_IGNITION_LOAD = "Ignition: load"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; @@ -218,11 +125,11 @@ public class BoostControl { public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; - public static final String GAUGE_NAME_TIMING_ADVANCE = "Timing: base ignition"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; public static final String GAUGE_NAME_TPS2 = "TPS2"; public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; - public static final String GAUGE_NAME_TRG_GAP = "Sync: Trigger Latest Ratio"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; public static final String GAUGE_NAME_UPTIME = "Uptime"; @@ -242,44 +149,14 @@ public class BoostControl { public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; public static final int GEARS_COUNT = 8; - public static final int GPPWM_CHANNELS = 4; - public static final int GPPWM_LOAD_COUNT = 8; - public static final int GPPWM_NOTE_SIZE = 16; - public static final int GPPWM_RPM_COUNT = 8; - public static final int HIGH_SPEED_COUNT = 32; - public static final int HPFP_COMPENSATION_SIZE = 10; - public static final int HPFP_DEADTIME_SIZE = 8; - public static final int HPFP_LOBE_PROFILE_SIZE = 16; - public static final int HPFP_TARGET_SIZE = 10; - public static final int HW_MAX_ADC_INDEX = 17; - public static final int IAC_PID_MULT_SIZE = 8; - public static final int IAT_CURVE_SIZE = 16; - public static final int IDLE_ADVANCE_CURVE_SIZE = 8; - public static final int IDLE_VE_SIZE = 4; public static final int IGN_BLEND_COUNT = 4; - public static final int IGN_LOAD_COUNT = 16; - public static final int IGN_RPM_COUNT = 16; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; - public static final String LOG_DELIMITER = "`"; - public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; public static final int LUA_ANALOG_INPUT_COUNT = 8; - public static final int LUA_DIGITAL_INPUT_COUNT = 8; public static final int LUA_GAUGE_COUNT = 2; - public static final int LUA_PWM_COUNT = 8; - public static final int LUA_SCRIPT_SIZE = 8000; - public static final int MAF_DECODING_COUNT = 256; - public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; - public static final int MAP_ANGLE_SIZE = 8; - public static final int MAP_WINDOW_SIZE = 8; public static final int MAX_CYLINDER_COUNT = 12; - public static final int MLQ_FIELD_HEADER_SIZE = 89; - public static final int MLQ_HEADER_SIZE = 24; - public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; - public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; - public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_AFR_CFG = 10; @@ -296,119 +173,8 @@ public class BoostControl { public static final int PACK_MULT_TEMPERATURE = 100; public static final int PACK_MULT_VOLTAGE = 1000; public static final int PACK_MULT_VSS = 100; - public static final int PEDAL_TO_TPS_SIZE = 8; - public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; - public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; - public static final String PROTOCOL_CRANK1 = "t1"; - public static final String PROTOCOL_CRANK2 = "t2"; - public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; - public static final String PROTOCOL_ES_DOWN = "d"; - public static final String PROTOCOL_ES_UP = "u"; - public static final String PROTOCOL_HELLO_PREFIX = "***"; - public static final String PROTOCOL_HIP_NAME = "HIP"; - public static final String PROTOCOL_HPFP_NAME = "hpfp"; - public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; - public static final String PROTOCOL_MSG = "msg"; - public static final String PROTOCOL_OUTPIN = "outpin"; - public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; - public static final String PROTOCOL_TACH_NAME = "tach"; - public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; - public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; - public static final String PROTOCOL_VVT1_NAME = "VVT1"; - public static final String PROTOCOL_VVT2_NAME = "VVT2"; - public static final String PROTOCOL_VVT3_NAME = "VVT3"; - public static final String PROTOCOL_VVT4_NAME = "VVT4"; - public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; - public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; - public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; - public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; - public static final int SCRIPT_CURVE_16 = 16; - public static final int SCRIPT_CURVE_8 = 8; - public static final int SCRIPT_CURVE_COUNT = 6; - public static final int SCRIPT_SETTING_COUNT = 8; - public static final int SCRIPT_TABLE_8 = 8; - public static final int SCRIPT_TABLE_COUNT = 4; - public static final int SENT_INPUT_COUNT = 1; - public static final int STFT_BANK_COUNT = 2; - public static final int STFT_CELL_COUNT = 4; - public static final int TCU_GEAR_COUNT = 10; - public static final int TCU_MAGIC_SIZE = 8; - public static final int TCU_SOLENOID_COUNT = 6; - public static final int TOOTH_DATA_LENGTH = 2000; - public static final int TOOTH_PACKET_COUNT = 1000; - public static final int TOOTH_PACKET_SIZE = 2; - public static final String TOP_DEAD_CENTER_MESSAGE = "r"; - public static final int TORQUE_CURVE_SIZE = 6; public static final int TPS_2_BYTE_PACKING_MULT = 100; - public static final int TPS_TPS_ACCEL_CLT_CORR_TABLE = 4; - public static final int TPS_TPS_ACCEL_TABLE = 8; - public static final String TRIGGER_COMMENT = "#"; - public static final String TRIGGER_CYCLE_DURATION = "cycleDuration"; - public static final String TRIGGER_GAP_FROM = "gapFrom"; - public static final String TRIGGER_GAP_TO = "gapTo"; - public static final String TRIGGER_GAPS_COUNT = "gapsCount"; - public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; - public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; - public static final int TRIGGER_INPUT_PIN_COUNT = 2; - public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; - public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; - public static final String TRIGGER_WITH_SYNC = "isSynchronizationNeeded"; - public static final String TRIGGERS_FILE_NAME = "triggers.txt"; - public static final int TRIM_SIZE = 4; - public static final int TS_BLOCK_READ_TIMEOUT = 3000; - public static final char TS_BURN_COMMAND = 'B'; - public static final char TS_CHUNK_WRITE_COMMAND = 'C'; - public static final char TS_COMMAND_F = 'F'; - public static final int TS_COMPOSITE_DISABLE = 2; - public static final int TS_COMPOSITE_ENABLE = 1; - public static final int TS_COMPOSITE_READ = 3; - public static final char TS_CRC_CHECK_COMMAND = 'k'; - public static final char TS_EXECUTE = 'E'; - public static final int TS_FILE_VERSION = 20210312; - public static final int TS_FILE_VERSION_OFFSET = 124; - public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; - public static final char TS_GET_CONFIG_ERROR = 'e'; - public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_OUTPUTS_SIZE = '4'; - public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; - public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; - public static final char TS_GET_TEXT = 'G'; - public static final char TS_HELLO_COMMAND = 'S'; - public static final char TS_IO_TEST_COMMAND = 'Z'; - public static final char TS_ONLINE_PROTOCOL = 'z'; - public static final char TS_OUTPUT_COMMAND = 'O'; - public static final char TS_PAGE_COMMAND = 'P'; - public static final char TS_PERF_TRACE_BEGIN = '_'; - public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; - public static final String TS_PROTOCOL = "001"; - public static final char TS_QUERY_COMMAND = 'Q'; - public static final char TS_READ_COMMAND = 'R'; - public static final int TS_RESPONSE_BURN_OK = 4; - public static final int TS_RESPONSE_COMMAND_OK = 7; - public static final int TS_RESPONSE_CRC_FAILURE = 0x82; - public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; - public static final int TS_RESPONSE_OK = 0; - public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; - 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 char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final char TS_TEST_COMMAND = 't'; - public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; - public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; - public static final int TS_TRIGGER_SCOPE_DISABLE = 5; - public static final int TS_TRIGGER_SCOPE_ENABLE = 4; - public static final int TS_TRIGGER_SCOPE_READ = 6; - public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; - public static final int VEHICLE_INFO_SIZE = 32; - public static final int VIN_NUMBER_SIZE = 17; - public static final int VR_THRESHOLD_COUNT = 2; - public static final int VSS_FILTER_MAX = 200; - public static final int VSS_FILTER_MIN = 3; - public static final int WARNING_BUFFER_SIZE = 120; - public static final int WWAE_TABLE_SIZE = 8; public static final Field ISTPSINVALID = Field.create("ISTPSINVALID", 0, FieldType.BIT, 0).setBaseOffset(948); public static final Field M_SHOULDRESETPID = Field.create("M_SHOULDRESETPID", 0, FieldType.BIT, 1).setBaseOffset(948); public static final Field ISBELOWCLOSEDLOOPTHRESHOLD = Field.create("ISBELOWCLOSEDLOOPTHRESHOLD", 0, FieldType.BIT, 2).setBaseOffset(948); diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java index 624b55e40c..b7b654c409 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java @@ -1,114 +1,21 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/dc_motors.txt Sat Apr 29 01:39:32 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/dc_motors.txt Sat Apr 29 21:01:06 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class DcMotors { - public static final int ADC_CHANNEL_NONE = 0; - public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; - public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; - public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; - public static final int AUX_DIGITAL_VALVE_COUNT = 2; public static final int BANKS_COUNT = 2; - public static final int BARO_CORR_SIZE = 4; - public static final int BLOCKING_FACTOR = 750; - public static final int BOOST_LOAD_COUNT = 8; - public static final int BOOST_RPM_COUNT = 8; public static final int CAM_INPUTS_COUNT = 4; public static final int CAMS_PER_BANK = 2; - public static final int CAN_DEFAULT_BASE = 0x200; - public static final int CAN_ECU_HW_META = 0xAB1234; - public static final int CAN_ECU_SERIAL_RX_ID = 0x100; - public static final int CAN_ECU_SERIAL_TX_ID = 0x102; - public static final String CAN_RX_PREFIX = "CAN_rx"; - public static final int CLT_CRANKING_CURVE_SIZE = 8; - public static final int CLT_CURVE_SIZE = 16; - public static final int CLT_LIMITER_CURVE_SIZE = 4; - public static final int CLT_TIMING_CURVE_SIZE = 8; - public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; - public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; - public static final String CMD_BOOST_PIN = "set_boost_pin"; - public static final String CMD_BURNCONFIG = "burnconfig"; - public static final String CMD_DATE = "date"; - public static final String CMD_DISABLE = "disable"; - public static final String CMD_ECU_UNLOCK = "unlock"; - public static final String CMD_ENABLE = "enable"; - public static final String CMD_ENGINE_TYPE = "engine_type"; - public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; - public static final String CMD_ETB_DUTY = "set_etb_duty"; - public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; - public static final String CMD_FAN2_BENCH = "fan2bench"; - public static final String CMD_FAN_BENCH = "fanbench"; - public static final String CMD_FUEL_BENCH = "fuelbench"; - public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; - public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; - public static final String CMD_GET = "get"; - public static final String CMD_HPFP_BENCH = "hpfpbench"; - public static final String CMD_IDLE_BENCH = "idlebench"; - public static final String CMD_IDLE_PIN = "set_idle_pin"; - public static final String CMD_IGNITION = "ignition"; - public static final String CMD_IGNITION_PIN = "set_ignition_pin"; - public static final String CMD_INJECTION = "injection"; - public static final String CMD_INJECTION_PIN = "set_injection_pin"; - public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; - public static final String CMD_MIL_BENCH = "milbench"; - public static final String CMD_PINS = "pins"; - public static final String CMD_PWM = "pwm"; - public static final String CMD_REBOOT = "reboot"; - public static final String CMD_REBOOT_DFU = "reboot_dfu"; - public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; - public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; - public static final String CMD_RPM = "rpm"; - public static final String CMD_SELF_STIMULATION = "self_stimulation"; - public static final String CMD_SET = "set"; - public static final String CMD_SPARK_BENCH = "sparkbench"; - public static final String CMD_STARTER_BENCH = "starterbench"; - public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; - public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; - public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; - public static final String CMD_TRIGGERINFO = "triggerinfo"; - public static final String CMD_VSS_PIN = "vss_pin"; - public static final String CMD_WRITECONFIG = "writeconfig"; - public static final int COMPOSITE_PACKET_SIZE = 5; - public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; - public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; - public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; - public static final int CRANKING_CURVE_SIZE = 8; - public static final int CRITICAL_BUFFER_SIZE = 120; - public static final String CRITICAL_PREFIX = "CRITICAL"; - public static final int DC_PER_STEPPER = 2; - public static final int DIGIPOT_COUNT = 4; - public static final int DWELL_CURVE_SIZE = 8; public static final int EGT_CHANNEL_COUNT = 8; - public static final String ENGINE_MAKE_BMW = "BMW"; - public static final String ENGINE_MAKE_GM = "GM"; - public static final String ENGINE_MAKE_HONDA = "Honda"; - public static final String ENGINE_MAKE_Hyundai = "Hyundai"; - public static final String ENGINE_MAKE_LADA = "Lada"; - public static final String ENGINE_MAKE_MAZDA = "Mazda"; - public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; - public static final String ENGINE_MAKE_NISSAN = "Nissan"; - public static final String ENGINE_MAKE_SUBARU = "Subaru"; - public static final String ENGINE_MAKE_TOYOTA = "Toyota"; - public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 16; - public static final int ENGINE_SNIFFER_UNIT_US = 10; - public static final int ETB_BIAS_CURVE_LENGTH = 8; - public static final int ETB_COUNT = 2; - public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10021; - public static final int FUEL_LEVEL_TABLE_COUNT = 8; - public static final int FUEL_LOAD_COUNT = 16; - public static final int FUEL_RPM_COUNT = 16; - public static final int GAP_TRACKING_LENGTH = 18; public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_ETB = "ETB more"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_SYNC = "Sync"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; - public static final String GAUGE_COIL_DWELL_TIME = "Ignition: coil charge time"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -147,7 +54,7 @@ public class DcMotors { public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; - public static final String GAUGE_NAME_DWELL_DUTY = "Ignition: coil duty cycle"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; @@ -164,7 +71,7 @@ public class DcMotors { public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; - public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last Inj Pulsewidth"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; @@ -184,7 +91,7 @@ public class DcMotors { public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_IAT = "IAT"; public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; - public static final String GAUGE_NAME_IGNITION_LOAD = "Ignition: load"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; @@ -218,11 +125,11 @@ public class DcMotors { public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; - public static final String GAUGE_NAME_TIMING_ADVANCE = "Timing: base ignition"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; public static final String GAUGE_NAME_TPS2 = "TPS2"; public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; - public static final String GAUGE_NAME_TRG_GAP = "Sync: Trigger Latest Ratio"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; public static final String GAUGE_NAME_UPTIME = "Uptime"; @@ -242,44 +149,14 @@ public class DcMotors { public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; public static final int GEARS_COUNT = 8; - public static final int GPPWM_CHANNELS = 4; - public static final int GPPWM_LOAD_COUNT = 8; - public static final int GPPWM_NOTE_SIZE = 16; - public static final int GPPWM_RPM_COUNT = 8; - public static final int HIGH_SPEED_COUNT = 32; - public static final int HPFP_COMPENSATION_SIZE = 10; - public static final int HPFP_DEADTIME_SIZE = 8; - public static final int HPFP_LOBE_PROFILE_SIZE = 16; - public static final int HPFP_TARGET_SIZE = 10; - public static final int HW_MAX_ADC_INDEX = 17; - public static final int IAC_PID_MULT_SIZE = 8; - public static final int IAT_CURVE_SIZE = 16; - public static final int IDLE_ADVANCE_CURVE_SIZE = 8; - public static final int IDLE_VE_SIZE = 4; public static final int IGN_BLEND_COUNT = 4; - public static final int IGN_LOAD_COUNT = 16; - public static final int IGN_RPM_COUNT = 16; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; - public static final String LOG_DELIMITER = "`"; - public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; public static final int LUA_ANALOG_INPUT_COUNT = 8; - public static final int LUA_DIGITAL_INPUT_COUNT = 8; public static final int LUA_GAUGE_COUNT = 2; - public static final int LUA_PWM_COUNT = 8; - public static final int LUA_SCRIPT_SIZE = 8000; - public static final int MAF_DECODING_COUNT = 256; - public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; - public static final int MAP_ANGLE_SIZE = 8; - public static final int MAP_WINDOW_SIZE = 8; public static final int MAX_CYLINDER_COUNT = 12; - public static final int MLQ_FIELD_HEADER_SIZE = 89; - public static final int MLQ_HEADER_SIZE = 24; - public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; - public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; - public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_AFR_CFG = 10; @@ -296,119 +173,8 @@ public class DcMotors { public static final int PACK_MULT_TEMPERATURE = 100; public static final int PACK_MULT_VOLTAGE = 1000; public static final int PACK_MULT_VSS = 100; - public static final int PEDAL_TO_TPS_SIZE = 8; - public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; - public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; - public static final String PROTOCOL_CRANK1 = "t1"; - public static final String PROTOCOL_CRANK2 = "t2"; - public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; - public static final String PROTOCOL_ES_DOWN = "d"; - public static final String PROTOCOL_ES_UP = "u"; - public static final String PROTOCOL_HELLO_PREFIX = "***"; - public static final String PROTOCOL_HIP_NAME = "HIP"; - public static final String PROTOCOL_HPFP_NAME = "hpfp"; - public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; - public static final String PROTOCOL_MSG = "msg"; - public static final String PROTOCOL_OUTPIN = "outpin"; - public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; - public static final String PROTOCOL_TACH_NAME = "tach"; - public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; - public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; - public static final String PROTOCOL_VVT1_NAME = "VVT1"; - public static final String PROTOCOL_VVT2_NAME = "VVT2"; - public static final String PROTOCOL_VVT3_NAME = "VVT3"; - public static final String PROTOCOL_VVT4_NAME = "VVT4"; - public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; - public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; - public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; - public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; - public static final int SCRIPT_CURVE_16 = 16; - public static final int SCRIPT_CURVE_8 = 8; - public static final int SCRIPT_CURVE_COUNT = 6; - public static final int SCRIPT_SETTING_COUNT = 8; - public static final int SCRIPT_TABLE_8 = 8; - public static final int SCRIPT_TABLE_COUNT = 4; - public static final int SENT_INPUT_COUNT = 1; - public static final int STFT_BANK_COUNT = 2; - public static final int STFT_CELL_COUNT = 4; - public static final int TCU_GEAR_COUNT = 10; - public static final int TCU_MAGIC_SIZE = 8; - public static final int TCU_SOLENOID_COUNT = 6; - public static final int TOOTH_DATA_LENGTH = 2000; - public static final int TOOTH_PACKET_COUNT = 1000; - public static final int TOOTH_PACKET_SIZE = 2; - public static final String TOP_DEAD_CENTER_MESSAGE = "r"; - public static final int TORQUE_CURVE_SIZE = 6; public static final int TPS_2_BYTE_PACKING_MULT = 100; - public static final int TPS_TPS_ACCEL_CLT_CORR_TABLE = 4; - public static final int TPS_TPS_ACCEL_TABLE = 8; - public static final String TRIGGER_COMMENT = "#"; - public static final String TRIGGER_CYCLE_DURATION = "cycleDuration"; - public static final String TRIGGER_GAP_FROM = "gapFrom"; - public static final String TRIGGER_GAP_TO = "gapTo"; - public static final String TRIGGER_GAPS_COUNT = "gapsCount"; - public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; - public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; - public static final int TRIGGER_INPUT_PIN_COUNT = 2; - public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; - public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; - public static final String TRIGGER_WITH_SYNC = "isSynchronizationNeeded"; - public static final String TRIGGERS_FILE_NAME = "triggers.txt"; - public static final int TRIM_SIZE = 4; - public static final int TS_BLOCK_READ_TIMEOUT = 3000; - public static final char TS_BURN_COMMAND = 'B'; - public static final char TS_CHUNK_WRITE_COMMAND = 'C'; - public static final char TS_COMMAND_F = 'F'; - public static final int TS_COMPOSITE_DISABLE = 2; - public static final int TS_COMPOSITE_ENABLE = 1; - public static final int TS_COMPOSITE_READ = 3; - public static final char TS_CRC_CHECK_COMMAND = 'k'; - public static final char TS_EXECUTE = 'E'; - public static final int TS_FILE_VERSION = 20210312; - public static final int TS_FILE_VERSION_OFFSET = 124; - public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; - public static final char TS_GET_CONFIG_ERROR = 'e'; - public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_OUTPUTS_SIZE = '4'; - public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; - public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; - public static final char TS_GET_TEXT = 'G'; - public static final char TS_HELLO_COMMAND = 'S'; - public static final char TS_IO_TEST_COMMAND = 'Z'; - public static final char TS_ONLINE_PROTOCOL = 'z'; - public static final char TS_OUTPUT_COMMAND = 'O'; - public static final char TS_PAGE_COMMAND = 'P'; - public static final char TS_PERF_TRACE_BEGIN = '_'; - public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; - public static final String TS_PROTOCOL = "001"; - public static final char TS_QUERY_COMMAND = 'Q'; - public static final char TS_READ_COMMAND = 'R'; - public static final int TS_RESPONSE_BURN_OK = 4; - public static final int TS_RESPONSE_COMMAND_OK = 7; - public static final int TS_RESPONSE_CRC_FAILURE = 0x82; - public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; - public static final int TS_RESPONSE_OK = 0; - public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; - 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 char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final char TS_TEST_COMMAND = 't'; - public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; - public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; - public static final int TS_TRIGGER_SCOPE_DISABLE = 5; - public static final int TS_TRIGGER_SCOPE_ENABLE = 4; - public static final int TS_TRIGGER_SCOPE_READ = 6; - public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; - public static final int VEHICLE_INFO_SIZE = 32; - public static final int VIN_NUMBER_SIZE = 17; - public static final int VR_THRESHOLD_COUNT = 2; - public static final int VSS_FILTER_MAX = 200; - public static final int VSS_FILTER_MIN = 3; - public static final int WARNING_BUFFER_SIZE = 120; - public static final int WWAE_TABLE_SIZE = 8; public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1356); public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1356); public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1356); diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java index bdffac43ff..29935ac78d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java @@ -1,114 +1,21 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Sat Apr 29 01:39:32 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Sat Apr 29 21:01:06 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class ElectronicThrottle { - public static final int ADC_CHANNEL_NONE = 0; - public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; - public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; - public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; - public static final int AUX_DIGITAL_VALVE_COUNT = 2; public static final int BANKS_COUNT = 2; - public static final int BARO_CORR_SIZE = 4; - public static final int BLOCKING_FACTOR = 750; - public static final int BOOST_LOAD_COUNT = 8; - public static final int BOOST_RPM_COUNT = 8; public static final int CAM_INPUTS_COUNT = 4; public static final int CAMS_PER_BANK = 2; - public static final int CAN_DEFAULT_BASE = 0x200; - public static final int CAN_ECU_HW_META = 0xAB1234; - public static final int CAN_ECU_SERIAL_RX_ID = 0x100; - public static final int CAN_ECU_SERIAL_TX_ID = 0x102; - public static final String CAN_RX_PREFIX = "CAN_rx"; - public static final int CLT_CRANKING_CURVE_SIZE = 8; - public static final int CLT_CURVE_SIZE = 16; - public static final int CLT_LIMITER_CURVE_SIZE = 4; - public static final int CLT_TIMING_CURVE_SIZE = 8; - public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; - public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; - public static final String CMD_BOOST_PIN = "set_boost_pin"; - public static final String CMD_BURNCONFIG = "burnconfig"; - public static final String CMD_DATE = "date"; - public static final String CMD_DISABLE = "disable"; - public static final String CMD_ECU_UNLOCK = "unlock"; - public static final String CMD_ENABLE = "enable"; - public static final String CMD_ENGINE_TYPE = "engine_type"; - public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; - public static final String CMD_ETB_DUTY = "set_etb_duty"; - public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; - public static final String CMD_FAN2_BENCH = "fan2bench"; - public static final String CMD_FAN_BENCH = "fanbench"; - public static final String CMD_FUEL_BENCH = "fuelbench"; - public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; - public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; - public static final String CMD_GET = "get"; - public static final String CMD_HPFP_BENCH = "hpfpbench"; - public static final String CMD_IDLE_BENCH = "idlebench"; - public static final String CMD_IDLE_PIN = "set_idle_pin"; - public static final String CMD_IGNITION = "ignition"; - public static final String CMD_IGNITION_PIN = "set_ignition_pin"; - public static final String CMD_INJECTION = "injection"; - public static final String CMD_INJECTION_PIN = "set_injection_pin"; - public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; - public static final String CMD_MIL_BENCH = "milbench"; - public static final String CMD_PINS = "pins"; - public static final String CMD_PWM = "pwm"; - public static final String CMD_REBOOT = "reboot"; - public static final String CMD_REBOOT_DFU = "reboot_dfu"; - public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; - public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; - public static final String CMD_RPM = "rpm"; - public static final String CMD_SELF_STIMULATION = "self_stimulation"; - public static final String CMD_SET = "set"; - public static final String CMD_SPARK_BENCH = "sparkbench"; - public static final String CMD_STARTER_BENCH = "starterbench"; - public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; - public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; - public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; - public static final String CMD_TRIGGERINFO = "triggerinfo"; - public static final String CMD_VSS_PIN = "vss_pin"; - public static final String CMD_WRITECONFIG = "writeconfig"; - public static final int COMPOSITE_PACKET_SIZE = 5; - public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; - public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; - public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; - public static final int CRANKING_CURVE_SIZE = 8; - public static final int CRITICAL_BUFFER_SIZE = 120; - public static final String CRITICAL_PREFIX = "CRITICAL"; - public static final int DC_PER_STEPPER = 2; - public static final int DIGIPOT_COUNT = 4; - public static final int DWELL_CURVE_SIZE = 8; public static final int EGT_CHANNEL_COUNT = 8; - public static final String ENGINE_MAKE_BMW = "BMW"; - public static final String ENGINE_MAKE_GM = "GM"; - public static final String ENGINE_MAKE_HONDA = "Honda"; - public static final String ENGINE_MAKE_Hyundai = "Hyundai"; - public static final String ENGINE_MAKE_LADA = "Lada"; - public static final String ENGINE_MAKE_MAZDA = "Mazda"; - public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; - public static final String ENGINE_MAKE_NISSAN = "Nissan"; - public static final String ENGINE_MAKE_SUBARU = "Subaru"; - public static final String ENGINE_MAKE_TOYOTA = "Toyota"; - public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 16; - public static final int ENGINE_SNIFFER_UNIT_US = 10; - public static final int ETB_BIAS_CURVE_LENGTH = 8; - public static final int ETB_COUNT = 2; - public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10021; - public static final int FUEL_LEVEL_TABLE_COUNT = 8; - public static final int FUEL_LOAD_COUNT = 16; - public static final int FUEL_RPM_COUNT = 16; - public static final int GAP_TRACKING_LENGTH = 18; public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_ETB = "ETB more"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_SYNC = "Sync"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; - public static final String GAUGE_COIL_DWELL_TIME = "Ignition: coil charge time"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -147,7 +54,7 @@ public class ElectronicThrottle { public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; - public static final String GAUGE_NAME_DWELL_DUTY = "Ignition: coil duty cycle"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; @@ -164,7 +71,7 @@ public class ElectronicThrottle { public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; - public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last Inj Pulsewidth"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; @@ -184,7 +91,7 @@ public class ElectronicThrottle { public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_IAT = "IAT"; public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; - public static final String GAUGE_NAME_IGNITION_LOAD = "Ignition: load"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; @@ -218,11 +125,11 @@ public class ElectronicThrottle { public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; - public static final String GAUGE_NAME_TIMING_ADVANCE = "Timing: base ignition"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; public static final String GAUGE_NAME_TPS2 = "TPS2"; public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; - public static final String GAUGE_NAME_TRG_GAP = "Sync: Trigger Latest Ratio"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; public static final String GAUGE_NAME_UPTIME = "Uptime"; @@ -242,44 +149,14 @@ public class ElectronicThrottle { public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; public static final int GEARS_COUNT = 8; - public static final int GPPWM_CHANNELS = 4; - public static final int GPPWM_LOAD_COUNT = 8; - public static final int GPPWM_NOTE_SIZE = 16; - public static final int GPPWM_RPM_COUNT = 8; - public static final int HIGH_SPEED_COUNT = 32; - public static final int HPFP_COMPENSATION_SIZE = 10; - public static final int HPFP_DEADTIME_SIZE = 8; - public static final int HPFP_LOBE_PROFILE_SIZE = 16; - public static final int HPFP_TARGET_SIZE = 10; - public static final int HW_MAX_ADC_INDEX = 17; - public static final int IAC_PID_MULT_SIZE = 8; - public static final int IAT_CURVE_SIZE = 16; - public static final int IDLE_ADVANCE_CURVE_SIZE = 8; - public static final int IDLE_VE_SIZE = 4; public static final int IGN_BLEND_COUNT = 4; - public static final int IGN_LOAD_COUNT = 16; - public static final int IGN_RPM_COUNT = 16; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; - public static final String LOG_DELIMITER = "`"; - public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; public static final int LUA_ANALOG_INPUT_COUNT = 8; - public static final int LUA_DIGITAL_INPUT_COUNT = 8; public static final int LUA_GAUGE_COUNT = 2; - public static final int LUA_PWM_COUNT = 8; - public static final int LUA_SCRIPT_SIZE = 8000; - public static final int MAF_DECODING_COUNT = 256; - public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; - public static final int MAP_ANGLE_SIZE = 8; - public static final int MAP_WINDOW_SIZE = 8; public static final int MAX_CYLINDER_COUNT = 12; - public static final int MLQ_FIELD_HEADER_SIZE = 89; - public static final int MLQ_HEADER_SIZE = 24; - public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; - public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; - public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_AFR_CFG = 10; @@ -296,119 +173,8 @@ public class ElectronicThrottle { public static final int PACK_MULT_TEMPERATURE = 100; public static final int PACK_MULT_VOLTAGE = 1000; public static final int PACK_MULT_VSS = 100; - public static final int PEDAL_TO_TPS_SIZE = 8; - public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; - public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; - public static final String PROTOCOL_CRANK1 = "t1"; - public static final String PROTOCOL_CRANK2 = "t2"; - public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; - public static final String PROTOCOL_ES_DOWN = "d"; - public static final String PROTOCOL_ES_UP = "u"; - public static final String PROTOCOL_HELLO_PREFIX = "***"; - public static final String PROTOCOL_HIP_NAME = "HIP"; - public static final String PROTOCOL_HPFP_NAME = "hpfp"; - public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; - public static final String PROTOCOL_MSG = "msg"; - public static final String PROTOCOL_OUTPIN = "outpin"; - public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; - public static final String PROTOCOL_TACH_NAME = "tach"; - public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; - public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; - public static final String PROTOCOL_VVT1_NAME = "VVT1"; - public static final String PROTOCOL_VVT2_NAME = "VVT2"; - public static final String PROTOCOL_VVT3_NAME = "VVT3"; - public static final String PROTOCOL_VVT4_NAME = "VVT4"; - public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; - public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; - public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; - public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; - public static final int SCRIPT_CURVE_16 = 16; - public static final int SCRIPT_CURVE_8 = 8; - public static final int SCRIPT_CURVE_COUNT = 6; - public static final int SCRIPT_SETTING_COUNT = 8; - public static final int SCRIPT_TABLE_8 = 8; - public static final int SCRIPT_TABLE_COUNT = 4; - public static final int SENT_INPUT_COUNT = 1; - public static final int STFT_BANK_COUNT = 2; - public static final int STFT_CELL_COUNT = 4; - public static final int TCU_GEAR_COUNT = 10; - public static final int TCU_MAGIC_SIZE = 8; - public static final int TCU_SOLENOID_COUNT = 6; - public static final int TOOTH_DATA_LENGTH = 2000; - public static final int TOOTH_PACKET_COUNT = 1000; - public static final int TOOTH_PACKET_SIZE = 2; - public static final String TOP_DEAD_CENTER_MESSAGE = "r"; - public static final int TORQUE_CURVE_SIZE = 6; public static final int TPS_2_BYTE_PACKING_MULT = 100; - public static final int TPS_TPS_ACCEL_CLT_CORR_TABLE = 4; - public static final int TPS_TPS_ACCEL_TABLE = 8; - public static final String TRIGGER_COMMENT = "#"; - public static final String TRIGGER_CYCLE_DURATION = "cycleDuration"; - public static final String TRIGGER_GAP_FROM = "gapFrom"; - public static final String TRIGGER_GAP_TO = "gapTo"; - public static final String TRIGGER_GAPS_COUNT = "gapsCount"; - public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; - public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; - public static final int TRIGGER_INPUT_PIN_COUNT = 2; - public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; - public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; - public static final String TRIGGER_WITH_SYNC = "isSynchronizationNeeded"; - public static final String TRIGGERS_FILE_NAME = "triggers.txt"; - public static final int TRIM_SIZE = 4; - public static final int TS_BLOCK_READ_TIMEOUT = 3000; - public static final char TS_BURN_COMMAND = 'B'; - public static final char TS_CHUNK_WRITE_COMMAND = 'C'; - public static final char TS_COMMAND_F = 'F'; - public static final int TS_COMPOSITE_DISABLE = 2; - public static final int TS_COMPOSITE_ENABLE = 1; - public static final int TS_COMPOSITE_READ = 3; - public static final char TS_CRC_CHECK_COMMAND = 'k'; - public static final char TS_EXECUTE = 'E'; - public static final int TS_FILE_VERSION = 20210312; - public static final int TS_FILE_VERSION_OFFSET = 124; - public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; - public static final char TS_GET_CONFIG_ERROR = 'e'; - public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_OUTPUTS_SIZE = '4'; - public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; - public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; - public static final char TS_GET_TEXT = 'G'; - public static final char TS_HELLO_COMMAND = 'S'; - public static final char TS_IO_TEST_COMMAND = 'Z'; - public static final char TS_ONLINE_PROTOCOL = 'z'; - public static final char TS_OUTPUT_COMMAND = 'O'; - public static final char TS_PAGE_COMMAND = 'P'; - public static final char TS_PERF_TRACE_BEGIN = '_'; - public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; - public static final String TS_PROTOCOL = "001"; - public static final char TS_QUERY_COMMAND = 'Q'; - public static final char TS_READ_COMMAND = 'R'; - public static final int TS_RESPONSE_BURN_OK = 4; - public static final int TS_RESPONSE_COMMAND_OK = 7; - public static final int TS_RESPONSE_CRC_FAILURE = 0x82; - public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; - public static final int TS_RESPONSE_OK = 0; - public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; - 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 char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final char TS_TEST_COMMAND = 't'; - public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; - public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; - public static final int TS_TRIGGER_SCOPE_DISABLE = 5; - public static final int TS_TRIGGER_SCOPE_ENABLE = 4; - public static final int TS_TRIGGER_SCOPE_READ = 6; - public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; - public static final int VEHICLE_INFO_SIZE = 32; - public static final int VIN_NUMBER_SIZE = 17; - public static final int VR_THRESHOLD_COUNT = 2; - public static final int VSS_FILTER_MAX = 200; - public static final int VSS_FILTER_MIN = 3; - public static final int WARNING_BUFFER_SIZE = 120; - public static final int WWAE_TABLE_SIZE = 8; public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1292); public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1292); public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1292); diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index 00139edf63..dad40ad57f 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,114 +1,21 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sat Apr 29 01:39:32 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sat Apr 29 21:01:06 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class EngineState { - public static final int ADC_CHANNEL_NONE = 0; - public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; - public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; - public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; - public static final int AUX_DIGITAL_VALVE_COUNT = 2; public static final int BANKS_COUNT = 2; - public static final int BARO_CORR_SIZE = 4; - public static final int BLOCKING_FACTOR = 750; - public static final int BOOST_LOAD_COUNT = 8; - public static final int BOOST_RPM_COUNT = 8; public static final int CAM_INPUTS_COUNT = 4; public static final int CAMS_PER_BANK = 2; - public static final int CAN_DEFAULT_BASE = 0x200; - public static final int CAN_ECU_HW_META = 0xAB1234; - public static final int CAN_ECU_SERIAL_RX_ID = 0x100; - public static final int CAN_ECU_SERIAL_TX_ID = 0x102; - public static final String CAN_RX_PREFIX = "CAN_rx"; - public static final int CLT_CRANKING_CURVE_SIZE = 8; - public static final int CLT_CURVE_SIZE = 16; - public static final int CLT_LIMITER_CURVE_SIZE = 4; - public static final int CLT_TIMING_CURVE_SIZE = 8; - public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; - public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; - public static final String CMD_BOOST_PIN = "set_boost_pin"; - public static final String CMD_BURNCONFIG = "burnconfig"; - public static final String CMD_DATE = "date"; - public static final String CMD_DISABLE = "disable"; - public static final String CMD_ECU_UNLOCK = "unlock"; - public static final String CMD_ENABLE = "enable"; - public static final String CMD_ENGINE_TYPE = "engine_type"; - public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; - public static final String CMD_ETB_DUTY = "set_etb_duty"; - public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; - public static final String CMD_FAN2_BENCH = "fan2bench"; - public static final String CMD_FAN_BENCH = "fanbench"; - public static final String CMD_FUEL_BENCH = "fuelbench"; - public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; - public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; - public static final String CMD_GET = "get"; - public static final String CMD_HPFP_BENCH = "hpfpbench"; - public static final String CMD_IDLE_BENCH = "idlebench"; - public static final String CMD_IDLE_PIN = "set_idle_pin"; - public static final String CMD_IGNITION = "ignition"; - public static final String CMD_IGNITION_PIN = "set_ignition_pin"; - public static final String CMD_INJECTION = "injection"; - public static final String CMD_INJECTION_PIN = "set_injection_pin"; - public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; - public static final String CMD_MIL_BENCH = "milbench"; - public static final String CMD_PINS = "pins"; - public static final String CMD_PWM = "pwm"; - public static final String CMD_REBOOT = "reboot"; - public static final String CMD_REBOOT_DFU = "reboot_dfu"; - public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; - public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; - public static final String CMD_RPM = "rpm"; - public static final String CMD_SELF_STIMULATION = "self_stimulation"; - public static final String CMD_SET = "set"; - public static final String CMD_SPARK_BENCH = "sparkbench"; - public static final String CMD_STARTER_BENCH = "starterbench"; - public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; - public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; - public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; - public static final String CMD_TRIGGERINFO = "triggerinfo"; - public static final String CMD_VSS_PIN = "vss_pin"; - public static final String CMD_WRITECONFIG = "writeconfig"; - public static final int COMPOSITE_PACKET_SIZE = 5; - public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; - public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; - public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; - public static final int CRANKING_CURVE_SIZE = 8; - public static final int CRITICAL_BUFFER_SIZE = 120; - public static final String CRITICAL_PREFIX = "CRITICAL"; - public static final int DC_PER_STEPPER = 2; - public static final int DIGIPOT_COUNT = 4; - public static final int DWELL_CURVE_SIZE = 8; public static final int EGT_CHANNEL_COUNT = 8; - public static final String ENGINE_MAKE_BMW = "BMW"; - public static final String ENGINE_MAKE_GM = "GM"; - public static final String ENGINE_MAKE_HONDA = "Honda"; - public static final String ENGINE_MAKE_Hyundai = "Hyundai"; - public static final String ENGINE_MAKE_LADA = "Lada"; - public static final String ENGINE_MAKE_MAZDA = "Mazda"; - public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; - public static final String ENGINE_MAKE_NISSAN = "Nissan"; - public static final String ENGINE_MAKE_SUBARU = "Subaru"; - public static final String ENGINE_MAKE_TOYOTA = "Toyota"; - public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 16; - public static final int ENGINE_SNIFFER_UNIT_US = 10; - public static final int ETB_BIAS_CURVE_LENGTH = 8; - public static final int ETB_COUNT = 2; - public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10021; - public static final int FUEL_LEVEL_TABLE_COUNT = 8; - public static final int FUEL_LOAD_COUNT = 16; - public static final int FUEL_RPM_COUNT = 16; - public static final int GAP_TRACKING_LENGTH = 18; public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_ETB = "ETB more"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_SYNC = "Sync"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; - public static final String GAUGE_COIL_DWELL_TIME = "Ignition: coil charge time"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -147,7 +54,7 @@ public class EngineState { public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; - public static final String GAUGE_NAME_DWELL_DUTY = "Ignition: coil duty cycle"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; @@ -164,7 +71,7 @@ public class EngineState { public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; - public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last Inj Pulsewidth"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; @@ -184,7 +91,7 @@ public class EngineState { public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_IAT = "IAT"; public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; - public static final String GAUGE_NAME_IGNITION_LOAD = "Ignition: load"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; @@ -218,11 +125,11 @@ public class EngineState { public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; - public static final String GAUGE_NAME_TIMING_ADVANCE = "Timing: base ignition"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; public static final String GAUGE_NAME_TPS2 = "TPS2"; public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; - public static final String GAUGE_NAME_TRG_GAP = "Sync: Trigger Latest Ratio"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; public static final String GAUGE_NAME_UPTIME = "Uptime"; @@ -242,44 +149,14 @@ public class EngineState { public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; public static final int GEARS_COUNT = 8; - public static final int GPPWM_CHANNELS = 4; - public static final int GPPWM_LOAD_COUNT = 8; - public static final int GPPWM_NOTE_SIZE = 16; - public static final int GPPWM_RPM_COUNT = 8; - public static final int HIGH_SPEED_COUNT = 32; - public static final int HPFP_COMPENSATION_SIZE = 10; - public static final int HPFP_DEADTIME_SIZE = 8; - public static final int HPFP_LOBE_PROFILE_SIZE = 16; - public static final int HPFP_TARGET_SIZE = 10; - public static final int HW_MAX_ADC_INDEX = 17; - public static final int IAC_PID_MULT_SIZE = 8; - public static final int IAT_CURVE_SIZE = 16; - public static final int IDLE_ADVANCE_CURVE_SIZE = 8; - public static final int IDLE_VE_SIZE = 4; public static final int IGN_BLEND_COUNT = 4; - public static final int IGN_LOAD_COUNT = 16; - public static final int IGN_RPM_COUNT = 16; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; - public static final String LOG_DELIMITER = "`"; - public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; public static final int LUA_ANALOG_INPUT_COUNT = 8; - public static final int LUA_DIGITAL_INPUT_COUNT = 8; public static final int LUA_GAUGE_COUNT = 2; - public static final int LUA_PWM_COUNT = 8; - public static final int LUA_SCRIPT_SIZE = 8000; - public static final int MAF_DECODING_COUNT = 256; - public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; - public static final int MAP_ANGLE_SIZE = 8; - public static final int MAP_WINDOW_SIZE = 8; public static final int MAX_CYLINDER_COUNT = 12; - public static final int MLQ_FIELD_HEADER_SIZE = 89; - public static final int MLQ_HEADER_SIZE = 24; - public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; - public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; - public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_AFR_CFG = 10; @@ -296,119 +173,8 @@ public class EngineState { public static final int PACK_MULT_TEMPERATURE = 100; public static final int PACK_MULT_VOLTAGE = 1000; public static final int PACK_MULT_VSS = 100; - public static final int PEDAL_TO_TPS_SIZE = 8; - public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; - public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; - public static final String PROTOCOL_CRANK1 = "t1"; - public static final String PROTOCOL_CRANK2 = "t2"; - public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; - public static final String PROTOCOL_ES_DOWN = "d"; - public static final String PROTOCOL_ES_UP = "u"; - public static final String PROTOCOL_HELLO_PREFIX = "***"; - public static final String PROTOCOL_HIP_NAME = "HIP"; - public static final String PROTOCOL_HPFP_NAME = "hpfp"; - public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; - public static final String PROTOCOL_MSG = "msg"; - public static final String PROTOCOL_OUTPIN = "outpin"; - public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; - public static final String PROTOCOL_TACH_NAME = "tach"; - public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; - public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; - public static final String PROTOCOL_VVT1_NAME = "VVT1"; - public static final String PROTOCOL_VVT2_NAME = "VVT2"; - public static final String PROTOCOL_VVT3_NAME = "VVT3"; - public static final String PROTOCOL_VVT4_NAME = "VVT4"; - public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; - public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; - public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; - public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; - public static final int SCRIPT_CURVE_16 = 16; - public static final int SCRIPT_CURVE_8 = 8; - public static final int SCRIPT_CURVE_COUNT = 6; - public static final int SCRIPT_SETTING_COUNT = 8; - public static final int SCRIPT_TABLE_8 = 8; - public static final int SCRIPT_TABLE_COUNT = 4; - public static final int SENT_INPUT_COUNT = 1; - public static final int STFT_BANK_COUNT = 2; - public static final int STFT_CELL_COUNT = 4; - public static final int TCU_GEAR_COUNT = 10; - public static final int TCU_MAGIC_SIZE = 8; - public static final int TCU_SOLENOID_COUNT = 6; - public static final int TOOTH_DATA_LENGTH = 2000; - public static final int TOOTH_PACKET_COUNT = 1000; - public static final int TOOTH_PACKET_SIZE = 2; - public static final String TOP_DEAD_CENTER_MESSAGE = "r"; - public static final int TORQUE_CURVE_SIZE = 6; public static final int TPS_2_BYTE_PACKING_MULT = 100; - public static final int TPS_TPS_ACCEL_CLT_CORR_TABLE = 4; - public static final int TPS_TPS_ACCEL_TABLE = 8; - public static final String TRIGGER_COMMENT = "#"; - public static final String TRIGGER_CYCLE_DURATION = "cycleDuration"; - public static final String TRIGGER_GAP_FROM = "gapFrom"; - public static final String TRIGGER_GAP_TO = "gapTo"; - public static final String TRIGGER_GAPS_COUNT = "gapsCount"; - public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; - public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; - public static final int TRIGGER_INPUT_PIN_COUNT = 2; - public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; - public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; - public static final String TRIGGER_WITH_SYNC = "isSynchronizationNeeded"; - public static final String TRIGGERS_FILE_NAME = "triggers.txt"; - public static final int TRIM_SIZE = 4; - public static final int TS_BLOCK_READ_TIMEOUT = 3000; - public static final char TS_BURN_COMMAND = 'B'; - public static final char TS_CHUNK_WRITE_COMMAND = 'C'; - public static final char TS_COMMAND_F = 'F'; - public static final int TS_COMPOSITE_DISABLE = 2; - public static final int TS_COMPOSITE_ENABLE = 1; - public static final int TS_COMPOSITE_READ = 3; - public static final char TS_CRC_CHECK_COMMAND = 'k'; - public static final char TS_EXECUTE = 'E'; - public static final int TS_FILE_VERSION = 20210312; - public static final int TS_FILE_VERSION_OFFSET = 124; - public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; - public static final char TS_GET_CONFIG_ERROR = 'e'; - public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_OUTPUTS_SIZE = '4'; - public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; - public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; - public static final char TS_GET_TEXT = 'G'; - public static final char TS_HELLO_COMMAND = 'S'; - public static final char TS_IO_TEST_COMMAND = 'Z'; - public static final char TS_ONLINE_PROTOCOL = 'z'; - public static final char TS_OUTPUT_COMMAND = 'O'; - public static final char TS_PAGE_COMMAND = 'P'; - public static final char TS_PERF_TRACE_BEGIN = '_'; - public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; - public static final String TS_PROTOCOL = "001"; - public static final char TS_QUERY_COMMAND = 'Q'; - public static final char TS_READ_COMMAND = 'R'; - public static final int TS_RESPONSE_BURN_OK = 4; - public static final int TS_RESPONSE_COMMAND_OK = 7; - public static final int TS_RESPONSE_CRC_FAILURE = 0x82; - public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; - public static final int TS_RESPONSE_OK = 0; - public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; - 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 char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final char TS_TEST_COMMAND = 't'; - public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; - public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; - public static final int TS_TRIGGER_SCOPE_DISABLE = 5; - public static final int TS_TRIGGER_SCOPE_ENABLE = 4; - public static final int TS_TRIGGER_SCOPE_READ = 6; - public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; - public static final int VEHICLE_INFO_SIZE = 32; - public static final int VIN_NUMBER_SIZE = 17; - public static final int VR_THRESHOLD_COUNT = 2; - public static final int VSS_FILTER_MAX = 200; - public static final int VSS_FILTER_MIN = 3; - public static final int WARNING_BUFFER_SIZE = 120; - public static final int WWAE_TABLE_SIZE = 8; public static final Field LUA_FUELADD = Field.create("LUA_FUELADD", 0, FieldType.FLOAT).setBaseOffset(996); public static final Field LUA_FUELMULT = Field.create("LUA_FUELMULT", 4, FieldType.FLOAT).setBaseOffset(996); public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 8, FieldType.BIT, 0).setBaseOffset(996); 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 f5692d675e..67d4222ec6 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 Sat Apr 29 19:55:28 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 29 21:01:56 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -393,7 +393,7 @@ public class Fields { public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_SYNC = "Sync"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; - public static final String GAUGE_COIL_DWELL_TIME = "Ignition: coil charge time"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -432,7 +432,7 @@ public class Fields { public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; - public static final String GAUGE_NAME_DWELL_DUTY = "Ignition: coil duty cycle"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; @@ -449,7 +449,7 @@ public class Fields { public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; - public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last Inj Pulsewidth"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; @@ -469,7 +469,7 @@ public class Fields { public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_IAT = "IAT"; public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; - public static final String GAUGE_NAME_IGNITION_LOAD = "Ignition: load"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; @@ -503,11 +503,11 @@ public class Fields { public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; - public static final String GAUGE_NAME_TIMING_ADVANCE = "Timing: base ignition"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; public static final String GAUGE_NAME_TPS2 = "TPS2"; public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; - public static final String GAUGE_NAME_TRG_GAP = "Sync: Trigger Latest Ratio"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; public static final String GAUGE_NAME_UPTIME = "Uptime"; @@ -1010,6 +1010,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 = 336047088; public static final int spi_device_e_SPI_DEVICE_1 = 1; public static final int spi_device_e_SPI_DEVICE_2 = 2; public static final int spi_device_e_SPI_DEVICE_3 = 3; @@ -1233,7 +1234,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.2023.04.29.f407-discovery.2873326157"; + public static final String TS_SIGNATURE = "rusEFI master.2023.04.29.f407-discovery.336047088"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TS_TOTAL_OUTPUT_SIZE = 1376; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java index 6ae8498e1b..8504cef63c 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java @@ -1,114 +1,21 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Apr 29 01:39:32 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Apr 29 21:01:06 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class FuelComputer { - public static final int ADC_CHANNEL_NONE = 0; - public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; - public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; - public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; - public static final int AUX_DIGITAL_VALVE_COUNT = 2; public static final int BANKS_COUNT = 2; - public static final int BARO_CORR_SIZE = 4; - public static final int BLOCKING_FACTOR = 750; - public static final int BOOST_LOAD_COUNT = 8; - public static final int BOOST_RPM_COUNT = 8; public static final int CAM_INPUTS_COUNT = 4; public static final int CAMS_PER_BANK = 2; - public static final int CAN_DEFAULT_BASE = 0x200; - public static final int CAN_ECU_HW_META = 0xAB1234; - public static final int CAN_ECU_SERIAL_RX_ID = 0x100; - public static final int CAN_ECU_SERIAL_TX_ID = 0x102; - public static final String CAN_RX_PREFIX = "CAN_rx"; - public static final int CLT_CRANKING_CURVE_SIZE = 8; - public static final int CLT_CURVE_SIZE = 16; - public static final int CLT_LIMITER_CURVE_SIZE = 4; - public static final int CLT_TIMING_CURVE_SIZE = 8; - public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; - public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; - public static final String CMD_BOOST_PIN = "set_boost_pin"; - public static final String CMD_BURNCONFIG = "burnconfig"; - public static final String CMD_DATE = "date"; - public static final String CMD_DISABLE = "disable"; - public static final String CMD_ECU_UNLOCK = "unlock"; - public static final String CMD_ENABLE = "enable"; - public static final String CMD_ENGINE_TYPE = "engine_type"; - public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; - public static final String CMD_ETB_DUTY = "set_etb_duty"; - public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; - public static final String CMD_FAN2_BENCH = "fan2bench"; - public static final String CMD_FAN_BENCH = "fanbench"; - public static final String CMD_FUEL_BENCH = "fuelbench"; - public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; - public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; - public static final String CMD_GET = "get"; - public static final String CMD_HPFP_BENCH = "hpfpbench"; - public static final String CMD_IDLE_BENCH = "idlebench"; - public static final String CMD_IDLE_PIN = "set_idle_pin"; - public static final String CMD_IGNITION = "ignition"; - public static final String CMD_IGNITION_PIN = "set_ignition_pin"; - public static final String CMD_INJECTION = "injection"; - public static final String CMD_INJECTION_PIN = "set_injection_pin"; - public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; - public static final String CMD_MIL_BENCH = "milbench"; - public static final String CMD_PINS = "pins"; - public static final String CMD_PWM = "pwm"; - public static final String CMD_REBOOT = "reboot"; - public static final String CMD_REBOOT_DFU = "reboot_dfu"; - public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; - public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; - public static final String CMD_RPM = "rpm"; - public static final String CMD_SELF_STIMULATION = "self_stimulation"; - public static final String CMD_SET = "set"; - public static final String CMD_SPARK_BENCH = "sparkbench"; - public static final String CMD_STARTER_BENCH = "starterbench"; - public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; - public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; - public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; - public static final String CMD_TRIGGERINFO = "triggerinfo"; - public static final String CMD_VSS_PIN = "vss_pin"; - public static final String CMD_WRITECONFIG = "writeconfig"; - public static final int COMPOSITE_PACKET_SIZE = 5; - public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; - public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; - public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; - public static final int CRANKING_CURVE_SIZE = 8; - public static final int CRITICAL_BUFFER_SIZE = 120; - public static final String CRITICAL_PREFIX = "CRITICAL"; - public static final int DC_PER_STEPPER = 2; - public static final int DIGIPOT_COUNT = 4; - public static final int DWELL_CURVE_SIZE = 8; public static final int EGT_CHANNEL_COUNT = 8; - public static final String ENGINE_MAKE_BMW = "BMW"; - public static final String ENGINE_MAKE_GM = "GM"; - public static final String ENGINE_MAKE_HONDA = "Honda"; - public static final String ENGINE_MAKE_Hyundai = "Hyundai"; - public static final String ENGINE_MAKE_LADA = "Lada"; - public static final String ENGINE_MAKE_MAZDA = "Mazda"; - public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; - public static final String ENGINE_MAKE_NISSAN = "Nissan"; - public static final String ENGINE_MAKE_SUBARU = "Subaru"; - public static final String ENGINE_MAKE_TOYOTA = "Toyota"; - public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 16; - public static final int ENGINE_SNIFFER_UNIT_US = 10; - public static final int ETB_BIAS_CURVE_LENGTH = 8; - public static final int ETB_COUNT = 2; - public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10021; - public static final int FUEL_LEVEL_TABLE_COUNT = 8; - public static final int FUEL_LOAD_COUNT = 16; - public static final int FUEL_RPM_COUNT = 16; - public static final int GAP_TRACKING_LENGTH = 18; public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_ETB = "ETB more"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_SYNC = "Sync"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; - public static final String GAUGE_COIL_DWELL_TIME = "Ignition: coil charge time"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -147,7 +54,7 @@ public class FuelComputer { public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; - public static final String GAUGE_NAME_DWELL_DUTY = "Ignition: coil duty cycle"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; @@ -164,7 +71,7 @@ public class FuelComputer { public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; - public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last Inj Pulsewidth"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; @@ -184,7 +91,7 @@ public class FuelComputer { public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_IAT = "IAT"; public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; - public static final String GAUGE_NAME_IGNITION_LOAD = "Ignition: load"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; @@ -218,11 +125,11 @@ public class FuelComputer { public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; - public static final String GAUGE_NAME_TIMING_ADVANCE = "Timing: base ignition"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; public static final String GAUGE_NAME_TPS2 = "TPS2"; public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; - public static final String GAUGE_NAME_TRG_GAP = "Sync: Trigger Latest Ratio"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; public static final String GAUGE_NAME_UPTIME = "Uptime"; @@ -242,44 +149,14 @@ public class FuelComputer { public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; public static final int GEARS_COUNT = 8; - public static final int GPPWM_CHANNELS = 4; - public static final int GPPWM_LOAD_COUNT = 8; - public static final int GPPWM_NOTE_SIZE = 16; - public static final int GPPWM_RPM_COUNT = 8; - public static final int HIGH_SPEED_COUNT = 32; - public static final int HPFP_COMPENSATION_SIZE = 10; - public static final int HPFP_DEADTIME_SIZE = 8; - public static final int HPFP_LOBE_PROFILE_SIZE = 16; - public static final int HPFP_TARGET_SIZE = 10; - public static final int HW_MAX_ADC_INDEX = 17; - public static final int IAC_PID_MULT_SIZE = 8; - public static final int IAT_CURVE_SIZE = 16; - public static final int IDLE_ADVANCE_CURVE_SIZE = 8; - public static final int IDLE_VE_SIZE = 4; public static final int IGN_BLEND_COUNT = 4; - public static final int IGN_LOAD_COUNT = 16; - public static final int IGN_RPM_COUNT = 16; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; - public static final String LOG_DELIMITER = "`"; - public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; public static final int LUA_ANALOG_INPUT_COUNT = 8; - public static final int LUA_DIGITAL_INPUT_COUNT = 8; public static final int LUA_GAUGE_COUNT = 2; - public static final int LUA_PWM_COUNT = 8; - public static final int LUA_SCRIPT_SIZE = 8000; - public static final int MAF_DECODING_COUNT = 256; - public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; - public static final int MAP_ANGLE_SIZE = 8; - public static final int MAP_WINDOW_SIZE = 8; public static final int MAX_CYLINDER_COUNT = 12; - public static final int MLQ_FIELD_HEADER_SIZE = 89; - public static final int MLQ_HEADER_SIZE = 24; - public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; - public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; - public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_AFR_CFG = 10; @@ -296,119 +173,8 @@ public class FuelComputer { public static final int PACK_MULT_TEMPERATURE = 100; public static final int PACK_MULT_VOLTAGE = 1000; public static final int PACK_MULT_VSS = 100; - public static final int PEDAL_TO_TPS_SIZE = 8; - public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; - public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; - public static final String PROTOCOL_CRANK1 = "t1"; - public static final String PROTOCOL_CRANK2 = "t2"; - public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; - public static final String PROTOCOL_ES_DOWN = "d"; - public static final String PROTOCOL_ES_UP = "u"; - public static final String PROTOCOL_HELLO_PREFIX = "***"; - public static final String PROTOCOL_HIP_NAME = "HIP"; - public static final String PROTOCOL_HPFP_NAME = "hpfp"; - public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; - public static final String PROTOCOL_MSG = "msg"; - public static final String PROTOCOL_OUTPIN = "outpin"; - public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; - public static final String PROTOCOL_TACH_NAME = "tach"; - public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; - public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; - public static final String PROTOCOL_VVT1_NAME = "VVT1"; - public static final String PROTOCOL_VVT2_NAME = "VVT2"; - public static final String PROTOCOL_VVT3_NAME = "VVT3"; - public static final String PROTOCOL_VVT4_NAME = "VVT4"; - public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; - public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; - public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; - public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; - public static final int SCRIPT_CURVE_16 = 16; - public static final int SCRIPT_CURVE_8 = 8; - public static final int SCRIPT_CURVE_COUNT = 6; - public static final int SCRIPT_SETTING_COUNT = 8; - public static final int SCRIPT_TABLE_8 = 8; - public static final int SCRIPT_TABLE_COUNT = 4; - public static final int SENT_INPUT_COUNT = 1; - public static final int STFT_BANK_COUNT = 2; - public static final int STFT_CELL_COUNT = 4; - public static final int TCU_GEAR_COUNT = 10; - public static final int TCU_MAGIC_SIZE = 8; - public static final int TCU_SOLENOID_COUNT = 6; - public static final int TOOTH_DATA_LENGTH = 2000; - public static final int TOOTH_PACKET_COUNT = 1000; - public static final int TOOTH_PACKET_SIZE = 2; - public static final String TOP_DEAD_CENTER_MESSAGE = "r"; - public static final int TORQUE_CURVE_SIZE = 6; public static final int TPS_2_BYTE_PACKING_MULT = 100; - public static final int TPS_TPS_ACCEL_CLT_CORR_TABLE = 4; - public static final int TPS_TPS_ACCEL_TABLE = 8; - public static final String TRIGGER_COMMENT = "#"; - public static final String TRIGGER_CYCLE_DURATION = "cycleDuration"; - public static final String TRIGGER_GAP_FROM = "gapFrom"; - public static final String TRIGGER_GAP_TO = "gapTo"; - public static final String TRIGGER_GAPS_COUNT = "gapsCount"; - public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; - public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; - public static final int TRIGGER_INPUT_PIN_COUNT = 2; - public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; - public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; - public static final String TRIGGER_WITH_SYNC = "isSynchronizationNeeded"; - public static final String TRIGGERS_FILE_NAME = "triggers.txt"; - public static final int TRIM_SIZE = 4; - public static final int TS_BLOCK_READ_TIMEOUT = 3000; - public static final char TS_BURN_COMMAND = 'B'; - public static final char TS_CHUNK_WRITE_COMMAND = 'C'; - public static final char TS_COMMAND_F = 'F'; - public static final int TS_COMPOSITE_DISABLE = 2; - public static final int TS_COMPOSITE_ENABLE = 1; - public static final int TS_COMPOSITE_READ = 3; - public static final char TS_CRC_CHECK_COMMAND = 'k'; - public static final char TS_EXECUTE = 'E'; - public static final int TS_FILE_VERSION = 20210312; - public static final int TS_FILE_VERSION_OFFSET = 124; - public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; - public static final char TS_GET_CONFIG_ERROR = 'e'; - public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_OUTPUTS_SIZE = '4'; - public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; - public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; - public static final char TS_GET_TEXT = 'G'; - public static final char TS_HELLO_COMMAND = 'S'; - public static final char TS_IO_TEST_COMMAND = 'Z'; - public static final char TS_ONLINE_PROTOCOL = 'z'; - public static final char TS_OUTPUT_COMMAND = 'O'; - public static final char TS_PAGE_COMMAND = 'P'; - public static final char TS_PERF_TRACE_BEGIN = '_'; - public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; - public static final String TS_PROTOCOL = "001"; - public static final char TS_QUERY_COMMAND = 'Q'; - public static final char TS_READ_COMMAND = 'R'; - public static final int TS_RESPONSE_BURN_OK = 4; - public static final int TS_RESPONSE_COMMAND_OK = 7; - public static final int TS_RESPONSE_CRC_FAILURE = 0x82; - public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; - public static final int TS_RESPONSE_OK = 0; - public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; - 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 char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final char TS_TEST_COMMAND = 't'; - public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; - public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; - public static final int TS_TRIGGER_SCOPE_DISABLE = 5; - public static final int TS_TRIGGER_SCOPE_ENABLE = 4; - public static final int TS_TRIGGER_SCOPE_READ = 6; - public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; - public static final int VEHICLE_INFO_SIZE = 32; - public static final int VIN_NUMBER_SIZE = 17; - public static final int VR_THRESHOLD_COUNT = 2; - public static final int VSS_FILTER_MAX = 200; - public static final int VSS_FILTER_MIN = 3; - public static final int WARNING_BUFFER_SIZE = 120; - public static final int WWAE_TABLE_SIZE = 8; public static final Field TOTALFUELCORRECTION = Field.create("TOTALFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(776); public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 4, FieldType.FLOAT).setBaseOffset(776); public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 8, FieldType.FLOAT).setBaseOffset(776); 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 0e7b7bde9a..38f294d887 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,114 +1,21 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/ignition_state.txt Sat Apr 29 01:39:32 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/ignition_state.txt Sat Apr 29 21:01:06 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class IgnitionState { - public static final int ADC_CHANNEL_NONE = 0; - public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; - public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; - public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; - public static final int AUX_DIGITAL_VALVE_COUNT = 2; public static final int BANKS_COUNT = 2; - public static final int BARO_CORR_SIZE = 4; - public static final int BLOCKING_FACTOR = 750; - public static final int BOOST_LOAD_COUNT = 8; - public static final int BOOST_RPM_COUNT = 8; public static final int CAM_INPUTS_COUNT = 4; public static final int CAMS_PER_BANK = 2; - public static final int CAN_DEFAULT_BASE = 0x200; - public static final int CAN_ECU_HW_META = 0xAB1234; - public static final int CAN_ECU_SERIAL_RX_ID = 0x100; - public static final int CAN_ECU_SERIAL_TX_ID = 0x102; - public static final String CAN_RX_PREFIX = "CAN_rx"; - public static final int CLT_CRANKING_CURVE_SIZE = 8; - public static final int CLT_CURVE_SIZE = 16; - public static final int CLT_LIMITER_CURVE_SIZE = 4; - public static final int CLT_TIMING_CURVE_SIZE = 8; - public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; - public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; - public static final String CMD_BOOST_PIN = "set_boost_pin"; - public static final String CMD_BURNCONFIG = "burnconfig"; - public static final String CMD_DATE = "date"; - public static final String CMD_DISABLE = "disable"; - public static final String CMD_ECU_UNLOCK = "unlock"; - public static final String CMD_ENABLE = "enable"; - public static final String CMD_ENGINE_TYPE = "engine_type"; - public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; - public static final String CMD_ETB_DUTY = "set_etb_duty"; - public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; - public static final String CMD_FAN2_BENCH = "fan2bench"; - public static final String CMD_FAN_BENCH = "fanbench"; - public static final String CMD_FUEL_BENCH = "fuelbench"; - public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; - public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; - public static final String CMD_GET = "get"; - public static final String CMD_HPFP_BENCH = "hpfpbench"; - public static final String CMD_IDLE_BENCH = "idlebench"; - public static final String CMD_IDLE_PIN = "set_idle_pin"; - public static final String CMD_IGNITION = "ignition"; - public static final String CMD_IGNITION_PIN = "set_ignition_pin"; - public static final String CMD_INJECTION = "injection"; - public static final String CMD_INJECTION_PIN = "set_injection_pin"; - public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; - public static final String CMD_MIL_BENCH = "milbench"; - public static final String CMD_PINS = "pins"; - public static final String CMD_PWM = "pwm"; - public static final String CMD_REBOOT = "reboot"; - public static final String CMD_REBOOT_DFU = "reboot_dfu"; - public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; - public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; - public static final String CMD_RPM = "rpm"; - public static final String CMD_SELF_STIMULATION = "self_stimulation"; - public static final String CMD_SET = "set"; - public static final String CMD_SPARK_BENCH = "sparkbench"; - public static final String CMD_STARTER_BENCH = "starterbench"; - public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; - public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; - public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; - public static final String CMD_TRIGGERINFO = "triggerinfo"; - public static final String CMD_VSS_PIN = "vss_pin"; - public static final String CMD_WRITECONFIG = "writeconfig"; - public static final int COMPOSITE_PACKET_SIZE = 5; - public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; - public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; - public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; - public static final int CRANKING_CURVE_SIZE = 8; - public static final int CRITICAL_BUFFER_SIZE = 120; - public static final String CRITICAL_PREFIX = "CRITICAL"; - public static final int DC_PER_STEPPER = 2; - public static final int DIGIPOT_COUNT = 4; - public static final int DWELL_CURVE_SIZE = 8; public static final int EGT_CHANNEL_COUNT = 8; - public static final String ENGINE_MAKE_BMW = "BMW"; - public static final String ENGINE_MAKE_GM = "GM"; - public static final String ENGINE_MAKE_HONDA = "Honda"; - public static final String ENGINE_MAKE_Hyundai = "Hyundai"; - public static final String ENGINE_MAKE_LADA = "Lada"; - public static final String ENGINE_MAKE_MAZDA = "Mazda"; - public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; - public static final String ENGINE_MAKE_NISSAN = "Nissan"; - public static final String ENGINE_MAKE_SUBARU = "Subaru"; - public static final String ENGINE_MAKE_TOYOTA = "Toyota"; - public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 16; - public static final int ENGINE_SNIFFER_UNIT_US = 10; - public static final int ETB_BIAS_CURVE_LENGTH = 8; - public static final int ETB_COUNT = 2; - public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10021; - public static final int FUEL_LEVEL_TABLE_COUNT = 8; - public static final int FUEL_LOAD_COUNT = 16; - public static final int FUEL_RPM_COUNT = 16; - public static final int GAP_TRACKING_LENGTH = 18; public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_ETB = "ETB more"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_SYNC = "Sync"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; - public static final String GAUGE_COIL_DWELL_TIME = "Ignition: coil charge time"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -147,7 +54,7 @@ public class IgnitionState { public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; - public static final String GAUGE_NAME_DWELL_DUTY = "Ignition: coil duty cycle"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; @@ -164,7 +71,7 @@ public class IgnitionState { public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; - public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last Inj Pulsewidth"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; @@ -184,7 +91,7 @@ public class IgnitionState { public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_IAT = "IAT"; public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; - public static final String GAUGE_NAME_IGNITION_LOAD = "Ignition: load"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; @@ -218,11 +125,11 @@ public class IgnitionState { public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; - public static final String GAUGE_NAME_TIMING_ADVANCE = "Timing: base ignition"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; public static final String GAUGE_NAME_TPS2 = "TPS2"; public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; - public static final String GAUGE_NAME_TRG_GAP = "Sync: Trigger Latest Ratio"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; public static final String GAUGE_NAME_UPTIME = "Uptime"; @@ -242,44 +149,14 @@ public class IgnitionState { public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; public static final int GEARS_COUNT = 8; - public static final int GPPWM_CHANNELS = 4; - public static final int GPPWM_LOAD_COUNT = 8; - public static final int GPPWM_NOTE_SIZE = 16; - public static final int GPPWM_RPM_COUNT = 8; - public static final int HIGH_SPEED_COUNT = 32; - public static final int HPFP_COMPENSATION_SIZE = 10; - public static final int HPFP_DEADTIME_SIZE = 8; - public static final int HPFP_LOBE_PROFILE_SIZE = 16; - public static final int HPFP_TARGET_SIZE = 10; - public static final int HW_MAX_ADC_INDEX = 17; - public static final int IAC_PID_MULT_SIZE = 8; - public static final int IAT_CURVE_SIZE = 16; - public static final int IDLE_ADVANCE_CURVE_SIZE = 8; - public static final int IDLE_VE_SIZE = 4; public static final int IGN_BLEND_COUNT = 4; - public static final int IGN_LOAD_COUNT = 16; - public static final int IGN_RPM_COUNT = 16; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; - public static final String LOG_DELIMITER = "`"; - public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; public static final int LUA_ANALOG_INPUT_COUNT = 8; - public static final int LUA_DIGITAL_INPUT_COUNT = 8; public static final int LUA_GAUGE_COUNT = 2; - public static final int LUA_PWM_COUNT = 8; - public static final int LUA_SCRIPT_SIZE = 8000; - public static final int MAF_DECODING_COUNT = 256; - public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; - public static final int MAP_ANGLE_SIZE = 8; - public static final int MAP_WINDOW_SIZE = 8; public static final int MAX_CYLINDER_COUNT = 12; - public static final int MLQ_FIELD_HEADER_SIZE = 89; - public static final int MLQ_HEADER_SIZE = 24; - public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; - public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; - public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_AFR_CFG = 10; @@ -296,119 +173,8 @@ public class IgnitionState { public static final int PACK_MULT_TEMPERATURE = 100; public static final int PACK_MULT_VOLTAGE = 1000; public static final int PACK_MULT_VSS = 100; - public static final int PEDAL_TO_TPS_SIZE = 8; - public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; - public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; - public static final String PROTOCOL_CRANK1 = "t1"; - public static final String PROTOCOL_CRANK2 = "t2"; - public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; - public static final String PROTOCOL_ES_DOWN = "d"; - public static final String PROTOCOL_ES_UP = "u"; - public static final String PROTOCOL_HELLO_PREFIX = "***"; - public static final String PROTOCOL_HIP_NAME = "HIP"; - public static final String PROTOCOL_HPFP_NAME = "hpfp"; - public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; - public static final String PROTOCOL_MSG = "msg"; - public static final String PROTOCOL_OUTPIN = "outpin"; - public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; - public static final String PROTOCOL_TACH_NAME = "tach"; - public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; - public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; - public static final String PROTOCOL_VVT1_NAME = "VVT1"; - public static final String PROTOCOL_VVT2_NAME = "VVT2"; - public static final String PROTOCOL_VVT3_NAME = "VVT3"; - public static final String PROTOCOL_VVT4_NAME = "VVT4"; - public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; - public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; - public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; - public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; - public static final int SCRIPT_CURVE_16 = 16; - public static final int SCRIPT_CURVE_8 = 8; - public static final int SCRIPT_CURVE_COUNT = 6; - public static final int SCRIPT_SETTING_COUNT = 8; - public static final int SCRIPT_TABLE_8 = 8; - public static final int SCRIPT_TABLE_COUNT = 4; - public static final int SENT_INPUT_COUNT = 1; - public static final int STFT_BANK_COUNT = 2; - public static final int STFT_CELL_COUNT = 4; - public static final int TCU_GEAR_COUNT = 10; - public static final int TCU_MAGIC_SIZE = 8; - public static final int TCU_SOLENOID_COUNT = 6; - public static final int TOOTH_DATA_LENGTH = 2000; - public static final int TOOTH_PACKET_COUNT = 1000; - public static final int TOOTH_PACKET_SIZE = 2; - public static final String TOP_DEAD_CENTER_MESSAGE = "r"; - public static final int TORQUE_CURVE_SIZE = 6; public static final int TPS_2_BYTE_PACKING_MULT = 100; - public static final int TPS_TPS_ACCEL_CLT_CORR_TABLE = 4; - public static final int TPS_TPS_ACCEL_TABLE = 8; - public static final String TRIGGER_COMMENT = "#"; - public static final String TRIGGER_CYCLE_DURATION = "cycleDuration"; - public static final String TRIGGER_GAP_FROM = "gapFrom"; - public static final String TRIGGER_GAP_TO = "gapTo"; - public static final String TRIGGER_GAPS_COUNT = "gapsCount"; - public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; - public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; - public static final int TRIGGER_INPUT_PIN_COUNT = 2; - public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; - public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; - public static final String TRIGGER_WITH_SYNC = "isSynchronizationNeeded"; - public static final String TRIGGERS_FILE_NAME = "triggers.txt"; - public static final int TRIM_SIZE = 4; - public static final int TS_BLOCK_READ_TIMEOUT = 3000; - public static final char TS_BURN_COMMAND = 'B'; - public static final char TS_CHUNK_WRITE_COMMAND = 'C'; - public static final char TS_COMMAND_F = 'F'; - public static final int TS_COMPOSITE_DISABLE = 2; - public static final int TS_COMPOSITE_ENABLE = 1; - public static final int TS_COMPOSITE_READ = 3; - public static final char TS_CRC_CHECK_COMMAND = 'k'; - public static final char TS_EXECUTE = 'E'; - public static final int TS_FILE_VERSION = 20210312; - public static final int TS_FILE_VERSION_OFFSET = 124; - public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; - public static final char TS_GET_CONFIG_ERROR = 'e'; - public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_OUTPUTS_SIZE = '4'; - public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; - public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; - public static final char TS_GET_TEXT = 'G'; - public static final char TS_HELLO_COMMAND = 'S'; - public static final char TS_IO_TEST_COMMAND = 'Z'; - public static final char TS_ONLINE_PROTOCOL = 'z'; - public static final char TS_OUTPUT_COMMAND = 'O'; - public static final char TS_PAGE_COMMAND = 'P'; - public static final char TS_PERF_TRACE_BEGIN = '_'; - public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; - public static final String TS_PROTOCOL = "001"; - public static final char TS_QUERY_COMMAND = 'Q'; - public static final char TS_READ_COMMAND = 'R'; - public static final int TS_RESPONSE_BURN_OK = 4; - public static final int TS_RESPONSE_COMMAND_OK = 7; - public static final int TS_RESPONSE_CRC_FAILURE = 0x82; - public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; - public static final int TS_RESPONSE_OK = 0; - public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; - 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 char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final char TS_TEST_COMMAND = 't'; - public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; - public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; - public static final int TS_TRIGGER_SCOPE_DISABLE = 5; - public static final int TS_TRIGGER_SCOPE_ENABLE = 4; - public static final int TS_TRIGGER_SCOPE_READ = 6; - public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; - public static final int VEHICLE_INFO_SIZE = 32; - public static final int VIN_NUMBER_SIZE = 17; - public static final int VR_THRESHOLD_COUNT = 2; - public static final int VSS_FILTER_MAX = 200; - public static final int VSS_FILTER_MIN = 3; - public static final int WARNING_BUFFER_SIZE = 120; - public static final int WWAE_TABLE_SIZE = 8; public static final Field BASEDWELL = Field.create("BASEDWELL", 0, FieldType.FLOAT).setBaseOffset(824); public static final Field SPARKDWELL = Field.create("SPARKDWELL", 4, FieldType.FLOAT).setBaseOffset(824); public static final Field DWELLANGLE = Field.create("DWELLANGLE", 8, FieldType.FLOAT).setBaseOffset(824); diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java b/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java index 48b892d9cf..eb2f623dd6 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java @@ -1,114 +1,21 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/sensors//sent_state.txt Sat Apr 29 01:39:32 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/sensors//sent_state.txt Sat Apr 29 21:01:06 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class SentState { - public static final int ADC_CHANNEL_NONE = 0; - public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; - public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; - public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; - public static final int AUX_DIGITAL_VALVE_COUNT = 2; public static final int BANKS_COUNT = 2; - public static final int BARO_CORR_SIZE = 4; - public static final int BLOCKING_FACTOR = 750; - public static final int BOOST_LOAD_COUNT = 8; - public static final int BOOST_RPM_COUNT = 8; public static final int CAM_INPUTS_COUNT = 4; public static final int CAMS_PER_BANK = 2; - public static final int CAN_DEFAULT_BASE = 0x200; - public static final int CAN_ECU_HW_META = 0xAB1234; - public static final int CAN_ECU_SERIAL_RX_ID = 0x100; - public static final int CAN_ECU_SERIAL_TX_ID = 0x102; - public static final String CAN_RX_PREFIX = "CAN_rx"; - public static final int CLT_CRANKING_CURVE_SIZE = 8; - public static final int CLT_CURVE_SIZE = 16; - public static final int CLT_LIMITER_CURVE_SIZE = 4; - public static final int CLT_TIMING_CURVE_SIZE = 8; - public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; - public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; - public static final String CMD_BOOST_PIN = "set_boost_pin"; - public static final String CMD_BURNCONFIG = "burnconfig"; - public static final String CMD_DATE = "date"; - public static final String CMD_DISABLE = "disable"; - public static final String CMD_ECU_UNLOCK = "unlock"; - public static final String CMD_ENABLE = "enable"; - public static final String CMD_ENGINE_TYPE = "engine_type"; - public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; - public static final String CMD_ETB_DUTY = "set_etb_duty"; - public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; - public static final String CMD_FAN2_BENCH = "fan2bench"; - public static final String CMD_FAN_BENCH = "fanbench"; - public static final String CMD_FUEL_BENCH = "fuelbench"; - public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; - public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; - public static final String CMD_GET = "get"; - public static final String CMD_HPFP_BENCH = "hpfpbench"; - public static final String CMD_IDLE_BENCH = "idlebench"; - public static final String CMD_IDLE_PIN = "set_idle_pin"; - public static final String CMD_IGNITION = "ignition"; - public static final String CMD_IGNITION_PIN = "set_ignition_pin"; - public static final String CMD_INJECTION = "injection"; - public static final String CMD_INJECTION_PIN = "set_injection_pin"; - public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; - public static final String CMD_MIL_BENCH = "milbench"; - public static final String CMD_PINS = "pins"; - public static final String CMD_PWM = "pwm"; - public static final String CMD_REBOOT = "reboot"; - public static final String CMD_REBOOT_DFU = "reboot_dfu"; - public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; - public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; - public static final String CMD_RPM = "rpm"; - public static final String CMD_SELF_STIMULATION = "self_stimulation"; - public static final String CMD_SET = "set"; - public static final String CMD_SPARK_BENCH = "sparkbench"; - public static final String CMD_STARTER_BENCH = "starterbench"; - public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; - public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; - public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; - public static final String CMD_TRIGGERINFO = "triggerinfo"; - public static final String CMD_VSS_PIN = "vss_pin"; - public static final String CMD_WRITECONFIG = "writeconfig"; - public static final int COMPOSITE_PACKET_SIZE = 5; - public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; - public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; - public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; - public static final int CRANKING_CURVE_SIZE = 8; - public static final int CRITICAL_BUFFER_SIZE = 120; - public static final String CRITICAL_PREFIX = "CRITICAL"; - public static final int DC_PER_STEPPER = 2; - public static final int DIGIPOT_COUNT = 4; - public static final int DWELL_CURVE_SIZE = 8; public static final int EGT_CHANNEL_COUNT = 8; - public static final String ENGINE_MAKE_BMW = "BMW"; - public static final String ENGINE_MAKE_GM = "GM"; - public static final String ENGINE_MAKE_HONDA = "Honda"; - public static final String ENGINE_MAKE_Hyundai = "Hyundai"; - public static final String ENGINE_MAKE_LADA = "Lada"; - public static final String ENGINE_MAKE_MAZDA = "Mazda"; - public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; - public static final String ENGINE_MAKE_NISSAN = "Nissan"; - public static final String ENGINE_MAKE_SUBARU = "Subaru"; - public static final String ENGINE_MAKE_TOYOTA = "Toyota"; - public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 16; - public static final int ENGINE_SNIFFER_UNIT_US = 10; - public static final int ETB_BIAS_CURVE_LENGTH = 8; - public static final int ETB_COUNT = 2; - public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10021; - public static final int FUEL_LEVEL_TABLE_COUNT = 8; - public static final int FUEL_LOAD_COUNT = 16; - public static final int FUEL_RPM_COUNT = 16; - public static final int GAP_TRACKING_LENGTH = 18; public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_ETB = "ETB more"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_SYNC = "Sync"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; - public static final String GAUGE_COIL_DWELL_TIME = "Ignition: coil charge time"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -147,7 +54,7 @@ public class SentState { public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; - public static final String GAUGE_NAME_DWELL_DUTY = "Ignition: coil duty cycle"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; @@ -164,7 +71,7 @@ public class SentState { public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; - public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last Inj Pulsewidth"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; @@ -184,7 +91,7 @@ public class SentState { public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_IAT = "IAT"; public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; - public static final String GAUGE_NAME_IGNITION_LOAD = "Ignition: load"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; @@ -218,11 +125,11 @@ public class SentState { public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; - public static final String GAUGE_NAME_TIMING_ADVANCE = "Timing: base ignition"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; public static final String GAUGE_NAME_TPS2 = "TPS2"; public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; - public static final String GAUGE_NAME_TRG_GAP = "Sync: Trigger Latest Ratio"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; public static final String GAUGE_NAME_UPTIME = "Uptime"; @@ -242,44 +149,14 @@ public class SentState { public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; public static final int GEARS_COUNT = 8; - public static final int GPPWM_CHANNELS = 4; - public static final int GPPWM_LOAD_COUNT = 8; - public static final int GPPWM_NOTE_SIZE = 16; - public static final int GPPWM_RPM_COUNT = 8; - public static final int HIGH_SPEED_COUNT = 32; - public static final int HPFP_COMPENSATION_SIZE = 10; - public static final int HPFP_DEADTIME_SIZE = 8; - public static final int HPFP_LOBE_PROFILE_SIZE = 16; - public static final int HPFP_TARGET_SIZE = 10; - public static final int HW_MAX_ADC_INDEX = 17; - public static final int IAC_PID_MULT_SIZE = 8; - public static final int IAT_CURVE_SIZE = 16; - public static final int IDLE_ADVANCE_CURVE_SIZE = 8; - public static final int IDLE_VE_SIZE = 4; public static final int IGN_BLEND_COUNT = 4; - public static final int IGN_LOAD_COUNT = 16; - public static final int IGN_RPM_COUNT = 16; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; - public static final String LOG_DELIMITER = "`"; - public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; public static final int LUA_ANALOG_INPUT_COUNT = 8; - public static final int LUA_DIGITAL_INPUT_COUNT = 8; public static final int LUA_GAUGE_COUNT = 2; - public static final int LUA_PWM_COUNT = 8; - public static final int LUA_SCRIPT_SIZE = 8000; - public static final int MAF_DECODING_COUNT = 256; - public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; - public static final int MAP_ANGLE_SIZE = 8; - public static final int MAP_WINDOW_SIZE = 8; public static final int MAX_CYLINDER_COUNT = 12; - public static final int MLQ_FIELD_HEADER_SIZE = 89; - public static final int MLQ_HEADER_SIZE = 24; - public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; - public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; - public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_AFR_CFG = 10; @@ -296,119 +173,8 @@ public class SentState { public static final int PACK_MULT_TEMPERATURE = 100; public static final int PACK_MULT_VOLTAGE = 1000; public static final int PACK_MULT_VSS = 100; - public static final int PEDAL_TO_TPS_SIZE = 8; - public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; - public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; - public static final String PROTOCOL_CRANK1 = "t1"; - public static final String PROTOCOL_CRANK2 = "t2"; - public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; - public static final String PROTOCOL_ES_DOWN = "d"; - public static final String PROTOCOL_ES_UP = "u"; - public static final String PROTOCOL_HELLO_PREFIX = "***"; - public static final String PROTOCOL_HIP_NAME = "HIP"; - public static final String PROTOCOL_HPFP_NAME = "hpfp"; - public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; - public static final String PROTOCOL_MSG = "msg"; - public static final String PROTOCOL_OUTPIN = "outpin"; - public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; - public static final String PROTOCOL_TACH_NAME = "tach"; - public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; - public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; - public static final String PROTOCOL_VVT1_NAME = "VVT1"; - public static final String PROTOCOL_VVT2_NAME = "VVT2"; - public static final String PROTOCOL_VVT3_NAME = "VVT3"; - public static final String PROTOCOL_VVT4_NAME = "VVT4"; - public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; - public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; - public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; - public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; - public static final int SCRIPT_CURVE_16 = 16; - public static final int SCRIPT_CURVE_8 = 8; - public static final int SCRIPT_CURVE_COUNT = 6; - public static final int SCRIPT_SETTING_COUNT = 8; - public static final int SCRIPT_TABLE_8 = 8; - public static final int SCRIPT_TABLE_COUNT = 4; - public static final int SENT_INPUT_COUNT = 1; - public static final int STFT_BANK_COUNT = 2; - public static final int STFT_CELL_COUNT = 4; - public static final int TCU_GEAR_COUNT = 10; - public static final int TCU_MAGIC_SIZE = 8; - public static final int TCU_SOLENOID_COUNT = 6; - public static final int TOOTH_DATA_LENGTH = 2000; - public static final int TOOTH_PACKET_COUNT = 1000; - public static final int TOOTH_PACKET_SIZE = 2; - public static final String TOP_DEAD_CENTER_MESSAGE = "r"; - public static final int TORQUE_CURVE_SIZE = 6; public static final int TPS_2_BYTE_PACKING_MULT = 100; - public static final int TPS_TPS_ACCEL_CLT_CORR_TABLE = 4; - public static final int TPS_TPS_ACCEL_TABLE = 8; - public static final String TRIGGER_COMMENT = "#"; - public static final String TRIGGER_CYCLE_DURATION = "cycleDuration"; - public static final String TRIGGER_GAP_FROM = "gapFrom"; - public static final String TRIGGER_GAP_TO = "gapTo"; - public static final String TRIGGER_GAPS_COUNT = "gapsCount"; - public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; - public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; - public static final int TRIGGER_INPUT_PIN_COUNT = 2; - public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; - public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; - public static final String TRIGGER_WITH_SYNC = "isSynchronizationNeeded"; - public static final String TRIGGERS_FILE_NAME = "triggers.txt"; - public static final int TRIM_SIZE = 4; - public static final int TS_BLOCK_READ_TIMEOUT = 3000; - public static final char TS_BURN_COMMAND = 'B'; - public static final char TS_CHUNK_WRITE_COMMAND = 'C'; - public static final char TS_COMMAND_F = 'F'; - public static final int TS_COMPOSITE_DISABLE = 2; - public static final int TS_COMPOSITE_ENABLE = 1; - public static final int TS_COMPOSITE_READ = 3; - public static final char TS_CRC_CHECK_COMMAND = 'k'; - public static final char TS_EXECUTE = 'E'; - public static final int TS_FILE_VERSION = 20210312; - public static final int TS_FILE_VERSION_OFFSET = 124; - public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; - public static final char TS_GET_CONFIG_ERROR = 'e'; - public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_OUTPUTS_SIZE = '4'; - public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; - public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; - public static final char TS_GET_TEXT = 'G'; - public static final char TS_HELLO_COMMAND = 'S'; - public static final char TS_IO_TEST_COMMAND = 'Z'; - public static final char TS_ONLINE_PROTOCOL = 'z'; - public static final char TS_OUTPUT_COMMAND = 'O'; - public static final char TS_PAGE_COMMAND = 'P'; - public static final char TS_PERF_TRACE_BEGIN = '_'; - public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; - public static final String TS_PROTOCOL = "001"; - public static final char TS_QUERY_COMMAND = 'Q'; - public static final char TS_READ_COMMAND = 'R'; - public static final int TS_RESPONSE_BURN_OK = 4; - public static final int TS_RESPONSE_COMMAND_OK = 7; - public static final int TS_RESPONSE_CRC_FAILURE = 0x82; - public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; - public static final int TS_RESPONSE_OK = 0; - public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; - 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 char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final char TS_TEST_COMMAND = 't'; - public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; - public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; - public static final int TS_TRIGGER_SCOPE_DISABLE = 5; - public static final int TS_TRIGGER_SCOPE_ENABLE = 4; - public static final int TS_TRIGGER_SCOPE_READ = 6; - public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; - public static final int VEHICLE_INFO_SIZE = 32; - public static final int VIN_NUMBER_SIZE = 17; - public static final int VR_THRESHOLD_COUNT = 2; - public static final int VSS_FILTER_MAX = 200; - public static final int VSS_FILTER_MIN = 3; - public static final int WARNING_BUFFER_SIZE = 120; - public static final int WWAE_TABLE_SIZE = 8; public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1368); public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1368); public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1368); diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index 1b5c0af9ce..5d7a8c3d48 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java @@ -1,114 +1,21 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Sat Apr 29 01:39:32 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Sat Apr 29 21:01:06 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TriggerState { - public static final int ADC_CHANNEL_NONE = 0; - public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; - public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; - public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; - public static final int AUX_DIGITAL_VALVE_COUNT = 2; public static final int BANKS_COUNT = 2; - public static final int BARO_CORR_SIZE = 4; - public static final int BLOCKING_FACTOR = 750; - public static final int BOOST_LOAD_COUNT = 8; - public static final int BOOST_RPM_COUNT = 8; public static final int CAM_INPUTS_COUNT = 4; public static final int CAMS_PER_BANK = 2; - public static final int CAN_DEFAULT_BASE = 0x200; - public static final int CAN_ECU_HW_META = 0xAB1234; - public static final int CAN_ECU_SERIAL_RX_ID = 0x100; - public static final int CAN_ECU_SERIAL_TX_ID = 0x102; - public static final String CAN_RX_PREFIX = "CAN_rx"; - public static final int CLT_CRANKING_CURVE_SIZE = 8; - public static final int CLT_CURVE_SIZE = 16; - public static final int CLT_LIMITER_CURVE_SIZE = 4; - public static final int CLT_TIMING_CURVE_SIZE = 8; - public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; - public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; - public static final String CMD_BOOST_PIN = "set_boost_pin"; - public static final String CMD_BURNCONFIG = "burnconfig"; - public static final String CMD_DATE = "date"; - public static final String CMD_DISABLE = "disable"; - public static final String CMD_ECU_UNLOCK = "unlock"; - public static final String CMD_ENABLE = "enable"; - public static final String CMD_ENGINE_TYPE = "engine_type"; - public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; - public static final String CMD_ETB_DUTY = "set_etb_duty"; - public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; - public static final String CMD_FAN2_BENCH = "fan2bench"; - public static final String CMD_FAN_BENCH = "fanbench"; - public static final String CMD_FUEL_BENCH = "fuelbench"; - public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; - public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; - public static final String CMD_GET = "get"; - public static final String CMD_HPFP_BENCH = "hpfpbench"; - public static final String CMD_IDLE_BENCH = "idlebench"; - public static final String CMD_IDLE_PIN = "set_idle_pin"; - public static final String CMD_IGNITION = "ignition"; - public static final String CMD_IGNITION_PIN = "set_ignition_pin"; - public static final String CMD_INJECTION = "injection"; - public static final String CMD_INJECTION_PIN = "set_injection_pin"; - public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; - public static final String CMD_MIL_BENCH = "milbench"; - public static final String CMD_PINS = "pins"; - public static final String CMD_PWM = "pwm"; - public static final String CMD_REBOOT = "reboot"; - public static final String CMD_REBOOT_DFU = "reboot_dfu"; - public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; - public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; - public static final String CMD_RPM = "rpm"; - public static final String CMD_SELF_STIMULATION = "self_stimulation"; - public static final String CMD_SET = "set"; - public static final String CMD_SPARK_BENCH = "sparkbench"; - public static final String CMD_STARTER_BENCH = "starterbench"; - public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; - public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; - public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; - public static final String CMD_TRIGGERINFO = "triggerinfo"; - public static final String CMD_VSS_PIN = "vss_pin"; - public static final String CMD_WRITECONFIG = "writeconfig"; - public static final int COMPOSITE_PACKET_SIZE = 5; - public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; - public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; - public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; - public static final int CRANKING_CURVE_SIZE = 8; - public static final int CRITICAL_BUFFER_SIZE = 120; - public static final String CRITICAL_PREFIX = "CRITICAL"; - public static final int DC_PER_STEPPER = 2; - public static final int DIGIPOT_COUNT = 4; - public static final int DWELL_CURVE_SIZE = 8; public static final int EGT_CHANNEL_COUNT = 8; - public static final String ENGINE_MAKE_BMW = "BMW"; - public static final String ENGINE_MAKE_GM = "GM"; - public static final String ENGINE_MAKE_HONDA = "Honda"; - public static final String ENGINE_MAKE_Hyundai = "Hyundai"; - public static final String ENGINE_MAKE_LADA = "Lada"; - public static final String ENGINE_MAKE_MAZDA = "Mazda"; - public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; - public static final String ENGINE_MAKE_NISSAN = "Nissan"; - public static final String ENGINE_MAKE_SUBARU = "Subaru"; - public static final String ENGINE_MAKE_TOYOTA = "Toyota"; - public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 16; - public static final int ENGINE_SNIFFER_UNIT_US = 10; - public static final int ETB_BIAS_CURVE_LENGTH = 8; - public static final int ETB_COUNT = 2; - public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10021; - public static final int FUEL_LEVEL_TABLE_COUNT = 8; - public static final int FUEL_LOAD_COUNT = 16; - public static final int FUEL_RPM_COUNT = 16; - public static final int GAP_TRACKING_LENGTH = 18; public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_ETB = "ETB more"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_SYNC = "Sync"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; - public static final String GAUGE_COIL_DWELL_TIME = "Ignition: coil charge time"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -147,7 +54,7 @@ public class TriggerState { public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; - public static final String GAUGE_NAME_DWELL_DUTY = "Ignition: coil duty cycle"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; @@ -164,7 +71,7 @@ public class TriggerState { public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; - public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last Inj Pulsewidth"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; @@ -184,7 +91,7 @@ public class TriggerState { public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_IAT = "IAT"; public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; - public static final String GAUGE_NAME_IGNITION_LOAD = "Ignition: load"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; @@ -218,11 +125,11 @@ public class TriggerState { public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; - public static final String GAUGE_NAME_TIMING_ADVANCE = "Timing: base ignition"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; public static final String GAUGE_NAME_TPS2 = "TPS2"; public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; - public static final String GAUGE_NAME_TRG_GAP = "Sync: Trigger Latest Ratio"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; public static final String GAUGE_NAME_UPTIME = "Uptime"; @@ -242,44 +149,14 @@ public class TriggerState { public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; public static final int GEARS_COUNT = 8; - public static final int GPPWM_CHANNELS = 4; - public static final int GPPWM_LOAD_COUNT = 8; - public static final int GPPWM_NOTE_SIZE = 16; - public static final int GPPWM_RPM_COUNT = 8; - public static final int HIGH_SPEED_COUNT = 32; - public static final int HPFP_COMPENSATION_SIZE = 10; - public static final int HPFP_DEADTIME_SIZE = 8; - public static final int HPFP_LOBE_PROFILE_SIZE = 16; - public static final int HPFP_TARGET_SIZE = 10; - public static final int HW_MAX_ADC_INDEX = 17; - public static final int IAC_PID_MULT_SIZE = 8; - public static final int IAT_CURVE_SIZE = 16; - public static final int IDLE_ADVANCE_CURVE_SIZE = 8; - public static final int IDLE_VE_SIZE = 4; public static final int IGN_BLEND_COUNT = 4; - public static final int IGN_LOAD_COUNT = 16; - public static final int IGN_RPM_COUNT = 16; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; - public static final String LOG_DELIMITER = "`"; - public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; public static final int LUA_ANALOG_INPUT_COUNT = 8; - public static final int LUA_DIGITAL_INPUT_COUNT = 8; public static final int LUA_GAUGE_COUNT = 2; - public static final int LUA_PWM_COUNT = 8; - public static final int LUA_SCRIPT_SIZE = 8000; - public static final int MAF_DECODING_COUNT = 256; - public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; - public static final int MAP_ANGLE_SIZE = 8; - public static final int MAP_WINDOW_SIZE = 8; public static final int MAX_CYLINDER_COUNT = 12; - public static final int MLQ_FIELD_HEADER_SIZE = 89; - public static final int MLQ_HEADER_SIZE = 24; - public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; - public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; - public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_AFR_CFG = 10; @@ -296,119 +173,8 @@ public class TriggerState { public static final int PACK_MULT_TEMPERATURE = 100; public static final int PACK_MULT_VOLTAGE = 1000; public static final int PACK_MULT_VSS = 100; - public static final int PEDAL_TO_TPS_SIZE = 8; - public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; - public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; - public static final String PROTOCOL_CRANK1 = "t1"; - public static final String PROTOCOL_CRANK2 = "t2"; - public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; - public static final String PROTOCOL_ES_DOWN = "d"; - public static final String PROTOCOL_ES_UP = "u"; - public static final String PROTOCOL_HELLO_PREFIX = "***"; - public static final String PROTOCOL_HIP_NAME = "HIP"; - public static final String PROTOCOL_HPFP_NAME = "hpfp"; - public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; - public static final String PROTOCOL_MSG = "msg"; - public static final String PROTOCOL_OUTPIN = "outpin"; - public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; - public static final String PROTOCOL_TACH_NAME = "tach"; - public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; - public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; - public static final String PROTOCOL_VVT1_NAME = "VVT1"; - public static final String PROTOCOL_VVT2_NAME = "VVT2"; - public static final String PROTOCOL_VVT3_NAME = "VVT3"; - public static final String PROTOCOL_VVT4_NAME = "VVT4"; - public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; - public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; - public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; - public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; - public static final int SCRIPT_CURVE_16 = 16; - public static final int SCRIPT_CURVE_8 = 8; - public static final int SCRIPT_CURVE_COUNT = 6; - public static final int SCRIPT_SETTING_COUNT = 8; - public static final int SCRIPT_TABLE_8 = 8; - public static final int SCRIPT_TABLE_COUNT = 4; - public static final int SENT_INPUT_COUNT = 1; - public static final int STFT_BANK_COUNT = 2; - public static final int STFT_CELL_COUNT = 4; - public static final int TCU_GEAR_COUNT = 10; - public static final int TCU_MAGIC_SIZE = 8; - public static final int TCU_SOLENOID_COUNT = 6; - public static final int TOOTH_DATA_LENGTH = 2000; - public static final int TOOTH_PACKET_COUNT = 1000; - public static final int TOOTH_PACKET_SIZE = 2; - public static final String TOP_DEAD_CENTER_MESSAGE = "r"; - public static final int TORQUE_CURVE_SIZE = 6; public static final int TPS_2_BYTE_PACKING_MULT = 100; - public static final int TPS_TPS_ACCEL_CLT_CORR_TABLE = 4; - public static final int TPS_TPS_ACCEL_TABLE = 8; - public static final String TRIGGER_COMMENT = "#"; - public static final String TRIGGER_CYCLE_DURATION = "cycleDuration"; - public static final String TRIGGER_GAP_FROM = "gapFrom"; - public static final String TRIGGER_GAP_TO = "gapTo"; - public static final String TRIGGER_GAPS_COUNT = "gapsCount"; - public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; - public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; - public static final int TRIGGER_INPUT_PIN_COUNT = 2; - public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; - public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; - public static final String TRIGGER_WITH_SYNC = "isSynchronizationNeeded"; - public static final String TRIGGERS_FILE_NAME = "triggers.txt"; - public static final int TRIM_SIZE = 4; - public static final int TS_BLOCK_READ_TIMEOUT = 3000; - public static final char TS_BURN_COMMAND = 'B'; - public static final char TS_CHUNK_WRITE_COMMAND = 'C'; - public static final char TS_COMMAND_F = 'F'; - public static final int TS_COMPOSITE_DISABLE = 2; - public static final int TS_COMPOSITE_ENABLE = 1; - public static final int TS_COMPOSITE_READ = 3; - public static final char TS_CRC_CHECK_COMMAND = 'k'; - public static final char TS_EXECUTE = 'E'; - public static final int TS_FILE_VERSION = 20210312; - public static final int TS_FILE_VERSION_OFFSET = 124; - public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; - public static final char TS_GET_CONFIG_ERROR = 'e'; - public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_OUTPUTS_SIZE = '4'; - public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; - public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; - public static final char TS_GET_TEXT = 'G'; - public static final char TS_HELLO_COMMAND = 'S'; - public static final char TS_IO_TEST_COMMAND = 'Z'; - public static final char TS_ONLINE_PROTOCOL = 'z'; - public static final char TS_OUTPUT_COMMAND = 'O'; - public static final char TS_PAGE_COMMAND = 'P'; - public static final char TS_PERF_TRACE_BEGIN = '_'; - public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; - public static final String TS_PROTOCOL = "001"; - public static final char TS_QUERY_COMMAND = 'Q'; - public static final char TS_READ_COMMAND = 'R'; - public static final int TS_RESPONSE_BURN_OK = 4; - public static final int TS_RESPONSE_COMMAND_OK = 7; - public static final int TS_RESPONSE_CRC_FAILURE = 0x82; - public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; - public static final int TS_RESPONSE_OK = 0; - public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; - 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 char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final char TS_TEST_COMMAND = 't'; - public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; - public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; - public static final int TS_TRIGGER_SCOPE_DISABLE = 5; - public static final int TS_TRIGGER_SCOPE_ENABLE = 4; - public static final int TS_TRIGGER_SCOPE_READ = 6; - public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; - public static final int VEHICLE_INFO_SIZE = 32; - public static final int VIN_NUMBER_SIZE = 17; - public static final int VR_THRESHOLD_COUNT = 2; - public static final int VSS_FILTER_MAX = 200; - public static final int VSS_FILTER_MIN = 3; - public static final int WARNING_BUFFER_SIZE = 120; - public static final int WWAE_TABLE_SIZE = 8; public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1216); public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1216); public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 8, FieldType.INT).setScale(1.0).setBaseOffset(1216); diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java index 02e5ec3948..8e4456192f 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java @@ -1,114 +1,21 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Sat Apr 29 01:39:32 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Sat Apr 29 21:01:06 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TriggerStatePrimary { - public static final int ADC_CHANNEL_NONE = 0; - public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; - public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; - public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; - public static final int AUX_DIGITAL_VALVE_COUNT = 2; public static final int BANKS_COUNT = 2; - public static final int BARO_CORR_SIZE = 4; - public static final int BLOCKING_FACTOR = 750; - public static final int BOOST_LOAD_COUNT = 8; - public static final int BOOST_RPM_COUNT = 8; public static final int CAM_INPUTS_COUNT = 4; public static final int CAMS_PER_BANK = 2; - public static final int CAN_DEFAULT_BASE = 0x200; - public static final int CAN_ECU_HW_META = 0xAB1234; - public static final int CAN_ECU_SERIAL_RX_ID = 0x100; - public static final int CAN_ECU_SERIAL_TX_ID = 0x102; - public static final String CAN_RX_PREFIX = "CAN_rx"; - public static final int CLT_CRANKING_CURVE_SIZE = 8; - public static final int CLT_CURVE_SIZE = 16; - public static final int CLT_LIMITER_CURVE_SIZE = 4; - public static final int CLT_TIMING_CURVE_SIZE = 8; - public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; - public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; - public static final String CMD_BOOST_PIN = "set_boost_pin"; - public static final String CMD_BURNCONFIG = "burnconfig"; - public static final String CMD_DATE = "date"; - public static final String CMD_DISABLE = "disable"; - public static final String CMD_ECU_UNLOCK = "unlock"; - public static final String CMD_ENABLE = "enable"; - public static final String CMD_ENGINE_TYPE = "engine_type"; - public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; - public static final String CMD_ETB_DUTY = "set_etb_duty"; - public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; - public static final String CMD_FAN2_BENCH = "fan2bench"; - public static final String CMD_FAN_BENCH = "fanbench"; - public static final String CMD_FUEL_BENCH = "fuelbench"; - public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; - public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; - public static final String CMD_GET = "get"; - public static final String CMD_HPFP_BENCH = "hpfpbench"; - public static final String CMD_IDLE_BENCH = "idlebench"; - public static final String CMD_IDLE_PIN = "set_idle_pin"; - public static final String CMD_IGNITION = "ignition"; - public static final String CMD_IGNITION_PIN = "set_ignition_pin"; - public static final String CMD_INJECTION = "injection"; - public static final String CMD_INJECTION_PIN = "set_injection_pin"; - public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; - public static final String CMD_MIL_BENCH = "milbench"; - public static final String CMD_PINS = "pins"; - public static final String CMD_PWM = "pwm"; - public static final String CMD_REBOOT = "reboot"; - public static final String CMD_REBOOT_DFU = "reboot_dfu"; - public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; - public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; - public static final String CMD_RPM = "rpm"; - public static final String CMD_SELF_STIMULATION = "self_stimulation"; - public static final String CMD_SET = "set"; - public static final String CMD_SPARK_BENCH = "sparkbench"; - public static final String CMD_STARTER_BENCH = "starterbench"; - public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; - public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; - public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; - public static final String CMD_TRIGGERINFO = "triggerinfo"; - public static final String CMD_VSS_PIN = "vss_pin"; - public static final String CMD_WRITECONFIG = "writeconfig"; - public static final int COMPOSITE_PACKET_SIZE = 5; - public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; - public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; - public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; - public static final int CRANKING_CURVE_SIZE = 8; - public static final int CRITICAL_BUFFER_SIZE = 120; - public static final String CRITICAL_PREFIX = "CRITICAL"; - public static final int DC_PER_STEPPER = 2; - public static final int DIGIPOT_COUNT = 4; - public static final int DWELL_CURVE_SIZE = 8; public static final int EGT_CHANNEL_COUNT = 8; - public static final String ENGINE_MAKE_BMW = "BMW"; - public static final String ENGINE_MAKE_GM = "GM"; - public static final String ENGINE_MAKE_HONDA = "Honda"; - public static final String ENGINE_MAKE_Hyundai = "Hyundai"; - public static final String ENGINE_MAKE_LADA = "Lada"; - public static final String ENGINE_MAKE_MAZDA = "Mazda"; - public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; - public static final String ENGINE_MAKE_NISSAN = "Nissan"; - public static final String ENGINE_MAKE_SUBARU = "Subaru"; - public static final String ENGINE_MAKE_TOYOTA = "Toyota"; - public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 16; - public static final int ENGINE_SNIFFER_UNIT_US = 10; - public static final int ETB_BIAS_CURVE_LENGTH = 8; - public static final int ETB_COUNT = 2; - public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10021; - public static final int FUEL_LEVEL_TABLE_COUNT = 8; - public static final int FUEL_LOAD_COUNT = 16; - public static final int FUEL_RPM_COUNT = 16; - public static final int GAP_TRACKING_LENGTH = 18; public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_ETB = "ETB more"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_SYNC = "Sync"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; - public static final String GAUGE_COIL_DWELL_TIME = "Ignition: coil charge time"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -147,7 +54,7 @@ public class TriggerStatePrimary { public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; - public static final String GAUGE_NAME_DWELL_DUTY = "Ignition: coil duty cycle"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; @@ -164,7 +71,7 @@ public class TriggerStatePrimary { public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; - public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last Inj Pulsewidth"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; @@ -184,7 +91,7 @@ public class TriggerStatePrimary { public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_IAT = "IAT"; public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; - public static final String GAUGE_NAME_IGNITION_LOAD = "Ignition: load"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; @@ -218,11 +125,11 @@ public class TriggerStatePrimary { public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; - public static final String GAUGE_NAME_TIMING_ADVANCE = "Timing: base ignition"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; public static final String GAUGE_NAME_TPS2 = "TPS2"; public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; - public static final String GAUGE_NAME_TRG_GAP = "Sync: Trigger Latest Ratio"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; public static final String GAUGE_NAME_UPTIME = "Uptime"; @@ -242,44 +149,14 @@ public class TriggerStatePrimary { public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; public static final int GEARS_COUNT = 8; - public static final int GPPWM_CHANNELS = 4; - public static final int GPPWM_LOAD_COUNT = 8; - public static final int GPPWM_NOTE_SIZE = 16; - public static final int GPPWM_RPM_COUNT = 8; - public static final int HIGH_SPEED_COUNT = 32; - public static final int HPFP_COMPENSATION_SIZE = 10; - public static final int HPFP_DEADTIME_SIZE = 8; - public static final int HPFP_LOBE_PROFILE_SIZE = 16; - public static final int HPFP_TARGET_SIZE = 10; - public static final int HW_MAX_ADC_INDEX = 17; - public static final int IAC_PID_MULT_SIZE = 8; - public static final int IAT_CURVE_SIZE = 16; - public static final int IDLE_ADVANCE_CURVE_SIZE = 8; - public static final int IDLE_VE_SIZE = 4; public static final int IGN_BLEND_COUNT = 4; - public static final int IGN_LOAD_COUNT = 16; - public static final int IGN_RPM_COUNT = 16; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; - public static final String LOG_DELIMITER = "`"; - public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; public static final int LUA_ANALOG_INPUT_COUNT = 8; - public static final int LUA_DIGITAL_INPUT_COUNT = 8; public static final int LUA_GAUGE_COUNT = 2; - public static final int LUA_PWM_COUNT = 8; - public static final int LUA_SCRIPT_SIZE = 8000; - public static final int MAF_DECODING_COUNT = 256; - public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; - public static final int MAP_ANGLE_SIZE = 8; - public static final int MAP_WINDOW_SIZE = 8; public static final int MAX_CYLINDER_COUNT = 12; - public static final int MLQ_FIELD_HEADER_SIZE = 89; - public static final int MLQ_HEADER_SIZE = 24; - public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; - public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; - public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_AFR_CFG = 10; @@ -296,119 +173,8 @@ public class TriggerStatePrimary { public static final int PACK_MULT_TEMPERATURE = 100; public static final int PACK_MULT_VOLTAGE = 1000; public static final int PACK_MULT_VSS = 100; - public static final int PEDAL_TO_TPS_SIZE = 8; - public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; - public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; - public static final String PROTOCOL_CRANK1 = "t1"; - public static final String PROTOCOL_CRANK2 = "t2"; - public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; - public static final String PROTOCOL_ES_DOWN = "d"; - public static final String PROTOCOL_ES_UP = "u"; - public static final String PROTOCOL_HELLO_PREFIX = "***"; - public static final String PROTOCOL_HIP_NAME = "HIP"; - public static final String PROTOCOL_HPFP_NAME = "hpfp"; - public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; - public static final String PROTOCOL_MSG = "msg"; - public static final String PROTOCOL_OUTPIN = "outpin"; - public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; - public static final String PROTOCOL_TACH_NAME = "tach"; - public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; - public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; - public static final String PROTOCOL_VVT1_NAME = "VVT1"; - public static final String PROTOCOL_VVT2_NAME = "VVT2"; - public static final String PROTOCOL_VVT3_NAME = "VVT3"; - public static final String PROTOCOL_VVT4_NAME = "VVT4"; - public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; - public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; - public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; - public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; - public static final int SCRIPT_CURVE_16 = 16; - public static final int SCRIPT_CURVE_8 = 8; - public static final int SCRIPT_CURVE_COUNT = 6; - public static final int SCRIPT_SETTING_COUNT = 8; - public static final int SCRIPT_TABLE_8 = 8; - public static final int SCRIPT_TABLE_COUNT = 4; - public static final int SENT_INPUT_COUNT = 1; - public static final int STFT_BANK_COUNT = 2; - public static final int STFT_CELL_COUNT = 4; - public static final int TCU_GEAR_COUNT = 10; - public static final int TCU_MAGIC_SIZE = 8; - public static final int TCU_SOLENOID_COUNT = 6; - public static final int TOOTH_DATA_LENGTH = 2000; - public static final int TOOTH_PACKET_COUNT = 1000; - public static final int TOOTH_PACKET_SIZE = 2; - public static final String TOP_DEAD_CENTER_MESSAGE = "r"; - public static final int TORQUE_CURVE_SIZE = 6; public static final int TPS_2_BYTE_PACKING_MULT = 100; - public static final int TPS_TPS_ACCEL_CLT_CORR_TABLE = 4; - public static final int TPS_TPS_ACCEL_TABLE = 8; - public static final String TRIGGER_COMMENT = "#"; - public static final String TRIGGER_CYCLE_DURATION = "cycleDuration"; - public static final String TRIGGER_GAP_FROM = "gapFrom"; - public static final String TRIGGER_GAP_TO = "gapTo"; - public static final String TRIGGER_GAPS_COUNT = "gapsCount"; - public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; - public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; - public static final int TRIGGER_INPUT_PIN_COUNT = 2; - public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; - public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; - public static final String TRIGGER_WITH_SYNC = "isSynchronizationNeeded"; - public static final String TRIGGERS_FILE_NAME = "triggers.txt"; - public static final int TRIM_SIZE = 4; - public static final int TS_BLOCK_READ_TIMEOUT = 3000; - public static final char TS_BURN_COMMAND = 'B'; - public static final char TS_CHUNK_WRITE_COMMAND = 'C'; - public static final char TS_COMMAND_F = 'F'; - public static final int TS_COMPOSITE_DISABLE = 2; - public static final int TS_COMPOSITE_ENABLE = 1; - public static final int TS_COMPOSITE_READ = 3; - public static final char TS_CRC_CHECK_COMMAND = 'k'; - public static final char TS_EXECUTE = 'E'; - public static final int TS_FILE_VERSION = 20210312; - public static final int TS_FILE_VERSION_OFFSET = 124; - public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; - public static final char TS_GET_CONFIG_ERROR = 'e'; - public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_OUTPUTS_SIZE = '4'; - public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; - public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; - public static final char TS_GET_TEXT = 'G'; - public static final char TS_HELLO_COMMAND = 'S'; - public static final char TS_IO_TEST_COMMAND = 'Z'; - public static final char TS_ONLINE_PROTOCOL = 'z'; - public static final char TS_OUTPUT_COMMAND = 'O'; - public static final char TS_PAGE_COMMAND = 'P'; - public static final char TS_PERF_TRACE_BEGIN = '_'; - public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; - public static final String TS_PROTOCOL = "001"; - public static final char TS_QUERY_COMMAND = 'Q'; - public static final char TS_READ_COMMAND = 'R'; - public static final int TS_RESPONSE_BURN_OK = 4; - public static final int TS_RESPONSE_COMMAND_OK = 7; - public static final int TS_RESPONSE_CRC_FAILURE = 0x82; - public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; - public static final int TS_RESPONSE_OK = 0; - public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; - 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 char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final char TS_TEST_COMMAND = 't'; - public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; - public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; - public static final int TS_TRIGGER_SCOPE_DISABLE = 5; - public static final int TS_TRIGGER_SCOPE_ENABLE = 4; - public static final int TS_TRIGGER_SCOPE_READ = 6; - public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; - public static final int VEHICLE_INFO_SIZE = 32; - public static final int VIN_NUMBER_SIZE = 17; - public static final int VR_THRESHOLD_COUNT = 2; - public static final int VSS_FILTER_MAX = 200; - public static final int VSS_FILTER_MIN = 3; - public static final int WARNING_BUFFER_SIZE = 120; - public static final int WWAE_TABLE_SIZE = 8; public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 0, FieldType.BIT, 0).setBaseOffset(1240); public static final Field[] VALUES = { M_HASSYNCHRONIZEDPHASE, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index d066c2458e..4c8f7602e8 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,114 +1,21 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Apr 29 01:39:31 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Apr 29 21:01:06 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TsOutputs { - public static final int ADC_CHANNEL_NONE = 0; - public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; - public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; - public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; - public static final int AUX_DIGITAL_VALVE_COUNT = 2; public static final int BANKS_COUNT = 2; - public static final int BARO_CORR_SIZE = 4; - public static final int BLOCKING_FACTOR = 750; - public static final int BOOST_LOAD_COUNT = 8; - public static final int BOOST_RPM_COUNT = 8; public static final int CAM_INPUTS_COUNT = 4; public static final int CAMS_PER_BANK = 2; - public static final int CAN_DEFAULT_BASE = 0x200; - public static final int CAN_ECU_HW_META = 0xAB1234; - public static final int CAN_ECU_SERIAL_RX_ID = 0x100; - public static final int CAN_ECU_SERIAL_TX_ID = 0x102; - public static final String CAN_RX_PREFIX = "CAN_rx"; - public static final int CLT_CRANKING_CURVE_SIZE = 8; - public static final int CLT_CURVE_SIZE = 16; - public static final int CLT_LIMITER_CURVE_SIZE = 4; - public static final int CLT_TIMING_CURVE_SIZE = 8; - public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; - public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; - public static final String CMD_BOOST_PIN = "set_boost_pin"; - public static final String CMD_BURNCONFIG = "burnconfig"; - public static final String CMD_DATE = "date"; - public static final String CMD_DISABLE = "disable"; - public static final String CMD_ECU_UNLOCK = "unlock"; - public static final String CMD_ENABLE = "enable"; - public static final String CMD_ENGINE_TYPE = "engine_type"; - public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; - public static final String CMD_ETB_DUTY = "set_etb_duty"; - public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; - public static final String CMD_FAN2_BENCH = "fan2bench"; - public static final String CMD_FAN_BENCH = "fanbench"; - public static final String CMD_FUEL_BENCH = "fuelbench"; - public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; - public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; - public static final String CMD_GET = "get"; - public static final String CMD_HPFP_BENCH = "hpfpbench"; - public static final String CMD_IDLE_BENCH = "idlebench"; - public static final String CMD_IDLE_PIN = "set_idle_pin"; - public static final String CMD_IGNITION = "ignition"; - public static final String CMD_IGNITION_PIN = "set_ignition_pin"; - public static final String CMD_INJECTION = "injection"; - public static final String CMD_INJECTION_PIN = "set_injection_pin"; - public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; - public static final String CMD_MIL_BENCH = "milbench"; - public static final String CMD_PINS = "pins"; - public static final String CMD_PWM = "pwm"; - public static final String CMD_REBOOT = "reboot"; - public static final String CMD_REBOOT_DFU = "reboot_dfu"; - public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; - public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; - public static final String CMD_RPM = "rpm"; - public static final String CMD_SELF_STIMULATION = "self_stimulation"; - public static final String CMD_SET = "set"; - public static final String CMD_SPARK_BENCH = "sparkbench"; - public static final String CMD_STARTER_BENCH = "starterbench"; - public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; - public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; - public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; - public static final String CMD_TRIGGERINFO = "triggerinfo"; - public static final String CMD_VSS_PIN = "vss_pin"; - public static final String CMD_WRITECONFIG = "writeconfig"; - public static final int COMPOSITE_PACKET_SIZE = 5; - public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; - public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; - public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; - public static final int CRANKING_CURVE_SIZE = 8; - public static final int CRITICAL_BUFFER_SIZE = 120; - public static final String CRITICAL_PREFIX = "CRITICAL"; - public static final int DC_PER_STEPPER = 2; - public static final int DIGIPOT_COUNT = 4; - public static final int DWELL_CURVE_SIZE = 8; public static final int EGT_CHANNEL_COUNT = 8; - public static final String ENGINE_MAKE_BMW = "BMW"; - public static final String ENGINE_MAKE_GM = "GM"; - public static final String ENGINE_MAKE_HONDA = "Honda"; - public static final String ENGINE_MAKE_Hyundai = "Hyundai"; - public static final String ENGINE_MAKE_LADA = "Lada"; - public static final String ENGINE_MAKE_MAZDA = "Mazda"; - public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; - public static final String ENGINE_MAKE_NISSAN = "Nissan"; - public static final String ENGINE_MAKE_SUBARU = "Subaru"; - public static final String ENGINE_MAKE_TOYOTA = "Toyota"; - public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 16; - public static final int ENGINE_SNIFFER_UNIT_US = 10; - public static final int ETB_BIAS_CURVE_LENGTH = 8; - public static final int ETB_COUNT = 2; - public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10021; - public static final int FUEL_LEVEL_TABLE_COUNT = 8; - public static final int FUEL_LOAD_COUNT = 16; - public static final int FUEL_RPM_COUNT = 16; - public static final int GAP_TRACKING_LENGTH = 18; public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_ETB = "ETB more"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_SYNC = "Sync"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; - public static final String GAUGE_COIL_DWELL_TIME = "Ignition: coil charge time"; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -147,7 +54,7 @@ public class TsOutputs { public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; - public static final String GAUGE_NAME_DWELL_DUTY = "Ignition: coil duty cycle"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; @@ -164,7 +71,7 @@ public class TsOutputs { public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; - public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last Inj Pulsewidth"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; @@ -184,7 +91,7 @@ public class TsOutputs { public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_IAT = "IAT"; public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; - public static final String GAUGE_NAME_IGNITION_LOAD = "Ignition: load"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; @@ -218,11 +125,11 @@ public class TsOutputs { public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; - public static final String GAUGE_NAME_TIMING_ADVANCE = "Timing: base ignition"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; public static final String GAUGE_NAME_TPS2 = "TPS2"; public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; - public static final String GAUGE_NAME_TRG_GAP = "Sync: Trigger Latest Ratio"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; public static final String GAUGE_NAME_UPTIME = "Uptime"; @@ -242,44 +149,14 @@ public class TsOutputs { public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; public static final int GEARS_COUNT = 8; - public static final int GPPWM_CHANNELS = 4; - public static final int GPPWM_LOAD_COUNT = 8; - public static final int GPPWM_NOTE_SIZE = 16; - public static final int GPPWM_RPM_COUNT = 8; - public static final int HIGH_SPEED_COUNT = 32; - public static final int HPFP_COMPENSATION_SIZE = 10; - public static final int HPFP_DEADTIME_SIZE = 8; - public static final int HPFP_LOBE_PROFILE_SIZE = 16; - public static final int HPFP_TARGET_SIZE = 10; - public static final int HW_MAX_ADC_INDEX = 17; - public static final int IAC_PID_MULT_SIZE = 8; - public static final int IAT_CURVE_SIZE = 16; - public static final int IDLE_ADVANCE_CURVE_SIZE = 8; - public static final int IDLE_VE_SIZE = 4; public static final int IGN_BLEND_COUNT = 4; - public static final int IGN_LOAD_COUNT = 16; - public static final int IGN_RPM_COUNT = 16; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; - public static final String LOG_DELIMITER = "`"; - public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; public static final int LUA_ANALOG_INPUT_COUNT = 8; - public static final int LUA_DIGITAL_INPUT_COUNT = 8; public static final int LUA_GAUGE_COUNT = 2; - public static final int LUA_PWM_COUNT = 8; - public static final int LUA_SCRIPT_SIZE = 8000; - public static final int MAF_DECODING_COUNT = 256; - public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; - public static final int MAP_ANGLE_SIZE = 8; - public static final int MAP_WINDOW_SIZE = 8; public static final int MAX_CYLINDER_COUNT = 12; - public static final int MLQ_FIELD_HEADER_SIZE = 89; - public static final int MLQ_HEADER_SIZE = 24; - public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; - public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; - public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_AFR_CFG = 10; @@ -296,119 +173,8 @@ public class TsOutputs { public static final int PACK_MULT_TEMPERATURE = 100; public static final int PACK_MULT_VOLTAGE = 1000; public static final int PACK_MULT_VSS = 100; - public static final int PEDAL_TO_TPS_SIZE = 8; - public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; - public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; - public static final String PROTOCOL_CRANK1 = "t1"; - public static final String PROTOCOL_CRANK2 = "t2"; - public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; - public static final String PROTOCOL_ES_DOWN = "d"; - public static final String PROTOCOL_ES_UP = "u"; - public static final String PROTOCOL_HELLO_PREFIX = "***"; - public static final String PROTOCOL_HIP_NAME = "HIP"; - public static final String PROTOCOL_HPFP_NAME = "hpfp"; - public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; - public static final String PROTOCOL_MSG = "msg"; - public static final String PROTOCOL_OUTPIN = "outpin"; - public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; - public static final String PROTOCOL_TACH_NAME = "tach"; - public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; - public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; - public static final String PROTOCOL_VVT1_NAME = "VVT1"; - public static final String PROTOCOL_VVT2_NAME = "VVT2"; - public static final String PROTOCOL_VVT3_NAME = "VVT3"; - public static final String PROTOCOL_VVT4_NAME = "VVT4"; - public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; - public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; - public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; - public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; - public static final int SCRIPT_CURVE_16 = 16; - public static final int SCRIPT_CURVE_8 = 8; - public static final int SCRIPT_CURVE_COUNT = 6; - public static final int SCRIPT_SETTING_COUNT = 8; - public static final int SCRIPT_TABLE_8 = 8; - public static final int SCRIPT_TABLE_COUNT = 4; - public static final int SENT_INPUT_COUNT = 1; - public static final int STFT_BANK_COUNT = 2; - public static final int STFT_CELL_COUNT = 4; - public static final int TCU_GEAR_COUNT = 10; - public static final int TCU_MAGIC_SIZE = 8; - public static final int TCU_SOLENOID_COUNT = 6; - public static final int TOOTH_DATA_LENGTH = 2000; - public static final int TOOTH_PACKET_COUNT = 1000; - public static final int TOOTH_PACKET_SIZE = 2; - public static final String TOP_DEAD_CENTER_MESSAGE = "r"; - public static final int TORQUE_CURVE_SIZE = 6; public static final int TPS_2_BYTE_PACKING_MULT = 100; - public static final int TPS_TPS_ACCEL_CLT_CORR_TABLE = 4; - public static final int TPS_TPS_ACCEL_TABLE = 8; - public static final String TRIGGER_COMMENT = "#"; - public static final String TRIGGER_CYCLE_DURATION = "cycleDuration"; - public static final String TRIGGER_GAP_FROM = "gapFrom"; - public static final String TRIGGER_GAP_TO = "gapTo"; - public static final String TRIGGER_GAPS_COUNT = "gapsCount"; - public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; - public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; - public static final int TRIGGER_INPUT_PIN_COUNT = 2; - public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; - public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; - public static final String TRIGGER_WITH_SYNC = "isSynchronizationNeeded"; - public static final String TRIGGERS_FILE_NAME = "triggers.txt"; - public static final int TRIM_SIZE = 4; - public static final int TS_BLOCK_READ_TIMEOUT = 3000; - public static final char TS_BURN_COMMAND = 'B'; - public static final char TS_CHUNK_WRITE_COMMAND = 'C'; - public static final char TS_COMMAND_F = 'F'; - public static final int TS_COMPOSITE_DISABLE = 2; - public static final int TS_COMPOSITE_ENABLE = 1; - public static final int TS_COMPOSITE_READ = 3; - public static final char TS_CRC_CHECK_COMMAND = 'k'; - public static final char TS_EXECUTE = 'E'; - public static final int TS_FILE_VERSION = 20210312; - public static final int TS_FILE_VERSION_OFFSET = 124; - public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; - public static final char TS_GET_CONFIG_ERROR = 'e'; - public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_OUTPUTS_SIZE = '4'; - public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; - public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; - public static final char TS_GET_TEXT = 'G'; - public static final char TS_HELLO_COMMAND = 'S'; - public static final char TS_IO_TEST_COMMAND = 'Z'; - public static final char TS_ONLINE_PROTOCOL = 'z'; - public static final char TS_OUTPUT_COMMAND = 'O'; - public static final char TS_PAGE_COMMAND = 'P'; - public static final char TS_PERF_TRACE_BEGIN = '_'; - public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; - public static final String TS_PROTOCOL = "001"; - public static final char TS_QUERY_COMMAND = 'Q'; - public static final char TS_READ_COMMAND = 'R'; - public static final int TS_RESPONSE_BURN_OK = 4; - public static final int TS_RESPONSE_COMMAND_OK = 7; - public static final int TS_RESPONSE_CRC_FAILURE = 0x82; - public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; - public static final int TS_RESPONSE_OK = 0; - public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; - 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 char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final char TS_TEST_COMMAND = 't'; - public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; - public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; - public static final int TS_TRIGGER_SCOPE_DISABLE = 5; - public static final int TS_TRIGGER_SCOPE_ENABLE = 4; - public static final int TS_TRIGGER_SCOPE_READ = 6; - public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; - public static final int VEHICLE_INFO_SIZE = 32; - public static final int VIN_NUMBER_SIZE = 17; - public static final int VR_THRESHOLD_COUNT = 2; - public static final int VSS_FILTER_MAX = 200; - public static final int VSS_FILTER_MIN = 3; - public static final int WARNING_BUFFER_SIZE = 120; - public static final int WWAE_TABLE_SIZE = 8; public static final Field SD_PRESENT = Field.create("SD_PRESENT", 0, FieldType.BIT, 0).setBaseOffset(0); public static final Field SD_LOGGING_INTERNAL = Field.create("SD_LOGGING_INTERNAL", 0, FieldType.BIT, 1).setBaseOffset(0); public static final Field TRIGGERSCOPEREADY = Field.create("TRIGGERSCOPEREADY", 0, FieldType.BIT, 2).setBaseOffset(0);