rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#382

This commit is contained in:
rusefi 2017-04-13 23:22:54 -04:00
parent a77d4d8f79
commit 50fb764507
4 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/console/status_loop.cpp
View File

@ -245,11 +245,11 @@ static void printSensors(Logging *log, bool fileFormat) {
reportSensorI(log, fileFormat, "debugInt3", "v", tsOutputChannels.debugIntField3); reportSensorI(log, fileFormat, "debugInt3", "v", tsOutputChannels.debugIntField3);
#endif /* EFI_TUNER_STUDIO */ #endif /* EFI_TUNER_STUDIO */
reportSensorF(log, fileFormat, "tCharge", "K", engine->engineState.tChargeK, 2); // log column #8 reportSensorF(log, fileFormat, GAUGE_NAME_TCHARGE, "K", engine->engineState.tChargeK, 2); // log column #8
if (hasMapSensor(PASS_ENGINE_PARAMETER_F)) { if (hasMapSensor(PASS_ENGINE_PARAMETER_F)) {
reportSensorF(log, fileFormat, "curVE", "%", veMap.getValue(rpm, getMap()), 2); reportSensorF(log, fileFormat, "curVE", "%", veMap.getValue(rpm, getMap()), 2);
} }
reportSensorF(log, fileFormat, "VVT", "deg", engine->triggerCentral.vvtPosition, 1); reportSensorF(log, fileFormat, GAUGE_NAME_VVT, "deg", engine->triggerCentral.vvtPosition, 1);
} }
float engineLoad = getEngineLoadT(PASS_ENGINE_PARAMETER_F); float engineLoad = getEngineLoadT(PASS_ENGINE_PARAMETER_F);
@ -258,7 +258,7 @@ static void printSensors(Logging *log, bool fileFormat) {
reportSensorF(log, fileFormat, GAUGE_COIL_DWELL_TIME, "ms", ENGINE(engineState.sparkDwell), 2); reportSensorF(log, fileFormat, GAUGE_COIL_DWELL_TIME, "ms", ENGINE(engineState.sparkDwell), 2);
if (fileFormat) { if (fileFormat) {
reportSensorF(log, fileFormat, "timing", "deg", engine->engineState.timingAdvance, 2); reportSensorF(log, fileFormat, GAUGE_NAME_TIMING_ADVANCE, "deg", engine->engineState.timingAdvance, 2);
} }
@ -266,27 +266,27 @@ static void printSensors(Logging *log, bool fileFormat) {
floatms_t fuelBase = getBaseFuel(rpm PASS_ENGINE_PARAMETER); floatms_t fuelBase = getBaseFuel(rpm PASS_ENGINE_PARAMETER);
reportSensorF(log, fileFormat, "f: base", "ms", fuelBase, 2); reportSensorF(log, fileFormat, "f: base", "ms", fuelBase, 2);
reportSensorF(log, fileFormat, "f: actual", "ms", ENGINE(actualLastInjection), 2); reportSensorF(log, fileFormat, "f: actual", "ms", ENGINE(actualLastInjection), 2);
reportSensorF(log, fileFormat, "f: lag", "ms", engine->engineState.injectorLag, 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, "f: running", "ms", ENGINE(engineState.runningFuel), 2);
reportSensorF(log, fileFormat, "f: pid", "ms", ENGINE(engineState.fuelPidCorrection), 2); reportSensorF(log, fileFormat, "f: pid", "ms", ENGINE(engineState.fuelPidCorrection), 2);
reportSensorF(log, fileFormat, "f: wall amt", "v", ENGINE(wallFuel).getWallFuel(0), 2); reportSensorF(log, fileFormat, "f: wall amt", "v", ENGINE(wallFuel).getWallFuel(0), 2);
reportSensorF(log, fileFormat, "f: wall crr", "v", ENGINE(wallFuelCorrection), 2); reportSensorF(log, fileFormat, "f: wall crr", "v", ENGINE(wallFuelCorrection), 2);
reportSensorI(log, fileFormat, "version", "#", getRusEfiVersion()); reportSensorI(log, fileFormat, GAUGE_NAME_VERSION, "#", getRusEfiVersion());
} }
#if EFI_VEHICLE_SPEED || defined(__DOXYGEN__) #if EFI_VEHICLE_SPEED || defined(__DOXYGEN__)
if (hasVehicleSpeedSensor()) { if (hasVehicleSpeedSensor()) {
float vehicleSpeed = getVehicleSpeed(); float vehicleSpeed = getVehicleSpeed();
reportSensorF(log, fileFormat, "vss", "kph", vehicleSpeed, 2); reportSensorF(log, fileFormat, GAUGE_NAME_VVS, "kph", vehicleSpeed, 2);
float sp2rpm = rpm == 0 ? 0 : vehicleSpeed / rpm; float sp2rpm = rpm == 0 ? 0 : vehicleSpeed / rpm;
reportSensorF(log, fileFormat, "sp2rpm", "x", sp2rpm, 2); reportSensorF(log, fileFormat, "sp2rpm", "x", sp2rpm, 2);
} }
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
reportSensorF(log, fileFormat, "knck_c", "count", engine->knockCount, 0); reportSensorF(log, fileFormat, "knck_c", "count", engine->knockCount, 0);
reportSensorF(log, fileFormat, "knck_v", "v", engine->knockVolts, 2); reportSensorF(log, fileFormat, GAUGE_NAME_KNOCK_LEVEL, "v", engine->knockVolts, 2);
// reportSensorF(log, fileFormat, "vref", "V", getVRef(engineConfiguration), 2); // reportSensorF(log, fileFormat, "vref", "V", getVRef(engineConfiguration), 2);

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

@ -1497,8 +1497,15 @@
#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_VERSION "firmware"
#define GAUGE_NAME_VVT "VVT postion"
#define GAUGE_NAME_TIMING_ADVANCE "timing"
#define GAUGE_NAME_VVS "Vehicle Speed"
#define GAUGE_NAME_KNOCK_LEVEL "knock: current level"
#define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag"
#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_EL_EXTRA "fuel: engine load acceleration extra fuel"
#define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle" #define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle"
#define GAUGE_NAME_TCHARGE "fuel: SD tCharge"
#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle"
#define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time"

8
firmware/integration/rusefi_config.txt
View File

@ -874,11 +874,19 @@ float[FSIO_TABLE_8] fsioTable4RpmBins;RPM is float and not integer in order to u
end_struct end_struct
#define GAUGE_NAME_VERSION "firmware"
#define GAUGE_NAME_VVT "VVT postion"
#define GAUGE_NAME_TIMING_ADVANCE "timing"
#define GAUGE_NAME_VVS "Vehicle Speed"
#define GAUGE_NAME_KNOCK_LEVEL "knock: current level"
#define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag"
#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_EL_EXTRA "fuel: engine load acceleration extra fuel"
#define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle" #define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle"
#define GAUGE_NAME_TCHARGE "fuel: SD tCharge"
#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle"

9
java_console/models/src/com/rusefi/config/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config; package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Apr 11 19:08:53 EDT 2017 // this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Apr 13 23:17:21 EDT 2017
public class Fields { public class Fields {
public static final int LE_COMMAND_LENGTH = 200; public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4; public static final int FSIO_ADC_COUNT = 4;
@ -1029,9 +1029,16 @@ public class Fields {
public static final int fsioTable4LoadBins_offset = 16312; public static final int fsioTable4LoadBins_offset = 16312;
public static final int fsioTable4RpmBins_offset = 16344; public static final int fsioTable4RpmBins_offset = 16344;
public static final int TOTAL_CONFIG_SIZE = 16376; public static final int TOTAL_CONFIG_SIZE = 16376;
public static final String GAUGE_NAME_VERSION = "firmware";
public static final String GAUGE_NAME_VVT = "VVT postion";
public static final String GAUGE_NAME_TIMING_ADVANCE = "timing";
public static final String GAUGE_NAME_VVS = "Vehicle Speed";
public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag";
public static final String GAUGE_NAME_FUEL_TPS_EXTRA = "fuel: TPS acceleration extra fuel"; public static final String GAUGE_NAME_FUEL_TPS_EXTRA = "fuel: TPS acceleration extra fuel";
public static final String GAUGE_NAME_FUEL_EL_EXTRA = "fuel: engine load acceleration extra fuel"; public static final String GAUGE_NAME_FUEL_EL_EXTRA = "fuel: engine load acceleration extra fuel";
public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; 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_DWELL_DUTY = "dwell: coil duty cycle"; 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 String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time";
public static final Field ENGINETYPE = Field.create("ENGINETYPE", 0, FieldType.INT); public static final Field ENGINETYPE = Field.create("ENGINETYPE", 0, FieldType.INT);