andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#382

This commit is contained in:
rusefi 2017-03-26 18:57:20 -04:00
parent a7d0dea541
commit 70f6201a8e
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/console/status_loop.cpp
View File

@ -292,15 +292,15 @@ static void printSensors(Logging *log, bool fileFormat) {
if (fileFormat) { if (fileFormat) {
reportSensorF(log, fileFormat, "f: tps delta", "v", engine->tpsAccelEnrichment.getMaxDelta(), 2); 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); reportSensorF(log, fileFormat, "f: el delta", "v", engine->engineLoadAccelEnrichment.getMaxDelta(), 2);
if (hasMapSensor(PASS_ENGINE_PARAMETER_F)) { 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: 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, GAUGE_NAME_FUEL_INJ_DUTY, "%", getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER), 2);
reportSensorF(log, fileFormat, "dwell: duty", "%", getCoilDutyCycle(rpm PASS_ENGINE_PARAMETER), 2); reportSensorF(log, fileFormat, GAUGE_NAME_DWELL_DUTY, "%", getCoilDutyCycle(rpm PASS_ENGINE_PARAMETER), 2);
} }

9
firmware/controllers/algo/rusefi_generated.h
View File

@ -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 ignitionPin2logic || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12))
#define ignitionPin3logic || ((firingOrder == 1) || (firingOrder == 3) || (firingOrder == 4) || (firingOrder == 5) || (firingOrder == 9)) #define ignitionPin3logic || ((firingOrder == 1) || (firingOrder == 3) || (firingOrder == 4) || (firingOrder == 5) || (firingOrder == 9))
#define ignitionPin4logic || ((firingOrder == 5) || (firingOrder == 7) || (firingOrder == 12)) #define ignitionPin4logic || ((firingOrder == 5) || (firingOrder == 7) || (firingOrder == 12))
@ -1487,4 +1491,7 @@
#define fsioTable4RpmBins_offset_hex 3fd8 #define fsioTable4RpmBins_offset_hex 3fd8
#define TOTAL_CONFIG_SIZE 16376 #define TOTAL_CONFIG_SIZE 16376
#define TOTAL_CONFIG_SIZE_hex 3ff8 #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"

8
firmware/integration/rusefi_config.txt
View File

@ -864,4 +864,10 @@ float[FSIO_TABLE_8] fsioTable4RpmBins;RPM is float and not integer in order to u
end_struct 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"