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

automation around outputs section #197 

datalog toolset
This commit is contained in:
rusefillc 2021-11-28 16:36:30 -05:00
parent cc3c4bca0e
commit 27e9540e78
4 changed files with 126 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
firmware/console/binary/output_channels.txt
View File

@ -112,7 +112,7 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 0, 0
! Fuel system
uint16_t autoscale fuelTankLevel;"Fuel level";"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale totalFuelConsumption;;"grams",1, 0, 0, 0, 0
uint16_t autoscale totalFuelConsumption;@@GAUGE_NAME_FUEL_CONSUMPTION@@;"grams",1, 0, 0, 0, 0
uint16_t autoscale fuelFlowRate;@@GAUGE_NAME_FUEL_FLOW@@;"gram/s",{1/@@PACK_MULT_FUEL_FLOW@@}, 0, 0, 0, 0
! Y axis values for selectable tables
@ -159,8 +159,10 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 0, 0
uint16_t autoscale warningCounter;@@GAUGE_NAME_WARNING_COUNTER@@;"count",1, 0, 0, 0, 0
uint16_t autoscale lastErrorCode;@@GAUGE_NAME_WARNING_LAST@@;"error",1, 0, 0, 0, 0
! todo: re-implement enableLogErrorList
uint16_t[8 iterate] recentErrorCode;;"error", 1, 0, 0, 0, 0
! todo: re-implement enableLogDebugChannels
float autoscale debugFloatField1;;"val", 1, 0, 0, 0, 0
float autoscale debugFloatField2;;"val", 1, 0, 0, 0, 0
float autoscale debugFloatField3;;"val", 1, 0, 0, 0, 0
@ -175,9 +177,11 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 0, 0
uint16_t autoscale debugIntField4;;"val", 1, 0, 0, 0, 0
uint16_t autoscale debugIntField5;;"val", 1, 0, 0, 0, 0
uint16_t autoscale accelerationX;;"G",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale accelerationY;;"G",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
! todo: reimplement { LIS302DLCsPin != 0 || imuType != 0 }
uint16_t autoscale accelerationX;@@GAUGE_NAME_ACCEL_X@@;"G",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale accelerationY;@@GAUGE_NAME_ACCEL_Y@@;"G",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
! todo: { max31855_cs1 != 0}
uint16_t[EGT_CHANNEL_COUNT iterate] egt;;"deg C", 1, 0, 0, 0, 0
uint16_t autoscale TPS2Value;@@GAUGE_NAME_TPS2@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
@ -202,25 +206,25 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 0, 0
uint16_t autoscale rawIdlePositionSensor;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0
uint16_t autoscale rawWastegatePosition;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0
uint16_t autoscale wastegatePositionSensor;;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale idlePositionSensor;;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale wastegatePositionSensor;@@GAUGE_NAME_WG_POSITION@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale idlePositionSensor;@@GAUGE_NAME_IDLE_POSITION@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale rawLowFuelPressure;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0
uint16_t autoscale rawHighFuelPressure;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0
uint16_t autoscale lowFuelPressure;;"kpa",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0
uint16_t autoscale highFuelPressure;;"bar",{1/@@PACK_MULT_HIGH_PRESSURE@@}, 0, 0, 0, 0
uint16_t autoscale lowFuelPressure;@@GAUGE_NAME_FUEL_PRESSURE_LOW@@;"kpa",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0
uint16_t autoscale highFuelPressure;@@GAUGE_NAME_FUEL_PRESSURE_HIGH@@;"bar",{1/@@PACK_MULT_HIGH_PRESSURE@@}, 0, 0, 0, 0
uint16_t autoscale targetLambda;;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0
uint16_t autoscale targetLambda;@@GAUGE_NAME_TARGET_LAMBDA@@;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0
uint16_t autoscale AFRValue;@@GAUGE_NAME_AFR@@;"AFR",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0
uint16_t autoscale VssAcceleration;"Vss Accel";"m/s2",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0
uint16_t autoscale lambdaValue2;@@GAUGE_NAME_LAMBDA2@@;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0
uint16_t autoscale AFRValue2;@@GAUGE_NAME_AFR2@@;"AFR",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0
uint16_t autoscale vvtPositionB1E;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0
uint16_t autoscale vvtPositionB2I;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0
uint16_t autoscale vvtPositionB2E;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0
uint16_t autoscale vvtPositionB1E;@@GAUGE_NAME_VVT_B1E@@;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0
uint16_t autoscale vvtPositionB2I;@@GAUGE_NAME_VVT_B2I@@;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0
uint16_t autoscale vvtPositionB2E;@@GAUGE_NAME_VVT_B2E@@;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0
uint16_t[2 iterate] autoscale fuelPidCorrection;;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
@ -228,14 +232,14 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 0, 0
uint16_t autoscale rawTps2Primary;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0
uint16_t autoscale rawTps2Secondary;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0
uint16_t knockCount;;"",1, 0, 0, 0, 0
uint16_t knockCount;@@GAUGE_NAME_KNOCK_LEVEL@@;"",1, 0, 0, 0, 0
uint16_t autoscale accelerationZ;;"G",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale accelerationRoll;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale accelerationYaw;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale accelerationZ;@@GAUGE_NAME_ACCEL_Z@@;"G",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale accelerationRoll;@@GAUGE_NAME_ACCEL_ROLL@@;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale accelerationYaw;@@GAUGE_NAME_ACCEL_YAW@@;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint8_t[4 iterate] autoscale vvtTargets;;"deg",1, 0, 0, 0, 0
uint16_t turboSpeed;;"hz",1, 0, 0, 0, 0
uint16_t turboSpeed;@@GAUGE_NAME_TURBO_SPEED@@;"hz",1, 0, 0, 0, 0
! we have some unused bytes to allow compatible TS changes
uint8_t[20 iterate] unusedAtTheEnd;;"",1, 0, 0, 0, 0

18
firmware/console/binary/ts_outputs_generated.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Nov 28 16:09:14 EST 2021
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Nov 28 16:27:26 EST 2021
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -564,11 +564,13 @@ struct ts_outputs_s {
*/
scaled_channel<uint16_t, 1, 1> debugIntField5 = (uint16_t)0;
/**
* @@GAUGE_NAME_ACCEL_X@@
G
* offset 212
*/
scaled_channel<uint16_t, 100, 1> accelerationX = (uint16_t)0;
/**
* @@GAUGE_NAME_ACCEL_Y@@
G
* offset 214
*/
@ -657,6 +659,7 @@ struct ts_outputs_s {
*/
scaled_channel<uint16_t, 1000, 1> rawWastegatePosition = (uint16_t)0;
/**
* @@GAUGE_NAME_WG_POSITION@@
%
* offset 268
*/
@ -677,16 +680,19 @@ struct ts_outputs_s {
*/
scaled_channel<uint16_t, 1000, 1> rawHighFuelPressure = (uint16_t)0;
/**
* @@GAUGE_NAME_FUEL_PRESSURE_LOW@@
kpa
* offset 276
*/
scaled_channel<uint16_t, 30, 1> lowFuelPressure = (uint16_t)0;
/**
* @@GAUGE_NAME_FUEL_PRESSURE_HIGH@@
bar
* offset 278
*/
scaled_channel<uint16_t, 10, 1> highFuelPressure = (uint16_t)0;
/**
* @@GAUGE_NAME_TARGET_LAMBDA@@
* offset 280
*/
scaled_channel<uint16_t, 10000, 1> targetLambda = (uint16_t)0;
@ -714,16 +720,19 @@ struct ts_outputs_s {
*/
scaled_channel<uint16_t, 1000, 1> AFRValue2 = (uint16_t)0;
/**
* @@GAUGE_NAME_VVT_B1E@@
deg
* offset 290
*/
scaled_channel<uint16_t, 50, 1> vvtPositionB1E = (uint16_t)0;
/**
* @@GAUGE_NAME_VVT_B2I@@
deg
* offset 292
*/
scaled_channel<uint16_t, 50, 1> vvtPositionB2I = (uint16_t)0;
/**
* @@GAUGE_NAME_VVT_B2E@@
deg
* offset 294
*/
@ -749,19 +758,23 @@ struct ts_outputs_s {
*/
scaled_channel<uint16_t, 1000, 1> rawTps2Secondary = (uint16_t)0;
/**
* @@GAUGE_NAME_KNOCK_LEVEL@@
* offset 306
*/
uint16_t knockCount = (uint16_t)0;
/**
* @@GAUGE_NAME_ACCEL_Z@@
G
* offset 308
*/
scaled_channel<uint16_t, 100, 1> accelerationZ = (uint16_t)0;
/**
* @@GAUGE_NAME_ACCEL_ROLL@@
* offset 310
*/
scaled_channel<uint16_t, 100, 1> accelerationRoll = (uint16_t)0;
/**
* @@GAUGE_NAME_ACCEL_YAW@@
* offset 312
*/
scaled_channel<uint16_t, 100, 1> accelerationYaw = (uint16_t)0;
@ -771,6 +784,7 @@ struct ts_outputs_s {
*/
scaled_channel<uint8_t, 1, 1> vvtTargets[4];
/**
* @@GAUGE_NAME_TURBO_SPEED@@
hz
* offset 318
*/
@ -783,4 +797,4 @@ struct ts_outputs_s {
};
// end
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Nov 28 16:09:14 EST 2021
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Nov 28 16:27:26 EST 2021

171
firmware/tunerstudio/rusefi.input
View File

@ -1289,7 +1289,7 @@ entry = TPSValue, "TPS", float, "%.3f"
entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f"
entry = tpsADC, "tpsADC", int, "%d"
entry = MAFValue, "MAF", float, "%.3f"
entry = massAirFlowValue, "massAirFlowValue", float, "%.3f"
entry = massAirFlowValue, "MAF air flow", float, "%.3f"
entry = MAPValue, "MAP", float, "%.3f"
entry = baroPressure, "baroPressure", float, "%.3f"
entry = lambdaValue, "Lambda", float, "%.3f"
@ -1307,6 +1307,7 @@ entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f"
entry = veValue, "fuel: VE", float, "%.3f"
entry = injectionOffset, "injectionOffset", float, "%.3f"
entry = tCharge, "tCharge", float, "%.3f"
entry = injectorLagMs, "fuel: injector lag", float, "%.3f"
entry = iatCorrection, "fuel: IAT correction", float, "%.3f"
entry = cltCorrection, "fuel: CLT correction", float, "%.3f"
entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f"
@ -1340,74 +1341,89 @@ entry = totalTriggerErrorCounter, "trg err", int, "%d"
entry = orderingErrorCounter, "orderingErrorCounter", int, "%d"
entry = warningCounter, "warning: counter", int, "%d"
entry = lastErrorCode, "warning: last", int, "%d"
entry = TPS2Value, @@GAUGE_NAME_TPS2@@, float, "%.2f"
entry = AFRValue, @@GAUGE_NAME_AFR@@, float, "%.2f"
entry = AFRValue2, @@GAUGE_NAME_AFR2@@, float, "%.2f"
entry = lambdaValue2, @@GAUGE_NAME_LAMBDA2@@, float, "%.2f"
entry = ignitionAdvance, @@GAUGE_NAME_TIMING_ADVANCE@@, float, "%.2f"
entry = knockLevel, @@GAUGE_NAME_KNOCK_LEVEL@@, float, "%.2f"
entry = turboSpeed, @@GAUGE_NAME_TURBO_SPEED@@ int, "%d"
entry = speedToRpmRatio, "s2rpm", float, "%.3f"
entry = massAirFlowValue,@@GAUGE_NAME_AIR_FLOW@@, float, "%.3f"
entry = wastegatePositionSensor, @@GAUGE_NAME_WG_POSITION@@, float, "%.3f"
entry = totalTriggerErrorCounter, @@GAUGE_NAME_TRG_ERR@@,int, "%d"
entry = lowFuelPressure, @@GAUGE_NAME_FUEL_PRESSURE_LOW@@, float, "%.3f"
; entry = rawLowFuelPressure, @@GAUGE_NAME_RAW_FUEL_PRESSURE_LOW@@, float, "%.3f"
entry = highFuelPressure, @@GAUGE_NAME_FUEL_PRESSURE_HIGH@@, float, "%.3f"
; entry = rawHighFuelPressure, @@GAUGE_NAME_RAW_FUEL_PRESSURE_HIGH@@, float, "%.3f"
entry = injectorLagMs, , float, "%.3f"
entry = fuelPidCorrection1,@@GAUGE_NAME_FUEL_TRIM@@, float, "%.2f"
entry = fuelPidCorrection2,@@GAUGE_NAME_FUEL_TRIM_2@@, float, "%.2f"
entry = targetLambda, @@GAUGE_NAME_TARGET_LAMBDA@@, float,"%.4f"
entry = totalFuelConsumption, @@GAUGE_NAME_FUEL_CONSUMPTION@@, int, "%d"
entry = accelerationX, @@GAUGE_NAME_ACCEL_X@@, float,"%.2f", { LIS302DLCsPin != 0 || imuType != 0 }
entry = accelerationY, @@GAUGE_NAME_ACCEL_Y@@, float,"%.2f", { LIS302DLCsPin != 0 || imuType != 0 }
entry = accelerationZ, @@GAUGE_NAME_ACCEL_Z@@, float,"%.2f", { LIS302DLCsPin != 0 || imuType != 0 }
entry = accelerationRoll,@@GAUGE_NAME_ACCEL_ROLL@@,float,"%.2f", { LIS302DLCsPin != 0 || imuType != 0 }
entry = accelerationYaw, @@GAUGE_NAME_ACCEL_YAW@@, float,"%.2f", { LIS302DLCsPin != 0 || imuType != 0 }
entry = egt1, "EGT1", float,"%.1f", { max31855_cs1 != 0}
entry = egt2, "EGT2", float,"%.1f", { max31855_cs2 != 0}
entry = egt3, "EGT3", float,"%.1f", { max31855_cs3 != 0}
entry = egt4, "EGT4", float,"%.1f", { max31855_cs4 != 0}
entry = egt5, "EGT5", float,"%.1f", { max31855_cs5 != 0}
entry = egt6, "EGT6", float,"%.1f", { max31855_cs6 != 0}
entry = egt7, "EGT7", float,"%.1f", { max31855_cs7 != 0}
entry = egt8, "EGT8", float,"%.1f", { max31855_cs8 != 0}
entry = vvtPositionB1E, @@GAUGE_NAME_VVT_B1E@@, float, "%.1f"
entry = vvtPositionB2I, @@GAUGE_NAME_VVT_B2I@@, float, "%.1f"
entry = vvtPositionB2E, @@GAUGE_NAME_VVT_B2E@@, float, "%.1f"
entry = vvtTargets1, @@GAUGE_NAME_VVT_TARGET_B1I@@, int, "%d"
entry = vvtTargets2, @@GAUGE_NAME_VVT_TARGET_B1E@@, int, "%d"
entry = vvtTargets3, @@GAUGE_NAME_VVT_TARGET_B2I@@, int, "%d"
entry = vvtTargets4, @@GAUGE_NAME_VVT_TARGET_B2E@@, int, "%d"
; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d"
entry = debugFloatField1, {bitStringValue( debugFieldF1List, debugMode )},float,"%.4f", { !enableLogDebugChannels }
entry = debugFloatField2, {bitStringValue( debugFieldF2List, debugMode )},float,"%.4f", { !enableLogDebugChannels }
entry = debugFloatField3, {bitStringValue( debugFieldF3List, debugMode )},float,"%.4f", { !enableLogDebugChannels }
entry = debugFloatField4, {bitStringValue( debugFieldF4List, debugMode )},float,"%.4f", { !enableLogDebugChannels }
entry = debugFloatField5, {bitStringValue( debugFieldF5List, debugMode )},float,"%.4f", { !enableLogDebugChannels }
entry = debugFloatField6, {bitStringValue( debugFieldF6List, debugMode )},float,"%.4f", { !enableLogDebugChannels }
entry = debugFloatField7, {bitStringValue( debugFieldF7List, debugMode )},float,"%.4f", { !enableLogDebugChannels }
entry = debugIntField1, {bitStringValue( debugFieldI1List, debugMode )},int,"%d", { !enableLogDebugChannels }
entry = debugIntField2, {bitStringValue( debugFieldI2List, debugMode )},int,"%d", { !enableLogDebugChannels }
entry = debugIntField3, {bitStringValue( debugFieldI3List, debugMode )},int,"%d", { !enableLogDebugChannels }
entry = debugIntField4, {bitStringValue( debugFieldI4List, debugMode )},int,"%d", { !enableLogDebugChannels }
entry = debugIntField5, {bitStringValue( debugFieldI5List, debugMode )},int,"%d", { !enableLogDebugChannels }
entry = tuneCrc16, @@GAUGE_NAME_TUNE_CRC16@@,int,"%d"
entry = recentErrorCode1, "error 1",int,"%d", { !enableLogErrorList }
entry = recentErrorCode2, "error 2",int,"%d", { !enableLogErrorList }
entry = recentErrorCode3, "error 3",int,"%d", { !enableLogErrorList }
entry = recentErrorCode4, "error 4",int,"%d", { !enableLogErrorList }
entry = recentErrorCode5, "error 5",int,"%d", { !enableLogErrorList }
entry = recentErrorCode6, "error 6",int,"%d", { !enableLogErrorList }
entry = recentErrorCode7, "error 7",int,"%d", { !enableLogErrorList }
entry = recentErrorCode8, "error 8",int,"%d", { !enableLogErrorList }
entry = recentErrorCode1, "recentErrorCode1", int, "%d"
entry = recentErrorCode2, "recentErrorCode2", int, "%d"
entry = recentErrorCode3, "recentErrorCode3", int, "%d"
entry = recentErrorCode4, "recentErrorCode4", int, "%d"
entry = recentErrorCode5, "recentErrorCode5", int, "%d"
entry = recentErrorCode6, "recentErrorCode6", int, "%d"
entry = recentErrorCode7, "recentErrorCode7", int, "%d"
entry = recentErrorCode8, "recentErrorCode8", int, "%d"
entry = debugFloatField1, "debugFloatField1", float, "%.3f"
entry = debugFloatField2, "debugFloatField2", float, "%.3f"
entry = debugFloatField3, "debugFloatField3", float, "%.3f"
entry = debugFloatField4, "debugFloatField4", float, "%.3f"
entry = debugFloatField5, "debugFloatField5", float, "%.3f"
entry = debugFloatField6, "debugFloatField6", float, "%.3f"
entry = debugFloatField7, "debugFloatField7", float, "%.3f"
entry = debugIntField1, "debugIntField1", int, "%d"
entry = debugIntField2, "debugIntField2", int, "%d"
entry = debugIntField3, "debugIntField3", int, "%d"
entry = debugIntField4, "debugIntField4", int, "%d"
entry = debugIntField5, "debugIntField5", int, "%d"
entry = accelerationX, "Acceleration: X", float, "%.3f"
entry = accelerationY, "Acceleration: Y", float, "%.3f"
entry = egt1, "egt1", int, "%d"
entry = egt2, "egt2", int, "%d"
entry = egt3, "egt3", int, "%d"
entry = egt4, "egt4", int, "%d"
entry = egt5, "egt5", int, "%d"
entry = egt6, "egt6", int, "%d"
entry = egt7, "egt7", int, "%d"
entry = egt8, "egt8", int, "%d"
entry = TPS2Value, "TPS2", float, "%.3f"
entry = rawTps1Primary, "rawTps1Primary", float, "%.3f"
entry = rawPpsPrimary, "rawPpsPrimary", float, "%.3f"
entry = rawClt, "rawClt", float, "%.3f"
entry = rawIat, "rawIat", float, "%.3f"
entry = rawOilPressure, "rawOilPressure", float, "%.3f"
entry = tuneCrc16, "Tune CRC16", int, "%d"
entry = tcuCurrentGear, "Current Gear", int, "%d"
entry = rawPpsSecondary, "rawPpsSecondary", float, "%.3f"
entry = knock1, "knock1", int, "%d"
entry = knock2, "knock2", int, "%d"
entry = knock3, "knock3", int, "%d"
entry = knock4, "knock4", int, "%d"
entry = knock5, "knock5", int, "%d"
entry = knock6, "knock6", int, "%d"
entry = knock7, "knock7", int, "%d"
entry = knock8, "knock8", int, "%d"
entry = knock9, "knock9", int, "%d"
entry = knock10, "knock10", int, "%d"
entry = knock11, "knock11", int, "%d"
entry = knock12, "knock12", int, "%d"
entry = tcuDesiredGear, "Desired Gear", int, "%d"
entry = flexPercent, "Flex Ethanol %", float, "%.3f"
entry = rawIdlePositionSensor, "rawIdlePositionSensor", float, "%.3f"
entry = rawWastegatePosition, "rawWastegatePosition", float, "%.3f"
entry = wastegatePositionSensor, "Wastegate position sensor", float, "%.3f"
entry = idlePositionSensor, "idlePositionSensor", float, "%.3f"
entry = rawLowFuelPressure, "rawLowFuelPressure", float, "%.3f"
entry = rawHighFuelPressure, "rawHighFuelPressure", float, "%.3f"
entry = lowFuelPressure, "Fuel pressure (low)", float, "%.3f"
entry = highFuelPressure, "Fuel pressure (high)", float, "%.3f"
entry = targetLambda, "fuel: target lambda", float, "%.3f"
entry = AFRValue, "Air/Fuel Ratio", float, "%.3f"
entry = VssAcceleration, "Vss Accel", float, "%.3f"
entry = lambdaValue2, "Lambda 2", float, "%.3f"
entry = AFRValue2, "Air/Fuel Ratio 2", float, "%.3f"
entry = vvtPositionB1E, "VVT: bank 1 exhaust", float, "%.3f"
entry = vvtPositionB2I, "VVT: bank 2 intake", float, "%.3f"
entry = vvtPositionB2E, "VVT: bank 2 exhaust", float, "%.3f"
entry = fuelPidCorrection1, "fuelPidCorrection1", int, "%d"
entry = fuelPidCorrection2, "fuelPidCorrection2", int, "%d"
entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f"
entry = rawTps2Primary, "rawTps2Primary", float, "%.3f"
entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f"
entry = knockCount, "knock: current level", int, "%d"
entry = accelerationZ, "Acceleration: Z", float, "%.3f"
entry = accelerationRoll, "Acceleration: Roll", float, "%.3f"
entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f"
entry = vvtTargets1, "vvtTargets1", int, "%d"
entry = vvtTargets2, "vvtTargets2", int, "%d"
entry = vvtTargets3, "vvtTargets3", int, "%d"
entry = vvtTargets4, "vvtTargets4", int, "%d"
entry = turboSpeed, "Turbocharger Speed", int, "%d"
entry = clutchUpState, @@INDICATOR_NAME_CLUTCH_UP@@,int,"%d"
entry = clutchDownState, @@INDICATOR_NAME_CLUTCH_DOWN@@,int,"%d"
@ -1415,23 +1431,6 @@ entry = lastErrorCode, "warning: last", int, "%d"
entry = acSwitchState, @@INDICATOR_NAME_AC_SWITCH@@,int,"%d"
entry = isFanOn, "radiator fan",int,"%d"
; Transmission
entry = tcuDesiredGear, @@GAUGE_NAME_DESIRED_GEAR@@, int, "%d"
entry = tcuCurrentGear, @@GAUGE_NAME_CURRENT_GEAR@@, int, "%d"
entry = knock1, "Knock 1", int, "%d"
entry = knock2, "Knock 2", int, "%d"
entry = knock3, "Knock 3", int, "%d"
entry = knock4, "Knock 4", int, "%d"
entry = knock5, "Knock 5", int, "%d"
entry = knock6, "Knock 6", int, "%d"
entry = knock7, "Knock 7", int, "%d"
entry = knock8, "Knock 8", int, "%d"
entry = VssAcceleration, "Vss Accel", float, "%.3f"
entry = flexPercent, @@GAUGE_NAME_FLEX@@, int, "%d"
[Menu]
menuDialog = main

6
java_tools/configuration_definition/src/main/java/com/rusefi/test/OutputsTest.java
View File

@ -67,6 +67,7 @@ public class OutputsTest {
@Test
public void generateDataLog() throws IOException {
String test = "struct total\n" +
"uint8_t[2 iterate] autoscale knock;;\"\",1, 0, 0, 0, 0\n" +
"\tuint16_t autoscale baseFuel;@@GAUGE_NAME_FUEL_BASE@@\\nThis is the raw value we take from the fuel map or base fuel algorithm, before the corrections;\"mg\",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0\n" +
"float afr_type;PID dTime;\"ms\", 1, 0, 0, 3000, 0\n" +
"uint16_t autoscale speedToRpmRatio;s2rpm;\"value\",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0\n" +
@ -83,7 +84,10 @@ public class OutputsTest {
DataLogConsumer dataLogConsumer = new DataLogConsumer(null, state);
state.readBufferedReader(reader, Collections.singletonList(dataLogConsumer));
assertEquals("entry = baseFuel, \"hello\", float, \"%.3f\"\n" +
assertEquals(
"entry = knock1, \"knock1\", int, \"%d\"\n" +
"entry = knock2, \"knock2\", int, \"%d\"\n" +
"entry = baseFuel, \"hello\", float, \"%.3f\"\n" +
"entry = afr_type, \"PID dTime\", float, \"%.3f\"\n" +
"entry = speedToRpmRatio, \"s2rpm\", float, \"%.3f\"\n" +
"entry = afr_typet, \"afr_typet\", int, \"%d\"\n" +