diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 973543b7bd..989398174d 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -217,17 +217,17 @@ static void printSensors(Logging *log, bool fileFormat) { #endif /* EFI_ANALOG_SENSORS */ if (hasAfrSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) { - reportSensorF(log, fileFormat, "afr", "AFR", getAfr(PASS_ENGINE_PARAMETER_SIGNATURE), 2); + reportSensorF(log, fileFormat, GAUGE_NAME_AFR, "AFR", getAfr(PASS_ENGINE_PARAMETER_SIGNATURE), 2); } #if EFI_IDLE_CONTROL || defined(__DOXYGEN__) if (fileFormat) { - reportSensorF(log, fileFormat, "idle", "%", getIdlePosition(), 2); + reportSensorF(log, fileFormat, GAUGE_NAME_IAC, "%", getIdlePosition(), 2); } #endif /* EFI_IDLE_CONTROL */ #if EFI_ANALOG_SENSORS || defined(__DOXYGEN__) - reportSensorF(log, fileFormat, "target", "AFR", engine->engineState.targetAFR, 2); + reportSensorF(log, fileFormat, GAUGE_NAME_TARGET_AFR, "AFR", engine->engineState.targetAFR, 2); #endif /* EFI_ANALOG_SENSORS */ if (fileFormat) { @@ -266,9 +266,9 @@ static void printSensors(Logging *log, bool fileFormat) { if (fileFormat) { floatms_t fuelBase = getBaseFuel(rpm PASS_ENGINE_PARAMETER_SUFFIX); reportSensorF(log, fileFormat, "f: base", "ms", fuelBase, 2); - reportSensorF(log, fileFormat, "f: actual", "ms", ENGINE(actualLastInjection), 2); + reportSensorF(log, fileFormat, GAUGE_NAME_FUEL_LAST_INJECTION, "ms", ENGINE(actualLastInjection), 2); reportSensorF(log, fileFormat, GAUGE_NAME_INJECTOR_LAG, "ms", engine->engineState.injectorLag, 2); - reportSensorF(log, fileFormat, "f: running", "ms", ENGINE(engineState.runningFuel), 2); + reportSensorF(log, fileFormat, GAUGE_NAME_FUEL_RUNNING, "ms", ENGINE(engineState.runningFuel), 2); reportSensorF(log, fileFormat, "f: pid", "ms", ENGINE(engineState.fuelPidCorrection), 2); reportSensorF(log, fileFormat, "f: wall amt", "v", ENGINE(wallFuel).getWallFuel(0), 2); diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 0c86414342..e3e3937924 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1532,7 +1532,12 @@ #define GAUGE_NAME_FUEL_CLT_CORR "fuel: CLT correction" #define GAUGE_NAME_FUEL_IAT_CORR "fuel: IAT correction" #define GAUGE_NAME_FUEL_VR "fuel: VE" +#define GAUGE_NAME_FUEL_RUNNING "fuel: running" +#define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: last injection" #define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle" #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" +#define GAUGE_NAME_TARGET_AFR "fuel: target AFR" +#define GAUGE_NAME_AFR "Air/Fuel Ratio" +#define GAUGE_NAME_IAC "Idle Air Valve" #define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index ec711f0ee3..df9f90ad81 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -907,9 +907,14 @@ end_struct #define GAUGE_NAME_FUEL_CLT_CORR "fuel: CLT correction" #define GAUGE_NAME_FUEL_IAT_CORR "fuel: IAT correction" #define GAUGE_NAME_FUEL_VR "fuel: VE" +#define GAUGE_NAME_FUEL_RUNNING "fuel: running" +#define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: last injection" #define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle" #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" +#define GAUGE_NAME_TARGET_AFR "fuel: target AFR" +#define GAUGE_NAME_AFR "Air/Fuel Ratio" +#define GAUGE_NAME_IAC "Idle Air Valve" #define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 6d1cef1a6f..e1706cd7c3 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -45,7 +45,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 22 18:26:06 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 22 19:37:38 EDT 2017 pageSize = 16376 page = 1 @@ -874,7 +874,7 @@ fileVersion = { 20161225 } ignitionAdvance = scalar, F32, 56, "deg", 1, 0.0; sparkDwellValue = scalar, F32, 60, "ms", 1, 0.0; ; actual total Ms time per engine cycle with all corrections - pulseWidth = scalar, F32, 64, "ms", 1, 0.0; + actualLastInjection = scalar, F32, 64, "ms", 1, 0.0; debugFloatField1 = scalar, F32, 68, "val", 1, 0.0; hasSdCard = bits, U32, 72, [0:0], "true", "false"; @@ -929,7 +929,10 @@ fileVersion = { 20161225 } iatCorrection = scalar, F32, 164, "%", 1, 0 wallFuelCorrection = scalar, F32, 168, "ms", 1, 0 curIdlePosition = scalar, F32, 172, "percent", 1, 0 + currentTargetAfr = scalar, F32, 176, "ratio", 1, 0 + chargeAirMass = scalar, F32, 180, "g", 1, 0 cltCorrection = scalar, F32, 184, "%", 1, 0 + fuelRunning = scalar, F32, 188, "g", 1, 0 debugIntField1 = scalar, U32, 192, "val", 1, 0.0; debugFloatField2 = scalar, F32, 200, "val", 1, 0.0; debugFloatField3 = scalar, F32, 204, "val", 1, 0.0; @@ -1221,10 +1224,12 @@ fileVersion = { 20161225 } triggerErrorsCounterGauge = triggerErrorsCounter, "trg err", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0 - pulseWidthGauge = pulseWidth, "fuel final squirt, per injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel final squirt, per injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + + fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 baseFuelGauge = baseFuel, "fuel: base duration, before corr", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: closed loop correction", "mSec", -11, 11, 1.0, 1.2, 20, 25, 3, 1 - coilDutyCycleGauge = coilDutyCycle, "dwell: duty cycle", "perc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 + coilDutyCycleGauge = coilDutyCycle, "dwell: coil duty cycle", "perc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 crankingFuelGauge = crankingFuel, "fuel: crank Width", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 iatCorrectionGauge = iatCorrection, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 @@ -1316,7 +1321,7 @@ fileVersion = { 20161225 } entry = TPS, "TPS", float, "%.2f" entry = MAF, "MAF", float, "%.2f" entry = MAPValue, "MAP", float, "%.1f" - entry = AFRactual, "AFR", float, "%.2f" + entry = AFRactual, "Air/Fuel Ratio", float, "%.2f" entry = VBatt, "VBatt", float, "%.2f" entry = engineLoad, "Engine Load", float, "%.1f" entry = ignitionAdvance, "timing", float, "%.2f" @@ -1327,15 +1332,17 @@ fileVersion = { 20161225 } entry = massAirFlowValue,"airMass", float, "%.3f" entry = pedalPosition, "pedal", float, "%.3f" entry = triggerErrorsCounter, "trg err",int, "%d" - entry = curIdlePosition, "idle position", float, "%.3f" + entry = curIdlePosition, "Idle Air Valve", float, "%.3f" - entry = pulseWidth, "fuel: pulse", float, "%.3f" + entry = fuelRunning, "fuel: running", float, "%.3f" + entry = actualLastInjection, "fuel: last injection", float, "%.3f" entry = baseFuel, "fuel: base", float, "%.2f" entry = fuelPidCorrection,"fuel: pid", float, "%.2f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" entry = coilDutyCycle, "dwell: coil duty cycle", float,"%.3f" + entry = currentTargetAfr,"fuel: target AFR", float,"%.3f" entry = engineLoadAccelExtra, "fuel: engine load acceleration extra fuel",float, "%.3f" entry = engineLoadDelta, "fuel: load change",float, "%.3f" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 50a47cf9fd..a348076f66 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -134,7 +134,7 @@ fileVersion = { 20161225 } ignitionAdvance = scalar, F32, 56, "deg", 1, 0.0; sparkDwellValue = scalar, F32, 60, "ms", 1, 0.0; ; actual total Ms time per engine cycle with all corrections - pulseWidth = scalar, F32, 64, "ms", 1, 0.0; + actualLastInjection = scalar, F32, 64, "ms", 1, 0.0; debugFloatField1 = scalar, F32, 68, "val", 1, 0.0; hasSdCard = bits, U32, 72, [0:0], "true", "false"; @@ -189,7 +189,10 @@ fileVersion = { 20161225 } iatCorrection = scalar, F32, 164, "%", 1, 0 wallFuelCorrection = scalar, F32, 168, "ms", 1, 0 curIdlePosition = scalar, F32, 172, "percent", 1, 0 + currentTargetAfr = scalar, F32, 176, "ratio", 1, 0 + chargeAirMass = scalar, F32, 180, "g", 1, 0 cltCorrection = scalar, F32, 184, "%", 1, 0 + fuelRunning = scalar, F32, 188, "g", 1, 0 debugIntField1 = scalar, U32, 192, "val", 1, 0.0; debugFloatField2 = scalar, F32, 200, "val", 1, 0.0; debugFloatField3 = scalar, F32, 204, "val", 1, 0.0; @@ -481,10 +484,12 @@ fileVersion = { 20161225 } triggerErrorsCounterGauge = triggerErrorsCounter, "trg err", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0 - pulseWidthGauge = pulseWidth, "fuel final squirt, per injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + actualLastInjectionGauge = actualLastInjection, "fuel final squirt, per injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + + fuelRunningGauge = fuelRunning, @@GAUGE_NAME_FUEL_RUNNING@@, "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 baseFuelGauge = baseFuel, "fuel: base duration, before corr", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: closed loop correction", "mSec", -11, 11, 1.0, 1.2, 20, 25, 3, 1 - coilDutyCycleGauge = coilDutyCycle, "dwell: duty cycle", "perc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 + coilDutyCycleGauge = coilDutyCycle, @@GAUGE_NAME_DWELL_DUTY@@, "perc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 crankingFuelGauge = crankingFuel, "fuel: crank Width", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 iatCorrectionGauge = iatCorrection, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 @@ -576,7 +581,7 @@ fileVersion = { 20161225 } entry = TPS, "TPS", float, "%.2f" entry = MAF, "MAF", float, "%.2f" entry = MAPValue, "MAP", float, "%.1f" - entry = AFRactual, "AFR", float, "%.2f" + entry = AFRactual, @@GAUGE_NAME_AFR@@, float, "%.2f" entry = VBatt, @@GAUGE_NAME_VBAT@@, float, "%.2f" entry = engineLoad, @@GAUGE_NAME_ENGINE_LOAD@@, float, "%.1f" entry = ignitionAdvance, @@GAUGE_NAME_TIMING_ADVANCE@@, float, "%.2f" @@ -587,15 +592,17 @@ fileVersion = { 20161225 } entry = massAirFlowValue,"airMass", float, "%.3f" entry = pedalPosition, "pedal", float, "%.3f" entry = triggerErrorsCounter, "trg err",int, "%d" - entry = curIdlePosition, "idle position", float, "%.3f" + entry = curIdlePosition, @@GAUGE_NAME_IAC@@, float, "%.3f" - entry = pulseWidth, "fuel: pulse", float, "%.3f" + entry = fuelRunning, @@GAUGE_NAME_FUEL_RUNNING@@, float, "%.3f" + entry = actualLastInjection, @@GAUGE_NAME_FUEL_LAST_INJECTION@@, float, "%.3f" entry = baseFuel, "fuel: base", float, "%.2f" entry = fuelPidCorrection,"fuel: pid", float, "%.2f" entry = veValue, @@GAUGE_NAME_FUEL_VR@@, float, "%.3f" entry = injectorDutyCycle,@@GAUGE_NAME_FUEL_INJ_DUTY@@,float,"%.3f" entry = coilDutyCycle, @@GAUGE_NAME_DWELL_DUTY@@, float,"%.3f" + entry = currentTargetAfr,@@GAUGE_NAME_TARGET_AFR@@, float,"%.3f" entry = engineLoadAccelExtra, @@GAUGE_NAME_FUEL_EL_EXTRA@@,float, "%.3f" entry = engineLoadDelta, "fuel: load change",float, "%.3f" diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 3d09c8c578..a3fd21f177 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 22 18:26:06 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 22 19:37:38 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -1056,8 +1056,13 @@ public class Fields { public static final String GAUGE_NAME_FUEL_CLT_CORR = "fuel: CLT correction"; public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; public static final String GAUGE_NAME_FUEL_VR = "fuel: VE"; + public static final String GAUGE_NAME_FUEL_RUNNING = "fuel: running"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: last injection"; public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; + public static final String GAUGE_NAME_TARGET_AFR = "fuel: target AFR"; + public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio"; + public static final String GAUGE_NAME_IAC = "Idle Air Valve"; public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final Field ENGINETYPE = Field.create("ENGINETYPE", 0, FieldType.INT);