more fields to SD card logs
This commit is contained in:
parent
73d0c2f2d9
commit
ef85a6ceed
|
@ -184,6 +184,10 @@ static int packEngineMode(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
|||
engineConfiguration->ignitionMode;
|
||||
}
|
||||
|
||||
static float getAirFlowGauge(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
||||
return hasMafSensor() ? getRealMaf(PASS_ENGINE_PARAMETER_SIGNATURE) : engine->engineState.airFlow;
|
||||
}
|
||||
|
||||
static void printSensors(Logging *log) {
|
||||
bool fileFormat = true; // todo:remove this unused variable
|
||||
// current time, in milliseconds
|
||||
|
@ -212,6 +216,18 @@ static void printSensors(Logging *log) {
|
|||
if (hasVBatt(PASS_ENGINE_PARAMETER_SIGNATURE)) {
|
||||
reportSensorF(log, GAUGE_NAME_VBAT, "V", getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE), 2); // log column #6
|
||||
}
|
||||
|
||||
reportSensorF(log, GAUGE_NAME_FUEL_BARO_CORR, "x", engine->engineState.baroCorrection, 2);
|
||||
|
||||
reportSensorF(log, GAUGE_NAME_AIR_FLOW, "v", getAirFlowGauge(PASS_ENGINE_PARAMETER_SIGNATURE), 2);
|
||||
reportSensorF(log, GAUGE_NAME_AIR_MASS, "x", engine->engineState.sd.airMassInOneCylinder, 2);
|
||||
|
||||
// if (hasMafSensor()) {
|
||||
// reportSensorF(log, , "V", getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE));
|
||||
// }
|
||||
|
||||
getAirFlowGauge(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
|
||||
#if EFI_ANALOG_SENSORS
|
||||
if (hasMapSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) {
|
||||
reportSensorF(log, "MAP", "kPa", getMap(PASS_ENGINE_PARAMETER_SIGNATURE), 2);
|
||||
|
@ -291,11 +307,18 @@ static void printSensors(Logging *log) {
|
|||
reportSensorF(log, GAUGE_NAME_TIMING_ADVANCE, "deg", engine->engineState.timingAdvance, 2);
|
||||
|
||||
|
||||
if (hasPedalPositionSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) {
|
||||
// 136
|
||||
reportSensorF(log, GAUGE_NAME_THROTTLE_PEDAL, "%", getPedalPosition(PASS_ENGINE_PARAMETER_SIGNATURE), 2);
|
||||
}
|
||||
|
||||
|
||||
floatms_t fuelBase = getBaseFuel(rpm PASS_ENGINE_PARAMETER_SUFFIX);
|
||||
reportSensorF(log, GAUGE_NAME_FUEL_BASE, "ms", fuelBase, 2);
|
||||
reportSensorF(log, GAUGE_NAME_FUEL_LAST_INJECTION, "ms", ENGINE(actualLastInjection), 2);
|
||||
reportSensorF(log, GAUGE_NAME_INJECTOR_LAG, "ms", engine->engineState.running.injectorLag, 2);
|
||||
reportSensorF(log, GAUGE_NAME_FUEL_RUNNING, "ms", ENGINE(engineState.running.fuel), 2);
|
||||
// 268
|
||||
reportSensorF(log, GAUGE_NAME_FUEL_PID_CORR, "ms", ENGINE(engineState.running.pidCorrection), 2);
|
||||
|
||||
reportSensorF(log, GAUGE_NAME_FUEL_WALL_AMOUNT, "v", ENGINE(wallFuel).getWallFuel(0), 2);
|
||||
|
@ -348,6 +371,7 @@ static void printSensors(Logging *log) {
|
|||
reportSensorI(log, INDICATOR_NAME_CLUTCH_UP, "bool", engine->clutchUpState);
|
||||
reportSensorI(log, INDICATOR_NAME_CLUTCH_DOWN, "bool", engine->clutchDownState);
|
||||
reportSensorI(log, INDICATOR_NAME_BRAKE_DOWN, "bool", engine->brakePedalState);
|
||||
reportSensorI(log, INDICATOR_NAME_AC_SWITCH, "bool", engine->acSwitchState);
|
||||
|
||||
}
|
||||
|
||||
|
@ -652,6 +676,7 @@ static LcdController lcdInstance;
|
|||
extern HIP9011 instance;
|
||||
#endif /* EFI_HIP_9011 */
|
||||
|
||||
|
||||
#if EFI_TUNER_STUDIO
|
||||
|
||||
void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ENGINE_PARAMETER_SUFFIX) {
|
||||
|
@ -674,62 +699,105 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
|
|||
// header
|
||||
tsOutputChannels->tsConfigVersion = TS_FILE_VERSION;
|
||||
|
||||
// engine state
|
||||
// offset 0
|
||||
tsOutputChannels->rpm = rpm;
|
||||
// offset 4
|
||||
tsOutputChannels->coolantTemperature = coolant;
|
||||
// offset 8
|
||||
tsOutputChannels->intakeAirTemperature = intake;
|
||||
// offset 12
|
||||
tsOutputChannels->throttlePositon = tps;
|
||||
// offset 16
|
||||
tsOutputChannels->massAirFlowVoltage = hasMafSensor() ? getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE) : 0;
|
||||
// For air-interpolated tCharge mode, we calculate a decent massAirFlow approximation, so we can show it to users even without MAF sensor!
|
||||
tsOutputChannels->massAirFlow = hasMafSensor() ? getRealMaf(PASS_ENGINE_PARAMETER_SIGNATURE) : engine->engineState.airFlow;
|
||||
tsOutputChannels->oilPressure = engine->sensors.oilPressure;
|
||||
|
||||
tsOutputChannels->injectionOffset = engine->engineState.injectionOffset;
|
||||
|
||||
tsOutputChannels->accelerationX = engine->sensors.accelerometer.x;
|
||||
tsOutputChannels->accelerationY = engine->sensors.accelerometer.y;
|
||||
|
||||
if (hasMapSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) {
|
||||
float mapValue = getMap(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
tsOutputChannels->veValue = engine->engineState.currentBaroCorrectedVE * PERCENT_MULT;
|
||||
// todo: bug here? target afr could work based on real MAF?
|
||||
tsOutputChannels->currentTargetAfr = afrMap.getValue(rpm, mapValue);
|
||||
tsOutputChannels->manifoldAirPressure = mapValue;
|
||||
}
|
||||
if (hasAfrSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) {
|
||||
// offset 20
|
||||
tsOutputChannels->airFuelRatio = getAfr(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
}
|
||||
// offset 24
|
||||
tsOutputChannels->engineLoad = engineLoad;
|
||||
if (hasVBatt(PASS_ENGINE_PARAMETER_SIGNATURE)) {
|
||||
// offset 28
|
||||
tsOutputChannels->vBatt = getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
}
|
||||
// offset 32
|
||||
tsOutputChannels->tpsADC = getTPS12bitAdc(PASS_ENGINE_PARAMETER_SIGNATURE) / TPS_TS_CONVERSION;
|
||||
// offset 36
|
||||
#if EFI_ANALOG_SENSORS
|
||||
tsOutputChannels->baroPressure = hasBaroSensor() ? getBaroPressure() : 0;
|
||||
#endif /* EFI_ANALOG_SENSORS */
|
||||
tsOutputChannels->engineLoad = engineLoad;
|
||||
// 48
|
||||
tsOutputChannels->fuelBase = engine->engineState.baseFuel;
|
||||
// 64
|
||||
tsOutputChannels->actualLastInjection = ENGINE(actualLastInjection);
|
||||
|
||||
|
||||
// offset 108
|
||||
// For air-interpolated tCharge mode, we calculate a decent massAirFlow approximation, so we can show it to users even without MAF sensor!
|
||||
tsOutputChannels->massAirFlow = getAirFlowGauge(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
// offset 116
|
||||
// TPS acceleration
|
||||
tsOutputChannels->deltaTps = engine->tpsAccelEnrichment.getMaxDelta();
|
||||
// 120
|
||||
tsOutputChannels->triggerErrorsCounter = engine->triggerCentral.triggerState.totalTriggerErrorCounter;
|
||||
// 132
|
||||
tsOutputChannels->baroCorrection = engine->engineState.baroCorrection;
|
||||
// 136
|
||||
tsOutputChannels->pedalPosition = hasPedalPositionSensor(PASS_ENGINE_PARAMETER_SIGNATURE) ? getPedalPosition(PASS_ENGINE_PARAMETER_SIGNATURE) : 0;
|
||||
// 140
|
||||
tsOutputChannels->injectorDutyCycle = getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER_SUFFIX);
|
||||
// 148
|
||||
tsOutputChannels->fuelTankLevel = engine->sensors.fuelTankLevel;
|
||||
// 160
|
||||
tsOutputChannels->wallFuelAmount = ENGINE(wallFuel).getWallFuel(0);
|
||||
// 164
|
||||
tsOutputChannels->iatCorrection = ENGINE(engineState.running.intakeTemperatureCoefficient);
|
||||
// 168
|
||||
tsOutputChannels->wallFuelCorrection = ENGINE(wallFuel).wallFuelCorrection;
|
||||
// 184
|
||||
tsOutputChannels->cltCorrection = ENGINE(engineState.running.coolantTemperatureCoefficient);
|
||||
// 188
|
||||
tsOutputChannels->fuelRunning = ENGINE(engineState.running.fuel);
|
||||
// 196
|
||||
tsOutputChannels->injectorLagMs = ENGINE(engineState.running.injectorLag);
|
||||
// 224
|
||||
efitimesec_t timeSeconds = getTimeNowSeconds();
|
||||
tsOutputChannels->timeSeconds = timeSeconds;
|
||||
// 248
|
||||
tsOutputChannels->vvtPosition = engine->triggerCentral.vvtPosition;
|
||||
// 252
|
||||
tsOutputChannels->engineMode = packEngineMode(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
// 264
|
||||
tsOutputChannels->firmwareVersion = getRusEfiVersion();
|
||||
// 268
|
||||
tsOutputChannels->fuelPidCorrection = ENGINE(engineState.running.pidCorrection);
|
||||
// 276
|
||||
tsOutputChannels->accelerationX = engine->sensors.accelerometer.x;
|
||||
// 278
|
||||
tsOutputChannels->accelerationY = engine->sensors.accelerometer.y;
|
||||
// 280
|
||||
tsOutputChannels->oilPressure = engine->sensors.oilPressure;
|
||||
// 288
|
||||
tsOutputChannels->injectionOffset = engine->engineState.injectionOffset;
|
||||
|
||||
if (hasMapSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) {
|
||||
float mapValue = getMap(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
// // offset 112
|
||||
tsOutputChannels->veValue = engine->engineState.currentBaroCorrectedVE * PERCENT_MULT;
|
||||
// todo: bug here? target afr could work based on real MAF?
|
||||
tsOutputChannels->currentTargetAfr = afrMap.getValue(rpm, mapValue);
|
||||
// offset 40
|
||||
tsOutputChannels->manifoldAirPressure = mapValue;
|
||||
}
|
||||
|
||||
tsOutputChannels->knockCount = engine->knockCount;
|
||||
tsOutputChannels->knockLevel = engine->knockVolts;
|
||||
tsOutputChannels->fuelTankLevel = engine->sensors.fuelTankLevel;
|
||||
|
||||
tsOutputChannels->hasFatalError = hasFirmwareError();
|
||||
tsOutputChannels->totalTriggerErrorCounter = engine->triggerCentral.triggerState.totalTriggerErrorCounter;
|
||||
|
||||
tsOutputChannels->injectorDutyCycle = getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER_SUFFIX);
|
||||
tsOutputChannels->fuelRunning = ENGINE(engineState.running.fuel);
|
||||
tsOutputChannels->fuelPidCorrection = ENGINE(engineState.running.pidCorrection);
|
||||
tsOutputChannels->injectorLagMs = ENGINE(engineState.running.injectorLag);
|
||||
tsOutputChannels->fuelBase = engine->engineState.baseFuel;
|
||||
tsOutputChannels->actualLastInjection = ENGINE(actualLastInjection);
|
||||
|
||||
tsOutputChannels->coilDutyCycle = getCoilDutyCycle(rpm PASS_ENGINE_PARAMETER_SUFFIX);
|
||||
|
||||
efitimesec_t timeSeconds = getTimeNowSeconds();
|
||||
tsOutputChannels->timeSeconds = timeSeconds;
|
||||
tsOutputChannels->firmwareVersion = getRusEfiVersion();
|
||||
|
||||
tsOutputChannels->isWarnNow = engine->engineState.warnings.isWarningNow(timeSeconds, true);
|
||||
tsOutputChannels->isCltBroken = engine->isCltBroken;
|
||||
|
@ -737,8 +805,87 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
|
|||
tsOutputChannels->isKnockChipOk = (instance.invalidHip9011ResponsesCount == 0);
|
||||
#endif /* EFI_HIP_9011 */
|
||||
|
||||
|
||||
tsOutputChannels->tpsAccelFuel = engine->engineState.tpsAccelEnrich;
|
||||
// engine load acceleration
|
||||
if (hasMapSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) {
|
||||
tsOutputChannels->engineLoadAccelExtra = engine->engineLoadAccelEnrichment.getEngineLoadEnrichment(PASS_ENGINE_PARAMETER_SIGNATURE) * 100 / getMap(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
}
|
||||
tsOutputChannels->engineLoadDelta = engine->engineLoadAccelEnrichment.getMaxDelta();
|
||||
|
||||
tsOutputChannels->checkEngine = hasErrorCodes();
|
||||
|
||||
#if HAL_USE_ADC
|
||||
tsOutputChannels->internalMcuTemperature = getMCUInternalTemperature();
|
||||
#endif /* HAL_USE_ADC */
|
||||
|
||||
#if EFI_MAX_31855
|
||||
for (int i = 0; i < EGT_CHANNEL_COUNT; i++)
|
||||
tsOutputChannels->egtValues.values[i] = getEgtValue(i);
|
||||
#endif /* EFI_MAX_31855 */
|
||||
|
||||
#if EFI_IDLE_CONTROL
|
||||
tsOutputChannels->idlePosition = getIdlePosition();
|
||||
#endif
|
||||
|
||||
#if EFI_PROD_CODE
|
||||
tsOutputChannels->isTriggerError = isTriggerErrorNow();
|
||||
|
||||
#if EFI_INTERNAL_FLASH
|
||||
tsOutputChannels->needBurn = getNeedToWriteConfiguration();
|
||||
#endif /* EFI_INTERNAL_FLASH */
|
||||
|
||||
#if EFI_FILE_LOGGING
|
||||
tsOutputChannels->hasSdCard = isSdCardAlive();
|
||||
#endif /* EFI_FILE_LOGGING */
|
||||
|
||||
tsOutputChannels->isFuelPumpOn = enginePins.fuelPumpRelay.getLogicValue();
|
||||
tsOutputChannels->isFanOn = enginePins.fanRelay.getLogicValue();
|
||||
tsOutputChannels->isO2HeaterOn = enginePins.o2heater.getLogicValue();
|
||||
tsOutputChannels->isIgnitionEnabled = engineConfiguration->isIgnitionEnabled;
|
||||
tsOutputChannels->isInjectionEnabled = engineConfiguration->isInjectionEnabled;
|
||||
tsOutputChannels->isCylinderCleanupEnabled = engineConfiguration->isCylinderCleanupEnabled;
|
||||
tsOutputChannels->isCylinderCleanupActivated = engine->isCylinderCleanupMode;
|
||||
tsOutputChannels->secondTriggerChannelEnabled = engineConfiguration->secondTriggerChannelEnabled;
|
||||
#if EFI_VEHICLE_SPEED
|
||||
float vehicleSpeed = getVehicleSpeed();
|
||||
tsOutputChannels->vehicleSpeedKph = vehicleSpeed;
|
||||
tsOutputChannels->speedToRpmRatio = vehicleSpeed / rpm;
|
||||
|
||||
#endif /* EFI_VEHICLE_SPEED */
|
||||
tsOutputChannels->isCltError = !isValidCoolantTemperature(getCoolantTemperature(PASS_ENGINE_PARAMETER_SIGNATURE));
|
||||
tsOutputChannels->isIatError = !isValidIntakeAirTemperature(getIntakeAirTemperature(PASS_ENGINE_PARAMETER_SIGNATURE));
|
||||
#endif /* EFI_PROD_CODE */
|
||||
|
||||
tsOutputChannels->fuelConsumptionPerHour = engine->engineState.fuelConsumption.perSecondConsumption;
|
||||
|
||||
tsOutputChannels->warningCounter = engine->engineState.warnings.warningCounter;
|
||||
tsOutputChannels->lastErrorCode = engine->engineState.warnings.lastErrorCode;
|
||||
for (int i = 0; i < 8;i++) {
|
||||
tsOutputChannels->recentErrorCodes[i] = engine->engineState.warnings.recentWarnings.get(i);
|
||||
}
|
||||
|
||||
tsOutputChannels->knockNowIndicator = engine->knockCount > 0;
|
||||
tsOutputChannels->knockEverIndicator = engine->knockEver;
|
||||
|
||||
tsOutputChannels->clutchUpState = engine->clutchUpState;
|
||||
tsOutputChannels->clutchDownState = engine->clutchDownState;
|
||||
tsOutputChannels->brakePedalState = engine->brakePedalState;
|
||||
tsOutputChannels->acSwitchState = engine->acSwitchState;
|
||||
|
||||
// tCharge depends on the previous state, so we should use the stored value.
|
||||
tsOutputChannels->tCharge = ENGINE(engineState.sd.tCharge);
|
||||
float timing = engine->engineState.timingAdvance;
|
||||
tsOutputChannels->ignitionAdvance = timing > 360 ? timing - 720 : timing;
|
||||
// 60
|
||||
tsOutputChannels->sparkDwell = ENGINE(engineState.sparkDwell);
|
||||
tsOutputChannels->crankingFuelMs = engine->isCylinderCleanupMode ? 0 : getCrankingFuel(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
tsOutputChannels->chargeAirMass = engine->engineState.sd.airMassInOneCylinder;
|
||||
|
||||
|
||||
switch (engineConfiguration->debugMode) {
|
||||
case DBG_AUX_TEMPERATURE:
|
||||
// // 68
|
||||
tsOutputChannels->debugFloatField1 = engine->sensors.auxTemp1;
|
||||
tsOutputChannels->debugFloatField2 = engine->sensors.auxTemp2;
|
||||
break;
|
||||
|
@ -857,93 +1004,6 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
|
|||
default:
|
||||
;
|
||||
}
|
||||
|
||||
tsOutputChannels->wallFuelAmount = ENGINE(wallFuel).getWallFuel(0);
|
||||
tsOutputChannels->wallFuelCorrection = ENGINE(wallFuel).wallFuelCorrection;
|
||||
// TPS acceleration
|
||||
tsOutputChannels->deltaTps = engine->tpsAccelEnrichment.getMaxDelta();
|
||||
tsOutputChannels->tpsAccelFuel = engine->engineState.tpsAccelEnrich;
|
||||
// engine load acceleration
|
||||
if (hasMapSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) {
|
||||
tsOutputChannels->engineLoadAccelExtra = engine->engineLoadAccelEnrichment.getEngineLoadEnrichment(PASS_ENGINE_PARAMETER_SIGNATURE) * 100 / getMap(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
}
|
||||
tsOutputChannels->engineLoadDelta = engine->engineLoadAccelEnrichment.getMaxDelta();
|
||||
|
||||
|
||||
tsOutputChannels->iatCorrection = ENGINE(engineState.running.intakeTemperatureCoefficient);
|
||||
tsOutputChannels->cltCorrection = ENGINE(engineState.running.coolantTemperatureCoefficient);
|
||||
|
||||
tsOutputChannels->checkEngine = hasErrorCodes();
|
||||
|
||||
tsOutputChannels->vvtPosition = engine->triggerCentral.vvtPosition;
|
||||
|
||||
tsOutputChannels->engineMode = packEngineMode(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
|
||||
#if HAL_USE_ADC
|
||||
tsOutputChannels->internalMcuTemperature = getMCUInternalTemperature();
|
||||
#endif /* HAL_USE_ADC */
|
||||
|
||||
#if EFI_MAX_31855
|
||||
for (int i = 0; i < EGT_CHANNEL_COUNT; i++)
|
||||
tsOutputChannels->egtValues.values[i] = getEgtValue(i);
|
||||
#endif /* EFI_MAX_31855 */
|
||||
|
||||
#if EFI_IDLE_CONTROL
|
||||
tsOutputChannels->idlePosition = getIdlePosition();
|
||||
#endif
|
||||
|
||||
#if EFI_PROD_CODE
|
||||
tsOutputChannels->isTriggerError = isTriggerErrorNow();
|
||||
|
||||
#if EFI_INTERNAL_FLASH
|
||||
tsOutputChannels->needBurn = getNeedToWriteConfiguration();
|
||||
#endif /* EFI_INTERNAL_FLASH */
|
||||
|
||||
#if EFI_FILE_LOGGING
|
||||
tsOutputChannels->hasSdCard = isSdCardAlive();
|
||||
#endif /* EFI_FILE_LOGGING */
|
||||
|
||||
tsOutputChannels->isFuelPumpOn = enginePins.fuelPumpRelay.getLogicValue();
|
||||
tsOutputChannels->isFanOn = enginePins.fanRelay.getLogicValue();
|
||||
tsOutputChannels->isO2HeaterOn = enginePins.o2heater.getLogicValue();
|
||||
tsOutputChannels->isIgnitionEnabled = engineConfiguration->isIgnitionEnabled;
|
||||
tsOutputChannels->isInjectionEnabled = engineConfiguration->isInjectionEnabled;
|
||||
tsOutputChannels->isCylinderCleanupEnabled = engineConfiguration->isCylinderCleanupEnabled;
|
||||
tsOutputChannels->isCylinderCleanupActivated = engine->isCylinderCleanupMode;
|
||||
tsOutputChannels->secondTriggerChannelEnabled = engineConfiguration->secondTriggerChannelEnabled;
|
||||
#if EFI_VEHICLE_SPEED
|
||||
float vehicleSpeed = getVehicleSpeed();
|
||||
tsOutputChannels->vehicleSpeedKph = vehicleSpeed;
|
||||
tsOutputChannels->speedToRpmRatio = vehicleSpeed / rpm;
|
||||
|
||||
#endif /* EFI_VEHICLE_SPEED */
|
||||
tsOutputChannels->isCltError = !isValidCoolantTemperature(getCoolantTemperature(PASS_ENGINE_PARAMETER_SIGNATURE));
|
||||
tsOutputChannels->isIatError = !isValidIntakeAirTemperature(getIntakeAirTemperature(PASS_ENGINE_PARAMETER_SIGNATURE));
|
||||
#endif /* EFI_PROD_CODE */
|
||||
|
||||
tsOutputChannels->fuelConsumptionPerHour = engine->engineState.fuelConsumption.perSecondConsumption;
|
||||
|
||||
tsOutputChannels->warningCounter = engine->engineState.warnings.warningCounter;
|
||||
tsOutputChannels->lastErrorCode = engine->engineState.warnings.lastErrorCode;
|
||||
for (int i = 0; i < 8;i++) {
|
||||
tsOutputChannels->recentErrorCodes[i] = engine->engineState.warnings.recentWarnings.get(i);
|
||||
}
|
||||
|
||||
tsOutputChannels->knockNowIndicator = engine->knockCount > 0;
|
||||
tsOutputChannels->knockEverIndicator = engine->knockEver;
|
||||
|
||||
tsOutputChannels->clutchUpState = engine->clutchUpState;
|
||||
tsOutputChannels->clutchDownState = engine->clutchDownState;
|
||||
tsOutputChannels->brakePedalState = engine->brakePedalState;
|
||||
tsOutputChannels->acSwitchState = engine->acSwitchState;
|
||||
|
||||
// tCharge depends on the previous state, so we should use the stored value.
|
||||
tsOutputChannels->tCharge = ENGINE(engineState.sd.tCharge);
|
||||
float timing = engine->engineState.timingAdvance;
|
||||
tsOutputChannels->ignitionAdvance = timing > 360 ? timing - 720 : timing;
|
||||
tsOutputChannels->sparkDwell = ENGINE(engineState.sparkDwell);
|
||||
tsOutputChannels->crankingFuelMs = engine->isCylinderCleanupMode ? 0 : getCrankingFuel(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
tsOutputChannels->chargeAirMass = engine->engineState.sd.airMassInOneCylinder;
|
||||
}
|
||||
|
||||
extern TunerStudioOutputChannels tsOutputChannels;
|
||||
|
|
|
@ -870,6 +870,8 @@
|
|||
#define GAUGE_NAME_ACCEL_Y "Acceleration: Y"
|
||||
#define GAUGE_NAME_ACCEL_Z "Acceleration: Z"
|
||||
#define GAUGE_NAME_AFR "Air/Fuel Ratio"
|
||||
#define GAUGE_NAME_AIR_FLOW "air flow"
|
||||
#define GAUGE_NAME_AIR_MASS "air mass"
|
||||
#define GAUGE_NAME_CPU_TEMP "CPU Temperature"
|
||||
#define GAUGE_NAME_DEBUG_F1 "debug f1"
|
||||
#define GAUGE_NAME_DEBUG_F2 "debug f2: iTerm"
|
||||
|
@ -886,6 +888,7 @@
|
|||
#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle"
|
||||
#define GAUGE_NAME_ECU_TEMPERATURE "ECU temperature"
|
||||
#define GAUGE_NAME_ENGINE_LOAD "Engine Load"
|
||||
#define GAUGE_NAME_FUEL_BARO_CORR "fuel: Barometric pressure correction"
|
||||
#define GAUGE_NAME_FUEL_BASE "fuel: base"
|
||||
#define GAUGE_NAME_FUEL_CHARGE_TEMP "fuel: Estimated charge temperature"
|
||||
#define GAUGE_NAME_FUEL_CLT_CORR "fuel: CLT correction"
|
||||
|
@ -907,6 +910,7 @@
|
|||
#define GAUGE_NAME_KNOCK_LEVEL "knock: current level"
|
||||
#define GAUGE_NAME_TARGET_AFR "fuel: target AFR"
|
||||
#define GAUGE_NAME_TCHARGE "fuel: SD tCharge"
|
||||
#define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position"
|
||||
#define GAUGE_NAME_TIMING_ADVANCE "timing"
|
||||
#define GAUGE_NAME_VBAT "VBatt"
|
||||
#define GAUGE_NAME_VERSION "firmware"
|
||||
|
@ -1191,6 +1195,7 @@
|
|||
#define ignitionTpsTable_offset_hex cd8
|
||||
#define ignMathCalculateAtIndex_offset 1488
|
||||
#define ignMathCalculateAtIndex_offset_hex 5d0
|
||||
#define INDICATOR_NAME_AC_SWITCH "AC switch"
|
||||
#define INDICATOR_NAME_BRAKE_DOWN "brake: down"
|
||||
#define INDICATOR_NAME_CLUTCH_DOWN "clutch: down"
|
||||
#define INDICATOR_NAME_CLUTCH_UP "clutch: up"
|
||||
|
|
|
@ -1193,7 +1193,10 @@ end_struct
|
|||
#define INDICATOR_NAME_CLUTCH_UP "clutch: up"
|
||||
#define INDICATOR_NAME_CLUTCH_DOWN "clutch: down"
|
||||
#define INDICATOR_NAME_BRAKE_DOWN "brake: down"
|
||||
#define INDICATOR_NAME_AC_SWITCH "AC switch"
|
||||
|
||||
#define GAUGE_NAME_AIR_FLOW "air flow"
|
||||
#define GAUGE_NAME_AIR_MASS "air mass"
|
||||
|
||||
#define GAUGE_NAME_WARNING_LAST "warning: last"
|
||||
#define GAUGE_NAME_WARNING_COUNTER "warning: counter"
|
||||
|
@ -1203,6 +1206,8 @@ end_struct
|
|||
#define GAUGE_NAME_KNOCK_COUNTER "knock: counter"
|
||||
|
||||
|
||||
#define GAUGE_NAME_FUEL_BARO_CORR "fuel: Barometric pressure correction"
|
||||
#define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position"
|
||||
#define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag"
|
||||
#define GAUGE_NAME_FUEL_TPS_ROC "fuel: TPS change"
|
||||
#define GAUGE_NAME_FUEL_CHARGE_TEMP "fuel: Estimated charge temperature"
|
||||
|
|
|
@ -82,7 +82,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Sep 20 18:08:52 EDT 2019
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Sep 20 19:03:27 EDT 2019
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
@ -1228,7 +1228,7 @@ fileVersion = { 20190701 }
|
|||
engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0
|
||||
tpsAccelFuel = scalar, F32, 128, "ms", 1, 0
|
||||
baroCorrection = scalar, F32, 132, "%", 1, 0
|
||||
pedalPosition = scalar, F32, 136, "%", 1, 0
|
||||
throttlePedalPosition = scalar, F32, 136, "%", 1, 0
|
||||
injectorDutyCycle= scalar, F32, 140, "%", 1, 0
|
||||
knockCount = scalar, U32, 144, "counter", 1, 0
|
||||
fuelTankLevel = scalar, F32, 148, "amount", 1, 0
|
||||
|
@ -1707,7 +1707,7 @@ fileVersion = { 20190701 }
|
|||
table = pedalToTpsTbl, pedalToTpsMap, "ETB Pedal to TPS", 1
|
||||
; constant, variable
|
||||
xBins = pedalToTpsRpmBins, RPMValue
|
||||
yBins = pedalToTpsPedalBins, pedalPosition
|
||||
yBins = pedalToTpsPedalBins, throttlePedalPosition
|
||||
zBins = pedalToTpsTable
|
||||
; gridHeight = 2.0
|
||||
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
|
||||
|
@ -1819,7 +1819,7 @@ gaugeCategory = Fueling
|
|||
#else
|
||||
tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg F", -40, 285, 5, 35, 205, 230, 1, 1
|
||||
#endif
|
||||
baroCorrectionGauge = baroCorrection,"Fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1
|
||||
baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1
|
||||
crankingFuelGauge = crankingFuelMs, "fuel: cranking", "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
|
||||
cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2
|
||||
|
@ -1833,7 +1833,7 @@ gaugeCategory = Fueling
|
|||
fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term closed loop correction", "mSec", -11, 11, 1.0, 1.2, 20, 25, 3, 1
|
||||
|
||||
gaugeCategory = Throttle Body (incl. ETB)
|
||||
pedalPositionGauge = pedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1
|
||||
pedalPositionGauge = throttlePedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1
|
||||
tpsADCGauge = tpsADC, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0
|
||||
TPSGauge = TPSValue, "Throttle position", "%", 0, 100, 0, 0, 100, 100, 1, 1
|
||||
|
||||
|
@ -1940,7 +1940,7 @@ gaugeCategory = Throttle Body (incl. ETB)
|
|||
entry = rpmAcceleration, "dRPM", float, "%.3f"
|
||||
entry = massAirFlowValue,"air flow", float, "%.3f"
|
||||
entry = chargeAirMass, "air mass", float, "%.3f"
|
||||
entry = pedalPosition, "pedal", float, "%.3f"
|
||||
entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f"
|
||||
entry = triggerErrorsCounter, "trg err",int, "%d"
|
||||
entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f"
|
||||
|
||||
|
@ -1975,7 +1975,7 @@ gaugeCategory = Throttle Body (incl. ETB)
|
|||
entry = wallFuelCorrection,"fuel: wall corr ms", float, "%.3f"
|
||||
entry = wallFuelAmount, "fuel: wall amount", float, "%.3f"
|
||||
|
||||
entry = baroCorrection, "baroCorrection",float,"%.3f"
|
||||
entry = baroCorrection, "fuel: Barometric pressure correction",float,"%.3f"
|
||||
entry = iatCorrection, "fuel: IAT correction", float, "%.3f"
|
||||
entry = cltCorrection, "fuel: CLT correction", float,"%.3f"
|
||||
|
||||
|
|
|
@ -239,7 +239,7 @@ fileVersion = { 20190701 }
|
|||
engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0
|
||||
tpsAccelFuel = scalar, F32, 128, "ms", 1, 0
|
||||
baroCorrection = scalar, F32, 132, "%", 1, 0
|
||||
pedalPosition = scalar, F32, 136, "%", 1, 0
|
||||
throttlePedalPosition = scalar, F32, 136, "%", 1, 0
|
||||
injectorDutyCycle= scalar, F32, 140, "%", 1, 0
|
||||
knockCount = scalar, U32, 144, "counter", 1, 0
|
||||
fuelTankLevel = scalar, F32, 148, "amount", 1, 0
|
||||
|
@ -718,7 +718,7 @@ fileVersion = { 20190701 }
|
|||
table = pedalToTpsTbl, pedalToTpsMap, "ETB Pedal to TPS", 1
|
||||
; constant, variable
|
||||
xBins = pedalToTpsRpmBins, RPMValue
|
||||
yBins = pedalToTpsPedalBins, pedalPosition
|
||||
yBins = pedalToTpsPedalBins, throttlePedalPosition
|
||||
zBins = pedalToTpsTable
|
||||
; gridHeight = 2.0
|
||||
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
|
||||
|
@ -830,7 +830,7 @@ gaugeCategory = Fueling
|
|||
#else
|
||||
tChargeGauge = tCharge, @@GAUGE_NAME_FUEL_CHARGE_TEMP@@, "deg F", -40, 285, 5, 35, 205, 230, 1, 1
|
||||
#endif
|
||||
baroCorrectionGauge = baroCorrection,"Fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1
|
||||
baroCorrectionGauge = baroCorrection,@@GAUGE_NAME_FUEL_BARO_CORR@@, "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1
|
||||
crankingFuelGauge = crankingFuelMs, @@GAUGE_NAME_FUEL_CRANKING@@, "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1
|
||||
iatCorrectionGauge = iatCorrection, @@GAUGE_NAME_FUEL_IAT_CORR@@, "mult", 0, 3, 0, 0, 3, 3, 2, 2
|
||||
cltCorrectionGauge = cltCorrection, @@GAUGE_NAME_FUEL_CLT_CORR@@, "mult", 0, 3, 0, 0, 3, 3, 2, 2
|
||||
|
@ -844,7 +844,7 @@ gaugeCategory = Fueling
|
|||
fuelPidCorrectionGauge = fuelPidCorrection, @@GAUGE_NAME_FUEL_PID_CORR@@, "mSec", -11, 11, 1.0, 1.2, 20, 25, 3, 1
|
||||
|
||||
gaugeCategory = Throttle Body (incl. ETB)
|
||||
pedalPositionGauge = pedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1
|
||||
pedalPositionGauge = throttlePedalPosition, @@GAUGE_NAME_THROTTLE_PEDAL@@, "%", 0, 120, 0, 0, 100, 100, 1, 1
|
||||
tpsADCGauge = tpsADC, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0
|
||||
TPSGauge = TPSValue, "Throttle position", "%", 0, 100, 0, 0, 100, 100, 1, 1
|
||||
|
||||
|
@ -949,9 +949,9 @@ gaugeCategory = Throttle Body (incl. ETB)
|
|||
entry = vehicleSpeedKph, @@GAUGE_NAME_VVS@@, float, "%.2f"
|
||||
entry = speedToRpmRatio, "s2rpm", float, "%.3f"
|
||||
entry = rpmAcceleration, "dRPM", float, "%.3f"
|
||||
entry = massAirFlowValue,"air flow", float, "%.3f"
|
||||
entry = chargeAirMass, "air mass", float, "%.3f"
|
||||
entry = pedalPosition, "pedal", float, "%.3f"
|
||||
entry = massAirFlowValue,@@GAUGE_NAME_AIR_FLOW@@, float, "%.3f"
|
||||
entry = chargeAirMass, @@GAUGE_NAME_AIR_MASS@@, float, "%.3f"
|
||||
entry = throttlePedalPosition, @@GAUGE_NAME_THROTTLE_PEDAL@@, float, "%.3f"
|
||||
entry = triggerErrorsCounter, "trg err",int, "%d"
|
||||
entry = idleAirValvePosition, @@GAUGE_NAME_IAC@@, float, "%.3f"
|
||||
|
||||
|
@ -986,7 +986,7 @@ gaugeCategory = Throttle Body (incl. ETB)
|
|||
entry = wallFuelCorrection,@@GAUGE_NAME_FUEL_WALL_CORRECTION@@, float, "%.3f"
|
||||
entry = wallFuelAmount, @@GAUGE_NAME_FUEL_WALL_AMOUNT@@, float, "%.3f"
|
||||
|
||||
entry = baroCorrection, "baroCorrection",float,"%.3f"
|
||||
entry = baroCorrection, @@GAUGE_NAME_FUEL_BARO_CORR@@,float,"%.3f"
|
||||
entry = iatCorrection, @@GAUGE_NAME_FUEL_IAT_CORR@@, float, "%.3f"
|
||||
entry = cltCorrection, @@GAUGE_NAME_FUEL_CLT_CORR@@, float,"%.3f"
|
||||
|
||||
|
@ -1052,7 +1052,7 @@ gaugeCategory = Throttle Body (incl. ETB)
|
|||
entry = clutchUpState, @@INDICATOR_NAME_CLUTCH_UP@@,int,"%d"
|
||||
entry = clutchDownState, @@INDICATOR_NAME_CLUTCH_DOWN@@,int,"%d"
|
||||
entry = brakePedalIndicator, @@INDICATOR_NAME_BRAKE_DOWN@@,int,"%d"
|
||||
entry = acSwitchIndicator, "AC switch",int,"%d"
|
||||
entry = acSwitchIndicator, @@INDICATOR_NAME_AC_SWITCH@@,int,"%d"
|
||||
entry = ind_fan, "radiator fan",int,"%d"
|
||||
|
||||
; Electronic throttle body
|
||||
|
|
|
@ -82,7 +82,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Sep 20 18:09:00 EDT 2019
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Sep 20 19:03:32 EDT 2019
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
@ -1228,7 +1228,7 @@ fileVersion = { 20190701 }
|
|||
engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0
|
||||
tpsAccelFuel = scalar, F32, 128, "ms", 1, 0
|
||||
baroCorrection = scalar, F32, 132, "%", 1, 0
|
||||
pedalPosition = scalar, F32, 136, "%", 1, 0
|
||||
throttlePedalPosition = scalar, F32, 136, "%", 1, 0
|
||||
injectorDutyCycle= scalar, F32, 140, "%", 1, 0
|
||||
knockCount = scalar, U32, 144, "counter", 1, 0
|
||||
fuelTankLevel = scalar, F32, 148, "amount", 1, 0
|
||||
|
@ -1707,7 +1707,7 @@ fileVersion = { 20190701 }
|
|||
table = pedalToTpsTbl, pedalToTpsMap, "ETB Pedal to TPS", 1
|
||||
; constant, variable
|
||||
xBins = pedalToTpsRpmBins, RPMValue
|
||||
yBins = pedalToTpsPedalBins, pedalPosition
|
||||
yBins = pedalToTpsPedalBins, throttlePedalPosition
|
||||
zBins = pedalToTpsTable
|
||||
; gridHeight = 2.0
|
||||
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
|
||||
|
@ -1819,7 +1819,7 @@ gaugeCategory = Fueling
|
|||
#else
|
||||
tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg F", -40, 285, 5, 35, 205, 230, 1, 1
|
||||
#endif
|
||||
baroCorrectionGauge = baroCorrection,"Fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1
|
||||
baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1
|
||||
crankingFuelGauge = crankingFuelMs, "fuel: cranking", "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
|
||||
cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2
|
||||
|
@ -1833,7 +1833,7 @@ gaugeCategory = Fueling
|
|||
fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term closed loop correction", "mSec", -11, 11, 1.0, 1.2, 20, 25, 3, 1
|
||||
|
||||
gaugeCategory = Throttle Body (incl. ETB)
|
||||
pedalPositionGauge = pedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1
|
||||
pedalPositionGauge = throttlePedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1
|
||||
tpsADCGauge = tpsADC, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0
|
||||
TPSGauge = TPSValue, "Throttle position", "%", 0, 100, 0, 0, 100, 100, 1, 1
|
||||
|
||||
|
@ -1940,7 +1940,7 @@ gaugeCategory = Throttle Body (incl. ETB)
|
|||
entry = rpmAcceleration, "dRPM", float, "%.3f"
|
||||
entry = massAirFlowValue,"air flow", float, "%.3f"
|
||||
entry = chargeAirMass, "air mass", float, "%.3f"
|
||||
entry = pedalPosition, "pedal", float, "%.3f"
|
||||
entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f"
|
||||
entry = triggerErrorsCounter, "trg err",int, "%d"
|
||||
entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f"
|
||||
|
||||
|
@ -1975,7 +1975,7 @@ gaugeCategory = Throttle Body (incl. ETB)
|
|||
entry = wallFuelCorrection,"fuel: wall corr ms", float, "%.3f"
|
||||
entry = wallFuelAmount, "fuel: wall amount", float, "%.3f"
|
||||
|
||||
entry = baroCorrection, "baroCorrection",float,"%.3f"
|
||||
entry = baroCorrection, "fuel: Barometric pressure correction",float,"%.3f"
|
||||
entry = iatCorrection, "fuel: IAT correction", float, "%.3f"
|
||||
entry = cltCorrection, "fuel: CLT correction", float,"%.3f"
|
||||
|
||||
|
|
|
@ -82,7 +82,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Sep 20 18:08:56 EDT 2019
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Sep 20 19:03:30 EDT 2019
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
@ -1228,7 +1228,7 @@ fileVersion = { 20190701 }
|
|||
engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0
|
||||
tpsAccelFuel = scalar, F32, 128, "ms", 1, 0
|
||||
baroCorrection = scalar, F32, 132, "%", 1, 0
|
||||
pedalPosition = scalar, F32, 136, "%", 1, 0
|
||||
throttlePedalPosition = scalar, F32, 136, "%", 1, 0
|
||||
injectorDutyCycle= scalar, F32, 140, "%", 1, 0
|
||||
knockCount = scalar, U32, 144, "counter", 1, 0
|
||||
fuelTankLevel = scalar, F32, 148, "amount", 1, 0
|
||||
|
@ -1707,7 +1707,7 @@ fileVersion = { 20190701 }
|
|||
table = pedalToTpsTbl, pedalToTpsMap, "ETB Pedal to TPS", 1
|
||||
; constant, variable
|
||||
xBins = pedalToTpsRpmBins, RPMValue
|
||||
yBins = pedalToTpsPedalBins, pedalPosition
|
||||
yBins = pedalToTpsPedalBins, throttlePedalPosition
|
||||
zBins = pedalToTpsTable
|
||||
; gridHeight = 2.0
|
||||
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
|
||||
|
@ -1819,7 +1819,7 @@ gaugeCategory = Fueling
|
|||
#else
|
||||
tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg F", -40, 285, 5, 35, 205, 230, 1, 1
|
||||
#endif
|
||||
baroCorrectionGauge = baroCorrection,"Fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1
|
||||
baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1
|
||||
crankingFuelGauge = crankingFuelMs, "fuel: cranking", "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
|
||||
cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2
|
||||
|
@ -1833,7 +1833,7 @@ gaugeCategory = Fueling
|
|||
fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term closed loop correction", "mSec", -11, 11, 1.0, 1.2, 20, 25, 3, 1
|
||||
|
||||
gaugeCategory = Throttle Body (incl. ETB)
|
||||
pedalPositionGauge = pedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1
|
||||
pedalPositionGauge = throttlePedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1
|
||||
tpsADCGauge = tpsADC, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0
|
||||
TPSGauge = TPSValue, "Throttle position", "%", 0, 100, 0, 0, 100, 100, 1, 1
|
||||
|
||||
|
@ -1940,7 +1940,7 @@ gaugeCategory = Throttle Body (incl. ETB)
|
|||
entry = rpmAcceleration, "dRPM", float, "%.3f"
|
||||
entry = massAirFlowValue,"air flow", float, "%.3f"
|
||||
entry = chargeAirMass, "air mass", float, "%.3f"
|
||||
entry = pedalPosition, "pedal", float, "%.3f"
|
||||
entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f"
|
||||
entry = triggerErrorsCounter, "trg err",int, "%d"
|
||||
entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f"
|
||||
|
||||
|
@ -1975,7 +1975,7 @@ gaugeCategory = Throttle Body (incl. ETB)
|
|||
entry = wallFuelCorrection,"fuel: wall corr ms", float, "%.3f"
|
||||
entry = wallFuelAmount, "fuel: wall amount", float, "%.3f"
|
||||
|
||||
entry = baroCorrection, "baroCorrection",float,"%.3f"
|
||||
entry = baroCorrection, "fuel: Barometric pressure correction",float,"%.3f"
|
||||
entry = iatCorrection, "fuel: IAT correction", float, "%.3f"
|
||||
entry = cltCorrection, "fuel: CLT correction", float,"%.3f"
|
||||
|
||||
|
|
|
@ -82,7 +82,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Sep 20 18:09:03 EDT 2019
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Sep 20 19:03:35 EDT 2019
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
@ -1228,7 +1228,7 @@ fileVersion = { 20190701 }
|
|||
engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0
|
||||
tpsAccelFuel = scalar, F32, 128, "ms", 1, 0
|
||||
baroCorrection = scalar, F32, 132, "%", 1, 0
|
||||
pedalPosition = scalar, F32, 136, "%", 1, 0
|
||||
throttlePedalPosition = scalar, F32, 136, "%", 1, 0
|
||||
injectorDutyCycle= scalar, F32, 140, "%", 1, 0
|
||||
knockCount = scalar, U32, 144, "counter", 1, 0
|
||||
fuelTankLevel = scalar, F32, 148, "amount", 1, 0
|
||||
|
@ -1707,7 +1707,7 @@ fileVersion = { 20190701 }
|
|||
table = pedalToTpsTbl, pedalToTpsMap, "ETB Pedal to TPS", 1
|
||||
; constant, variable
|
||||
xBins = pedalToTpsRpmBins, RPMValue
|
||||
yBins = pedalToTpsPedalBins, pedalPosition
|
||||
yBins = pedalToTpsPedalBins, throttlePedalPosition
|
||||
zBins = pedalToTpsTable
|
||||
; gridHeight = 2.0
|
||||
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
|
||||
|
@ -1819,7 +1819,7 @@ gaugeCategory = Fueling
|
|||
#else
|
||||
tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg F", -40, 285, 5, 35, 205, 230, 1, 1
|
||||
#endif
|
||||
baroCorrectionGauge = baroCorrection,"Fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1
|
||||
baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1
|
||||
crankingFuelGauge = crankingFuelMs, "fuel: cranking", "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
|
||||
cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2
|
||||
|
@ -1833,7 +1833,7 @@ gaugeCategory = Fueling
|
|||
fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term closed loop correction", "mSec", -11, 11, 1.0, 1.2, 20, 25, 3, 1
|
||||
|
||||
gaugeCategory = Throttle Body (incl. ETB)
|
||||
pedalPositionGauge = pedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1
|
||||
pedalPositionGauge = throttlePedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1
|
||||
tpsADCGauge = tpsADC, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0
|
||||
TPSGauge = TPSValue, "Throttle position", "%", 0, 100, 0, 0, 100, 100, 1, 1
|
||||
|
||||
|
@ -1940,7 +1940,7 @@ gaugeCategory = Throttle Body (incl. ETB)
|
|||
entry = rpmAcceleration, "dRPM", float, "%.3f"
|
||||
entry = massAirFlowValue,"air flow", float, "%.3f"
|
||||
entry = chargeAirMass, "air mass", float, "%.3f"
|
||||
entry = pedalPosition, "pedal", float, "%.3f"
|
||||
entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f"
|
||||
entry = triggerErrorsCounter, "trg err",int, "%d"
|
||||
entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f"
|
||||
|
||||
|
@ -1975,7 +1975,7 @@ gaugeCategory = Throttle Body (incl. ETB)
|
|||
entry = wallFuelCorrection,"fuel: wall corr ms", float, "%.3f"
|
||||
entry = wallFuelAmount, "fuel: wall amount", float, "%.3f"
|
||||
|
||||
entry = baroCorrection, "baroCorrection",float,"%.3f"
|
||||
entry = baroCorrection, "fuel: Barometric pressure correction",float,"%.3f"
|
||||
entry = iatCorrection, "fuel: IAT correction", float, "%.3f"
|
||||
entry = cltCorrection, "fuel: CLT correction", float,"%.3f"
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package com.rusefi.config.generated;
|
||||
|
||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Sep 20 18:08:52 EDT 2019
|
||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Sep 20 19:03:27 EDT 2019
|
||||
|
||||
// by class com.rusefi.output.FileJavaFieldsConsumer
|
||||
import com.rusefi.config.*;
|
||||
|
@ -565,6 +565,8 @@ public class Fields {
|
|||
public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y";
|
||||
public static final String GAUGE_NAME_ACCEL_Z = "Acceleration: Z";
|
||||
public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio";
|
||||
public static final String GAUGE_NAME_AIR_FLOW = "air flow";
|
||||
public static final String GAUGE_NAME_AIR_MASS = "air mass";
|
||||
public static final String GAUGE_NAME_CPU_TEMP = "CPU Temperature";
|
||||
public static final String GAUGE_NAME_DEBUG_F1 = "debug f1";
|
||||
public static final String GAUGE_NAME_DEBUG_F2 = "debug f2: iTerm";
|
||||
|
@ -581,6 +583,7 @@ public class Fields {
|
|||
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_LOAD = "Engine Load";
|
||||
public static final String GAUGE_NAME_FUEL_BARO_CORR = "fuel: Barometric pressure correction";
|
||||
public static final String GAUGE_NAME_FUEL_BASE = "fuel: base";
|
||||
public static final String GAUGE_NAME_FUEL_CHARGE_TEMP = "fuel: Estimated charge temperature";
|
||||
public static final String GAUGE_NAME_FUEL_CLT_CORR = "fuel: CLT correction";
|
||||
|
@ -602,6 +605,7 @@ public class Fields {
|
|||
public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
|
||||
public static final String GAUGE_NAME_TARGET_AFR = "fuel: target AFR";
|
||||
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_TIMING_ADVANCE = "timing";
|
||||
public static final String GAUGE_NAME_VBAT = "VBatt";
|
||||
public static final String GAUGE_NAME_VERSION = "firmware";
|
||||
|
@ -788,6 +792,7 @@ public class Fields {
|
|||
public static final int ignitionTpsBins_offset = 3800;
|
||||
public static final int ignitionTpsTable_offset = 3288;
|
||||
public static final int ignMathCalculateAtIndex_offset = 1488;
|
||||
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";
|
||||
|
|
Loading…
Reference in New Issue