diff --git a/firmware/console/binary/tunerstudio_outputs.h b/firmware/console/binary/tunerstudio_outputs.h index 41a260311a..c5e021a40e 100644 --- a/firmware/console/binary/tunerstudio_outputs.h +++ b/firmware/console/binary/tunerstudio_outputs.h @@ -166,7 +166,7 @@ typedef struct { scaled_channel afrTableYAxis; // 106 // Knock - float knockLevel; // 108 + scaled_channel knockLevel; // 108 // Mode, firmware, protocol, run time uint32_t timeSeconds; // 112 diff --git a/firmware/console/binary_log/binary_logging.cpp b/firmware/console/binary_log/binary_logging.cpp index 35e4b59954..ecd3762a44 100644 --- a/firmware/console/binary_log/binary_logging.cpp +++ b/firmware/console/binary_log/binary_logging.cpp @@ -26,6 +26,8 @@ static const LogField fields[] = { {tsOutputChannels.internalMcuTemperature, GAUGE_NAME_CPU_TEMP, "C", 0}, {tsOutputChannels.coolantTemperature, GAUGE_NAME_CLT, "C", 1}, {tsOutputChannels.intakeAirTemperature, GAUGE_NAME_IAT, "C", 1}, + {tsOutputChannels.auxTemp1, GAUGE_NAME_AUX_TEMP1, "C", 1}, + {tsOutputChannels.auxTemp2, GAUGE_NAME_AUX_TEMP2, "C", 1}, {tsOutputChannels.throttlePosition, GAUGE_NAME_TPS, "%", 2}, {tsOutputChannels.throttle2Position, GAUGE_NAME_TPS2, "%", 2}, {tsOutputChannels.pedalPosition, GAUGE_NAME_THROTTLE_PEDAL, "%", 2}, @@ -49,7 +51,7 @@ static const LogField fields[] = { {tsOutputChannels.veValue, GAUGE_NAME_FUEL_VE, "%", 1}, {tsOutputChannels.tCharge, "tCharge", "C", 1}, {tsOutputChannels.injectorLagMs, GAUGE_NAME_INJECTOR_LAG, "ms", 3}, - {tsOutputChannels.shortTermFuelTrim, GAUGE_NAME_FUEL_PID_CORR, "%", 3}, + {tsOutputChannels.shortTermFuelTrim, GAUGE_NAME_FUEL_TRIM, "%", 3}, {tsOutputChannels.wallFuelCorrection, GAUGE_NAME_FUEL_WALL_CORRECTION, "ms", 3}, {tsOutputChannels.tpsAccelFuel, GAUGE_NAME_FUEL_TPS_EXTRA, "ms", 3}, {tsOutputChannels.ignitionAdvance, GAUGE_NAME_TIMING_ADVANCE, "deg", 1}, @@ -66,6 +68,10 @@ static const LogField fields[] = { {tsOutputChannels.flexPercent, GAUGE_NAME_FLEX, "%", 1}, {tsOutputChannels.fuelFlowRate, GAUGE_NAME_FUEL_FLOW, "g/s", 3}, {tsOutputChannels.totalFuelConsumption, GAUGE_NAME_FUEL_CONSUMPTION, "g", 1}, + {tsOutputChannels.engineLoad, GAUGE_NAME_ENGINE_LOAD, "%", 1}, + {tsOutputChannels.fuelingLoad, GAUGE_NAME_FUEL_LOAD, "%", 1}, + {tsOutputChannels.ignitionLoad, GAUGE_NAME_IGNITION_LOAD, "%", 1}, + {tsOutputChannels.knockLevel, GAUGE_NAME_KNOCK_LEVEL, "dBv", 0}, }; void writeHeader(Writer& outBuffer) { diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 4d9572d930..ae8f8b44ea 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1657,6 +1657,8 @@ end_struct #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_CLT "CLT" #define GAUGE_NAME_IAT "IAT" +#define GAUGE_NAME_AUX_TEMP1 "Aux temp 1" +#define GAUGE_NAME_AUX_TEMP2 "Aux temp 2" #define GAUGE_NAME_TPS "TPS" #define GAUGE_NAME_TPS2 "TPS2" #define GAUGE_NAME_MAP "MAP" @@ -1719,7 +1721,7 @@ end_struct #define GAUGE_NAME_FUEL_RUNNING "fuel: running" #define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: Last injection" #define GAUGE_NAME_FUEL_BASE "fuel: base mass" -#define GAUGE_NAME_FUEL_PID_CORR "fuel: Short-term fuel trim" +#define GAUGE_NAME_FUEL_TRIM "fuel: fuel trim" #define GAUGE_NAME_FUEL_WALL_AMOUNT "fuel: wall amount" #define GAUGE_NAME_FUEL_WALL_CORRECTION "fuel: wall corr ms" #define GAUGE_NAME_FUEL_LOAD "fuel: load" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 1cf69a7f56..b9d642160b 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1029,8 +1029,8 @@ gaugeCategory = Sensors - Extra 1 internalMcuTemperatureGauge = internalMcuTemperature, @@GAUGE_NAME_ECU_TEMPERATURE@@, "C", 0, 100, 0, 0, 75, 100, 0, 0 OilPressGauge = oilPressure, @@GAUGE_NAME_OIL_PRESSURE@@, @@GAUGE_NAME_OIL_PRESSURE_UNITS@@, 0, 750, 35, 75, 550, 700, 0, 0 idleAirValvePositionGauge = idleAirValvePosition, "Idle position", "%", 0, 100, 0, 0, 100, 100, 1, 1 - AuxT1Gauge = auxt1, "Aux temp 1", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 - AuxT2Gauge = auxt2, "Aux temp 2", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 + AuxT1Gauge = auxt1, @@GAUGE_NAME_AUX_TEMP1@@, "deg C", -40, 140, -15, 1, 95, 110, 1, 1 + AuxT2Gauge = auxt2, @@GAUGE_NAME_AUX_TEMP2@@, "deg C", -40, 140, -15, 1, 95, 110, 1, 1 lowFuelPressureGauge = lowFuelPressure, @@GAUGE_NAME_FUEL_PRESSURE_LOW@@, @@GAUGE_NAME_FUEL_PRESSURE_LOW_UNITS@@, 0, 700, 0, 0, 700, 700, 1, 0 highFuelPressureGauge = highFuelPressure, @@GAUGE_NAME_FUEL_PRESSURE_HIGH@@, @@GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS@@, 0, 200, 0, 0, 200, 200, 1, 0 flexPercentGauge = flexPercent, @@GAUGE_NAME_FLEX@@, "%", 0, 100, 0, 0, 100, 100, 0, 0 @@ -1063,7 +1063,7 @@ gaugeCategory = Fueling injectorLagMsGauge = injectorLagMs, @@GAUGE_NAME_INJECTOR_LAG@@, "mSec", 0, 10, 0, 0, 10, 10, 3, 1 fuelRunningGauge = fuelRunning, @@GAUGE_NAME_FUEL_RUNNING@@, "mg", 0, 100, 0, 0, 100, 100, 3, 1 baseFuelGauge = baseFuel, @@GAUGE_NAME_FUEL_BASE@@, "mg", 0, 100, 0, 0, 100, 100, 2, 0 - fuelPidCorrectionGauge = fuelPidCorrection, @@GAUGE_NAME_FUEL_PID_CORR@@, "%", -10, 10, -8, -5, 5, 8, 3, 1 + fuelPidCorrectionGauge = fuelPidCorrection, @@GAUGE_NAME_FUEL_TRIM@@, "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, @@GAUGE_NAME_FUEL_LOAD@@, "%", 0, 300, 0, 0, 300, 300, 1, 1 totalFuelConsumptionGauge = totalFuelConsumption, @@GAUGE_NAME_FUEL_CONSUMPTION@@, "g", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelFlowRateGauge = fuelFlowRate, @@GAUGE_NAME_FUEL_FLOW@@, "g/s", 0, 50, 0, 0, 50, 50, 2, 0 @@ -1255,7 +1255,7 @@ gaugeCategory = DynoView entry = fuelRunning, @@GAUGE_NAME_FUEL_RUNNING@@, float, "%.3f" entry = actualLastInjection, @@GAUGE_NAME_FUEL_LAST_INJECTION@@, float, "%.3f" entry = baseFuel, @@GAUGE_NAME_FUEL_BASE@@, float, "%.2f" - entry = fuelPidCorrection,@@GAUGE_NAME_FUEL_PID_CORR@@, float, "%.2f" + entry = fuelPidCorrection,@@GAUGE_NAME_FUEL_TRIM@@, float, "%.2f" entry = veValue, @@GAUGE_NAME_FUEL_VE@@, float, "%.3f" entry = injectorDutyCycle,@@GAUGE_NAME_FUEL_INJ_DUTY@@,float,"%.3f" entry = coilDutyCycle, @@GAUGE_NAME_DWELL_DUTY@@, float,"%.3f"