diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index f66ec5ce06..331981c840 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -292,15 +292,15 @@ static void printSensors(Logging *log, bool fileFormat) { if (fileFormat) { reportSensorF(log, fileFormat, "f: tps delta", "v", engine->tpsAccelEnrichment.getMaxDelta(), 2); - reportSensorF(log, fileFormat, "f: tps fuel", "ms", engine->engineState.tpsAccelEnrich, 2); + reportSensorF(log, fileFormat, GAUGE_NAME_FUEL_TPS_EXTRA, "ms", engine->engineState.tpsAccelEnrich, 2); reportSensorF(log, fileFormat, "f: el delta", "v", engine->engineLoadAccelEnrichment.getMaxDelta(), 2); if (hasMapSensor(PASS_ENGINE_PARAMETER_F)) { reportSensorF(log, fileFormat, "f: el fuel", "v", engine->engineLoadAccelEnrichment.getEngineLoadEnrichment(PASS_ENGINE_PARAMETER_F) * 100 / getMap(), 2); } - reportSensorF(log, fileFormat, "f: duty", "%", getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER), 2); - reportSensorF(log, fileFormat, "dwell: duty", "%", getCoilDutyCycle(rpm PASS_ENGINE_PARAMETER), 2); + reportSensorF(log, fileFormat, GAUGE_NAME_FUEL_INJ_DUTY, "%", getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER), 2); + reportSensorF(log, fileFormat, GAUGE_NAME_DWELL_DUTY, "%", getCoilDutyCycle(rpm PASS_ENGINE_PARAMETER), 2); } diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index f8e8c319c5..f9b5d4e61d 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1,3 +1,7 @@ +// +// generated by ConfigDefinition.jar tool based on rusefi_config.txt +// + #define ignitionPin2logic || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12)) #define ignitionPin3logic || ((firingOrder == 1) || (firingOrder == 3) || (firingOrder == 4) || (firingOrder == 5) || (firingOrder == 9)) #define ignitionPin4logic || ((firingOrder == 5) || (firingOrder == 7) || (firingOrder == 12)) @@ -1487,4 +1491,7 @@ #define fsioTable4RpmBins_offset_hex 3fd8 #define TOTAL_CONFIG_SIZE 16376 #define TOTAL_CONFIG_SIZE_hex 3ff8 -#define GAUGE_NAME_FUEL_TPS_EXTRA "fuel: tps acceleration extra fuel" +#define GAUGE_NAME_FUEL_TPS_EXTRA "fuel: TPS acceleration extra fuel" +#define GAUGE_NAME_FUEL_EL_EXTRA "fuel: engine load acceleration extra fuel" +#define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle" +#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index daabfc0e2d..8021afe7ce 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -864,4 +864,10 @@ float[FSIO_TABLE_8] fsioTable4RpmBins;RPM is float and not integer in order to u end_struct -#define GAUGE_NAME_FUEL_TPS_EXTRA "fuel: tps acceleration extra fuel" +#define GAUGE_NAME_FUEL_TPS_EXTRA "fuel: TPS acceleration extra fuel" +#define GAUGE_NAME_FUEL_EL_EXTRA "fuel: engine load acceleration extra fuel" + +#define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle" + + +#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" \ No newline at end of file