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

SD card log fields list should be auto-generated #3985 

progress
This commit is contained in:
rusefillc 2022-10-12 19:46:17 -04:00
parent 7250f8f4dc
commit ddaf9fb838
3 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
firmware/console/binary_log/log_fields_generated.h
View File

@ -147,73 +147,73 @@ static constexpr LogField fields[] = {
{engine->outputChannels.vvtTargets[1], "vvtTargets 2", "deg", 0},
{engine->outputChannels.vvtTargets[2], "vvtTargets 3", "deg", 0},
{engine->outputChannels.vvtTargets[3], "vvtTargets 4", "deg", 0},
// {engine->outputChannels.turboSpeed, "Turbocharger Speed", "hz", 0},
// {engine->outputChannels.tps1Split, "tps1Split", "%", 2},
// {engine->outputChannels.tps2Split, "tps2Split", "%", 2},
// {engine->outputChannels.tps12Split, "tps12Split", "%", 2},
// {engine->outputChannels.accPedalSplit, "accPedalSplit", "%", 2},
// {engine->outputChannels.sparkCutReason, "Spark Cut Code", "code", 0},
// {engine->outputChannels.fuelCutReason, "Fuel Cut Code", "code", 0},
// {engine->outputChannels.mafEstimate, "MAF estimate", "kg/h", 0},
// {engine->outputChannels.instantRpm, "instantRpm", "rpm", 0},
// {engine->outputChannels.systemEventReuse, "systemEventReuse", "counter", 0},
// {engine->outputChannels.rawMap, "rawMap", "V", 3},
// {engine->outputChannels.rawAfr, "rawAfr", "V", 3},
// {engine->outputChannels.tpsAccelFrom, "tpsAccelFrom", "%", 0},
// {engine->outputChannels.tpsAccelTo, "tpsAccelTo", "%", 0},
// {engine->outputChannels.calibrationValue2, "calibrationValue2", "", 0},
{engine->outputChannels.turboSpeed, "Turbocharger Speed", "hz", 0},
{engine->outputChannels.tps1Split, "tps1Split", "%", 2},
{engine->outputChannels.tps2Split, "tps2Split", "%", 2},
{engine->outputChannels.tps12Split, "tps12Split", "%", 2},
{engine->outputChannels.accPedalSplit, "accPedalSplit", "%", 2},
{engine->outputChannels.sparkCutReason, "Spark Cut Code", "code", 0},
{engine->outputChannels.fuelCutReason, "Fuel Cut Code", "code", 0},
{engine->outputChannels.mafEstimate, "MAF estimate", "kg/h", 0},
{engine->outputChannels.instantRpm, "instantRpm", "rpm", 0},
{engine->outputChannels.systemEventReuse, "systemEventReuse", "counter", 0},
{engine->outputChannels.rawMap, "rawMap", "V", 3},
{engine->outputChannels.rawAfr, "rawAfr", "V", 3},
{engine->outputChannels.tpsAccelFrom, "tpsAccelFrom", "%", 0},
{engine->outputChannels.tpsAccelTo, "tpsAccelTo", "%", 0},
{engine->outputChannels.calibrationValue2, "calibrationValue2", "", 0},
// {engine->outputChannels.luaInvocationCounter, "luaInvocationCounter", "count", 0},
// {engine->outputChannels.luaLastCycleDuration, "luaLastCycleDuration", "nt", 0},
// {engine->outputChannels.testBenchIter, "testBenchIter", "count", 0},
// {engine->outputChannels.tcu_currentRange, "Current Range", "", 0},
// {engine->outputChannels.tcRatio, "Torque Converter Ratio", "value", 0},
// {engine->outputChannels.lastShiftTime, "lastShiftTime", "", 0},
{engine->outputChannels.testBenchIter, "testBenchIter", "count", 0},
{engine->outputChannels.tcu_currentRange, "Current Range", "", 0},
{engine->outputChannels.tcRatio, "Torque Converter Ratio", "value", 0},
{engine->outputChannels.lastShiftTime, "lastShiftTime", "", 0},
// {engine->outputChannels.vssEdgeCounter, "vssEdgeCounter", "", 0},
// {engine->outputChannels.issEdgeCounter, "issEdgeCounter", "", 0},
// {engine->outputChannels.auxLinear1, "Aux Linear 1", "", 2},
// {engine->outputChannels.auxLinear2, "Aux Linear 2", "", 2},
// {engine->outputChannels.boostControllerOutput, "Boost Output", "%", 1},
// {engine->outputChannels.boostControllerOpenLoopPart, "Boost Open Loop", "%", 1},
// {engine->outputChannels.fallbackMap, "fallbackMap", "kPa", 1},
// {engine->outputChannels.detectedGear, "Detected Gear", "", 0},
// {engine->outputChannels.instantMAPValue, "Instant MAP", "kPa", 2},
// {engine->outputChannels.maxLockedDuration, "maxLockedDuration", "us", 0},
// {engine->outputChannels.maxTriggerReentrant, "maxTriggerReentrant", "", 0},
// {engine->outputChannels.canWriteOk, "canWriteOk", "", 3},
// {engine->outputChannels.canWriteNotOk, "canWriteNotOk", "", 3},
{engine->outputChannels.auxLinear1, "Aux Linear 1", "", 2},
{engine->outputChannels.auxLinear2, "Aux Linear 2", "", 2},
{engine->outputChannels.boostControllerOutput, "Boost Output", "%", 1},
{engine->outputChannels.boostControllerOpenLoopPart, "Boost Open Loop", "%", 1},
{engine->outputChannels.fallbackMap, "fallbackMap", "kPa", 1},
{engine->outputChannels.detectedGear, "Detected Gear", "", 0},
{engine->outputChannels.instantMAPValue, "Instant MAP", "kPa", 2},
{engine->outputChannels.maxLockedDuration, "maxLockedDuration", "us", 0},
{engine->outputChannels.maxTriggerReentrant, "maxTriggerReentrant", "", 0},
{engine->outputChannels.canWriteOk, "canWriteOk", "", 3},
{engine->outputChannels.canWriteNotOk, "canWriteNotOk", "", 3},
// {engine->outputChannels.triggerPrimaryFall, "triggerPrimaryFall", "", 3},
// {engine->outputChannels.triggerPrimaryRise, "triggerPrimaryRise", "", 3},
// {engine->outputChannels.triggerSecondaryFall, "triggerSecondaryFall", "", 3},
// {engine->outputChannels.triggerSecondaryRise, "triggerSecondaryRise", "", 3},
// {engine->outputChannels.triggerVvtFall, "triggerVvtFall", "", 3},
// {engine->outputChannels.triggerVvtRise, "triggerVvtRise", "", 3},
// {engine->outputChannels.starterState, "starterState", "", 3},
// {engine->outputChannels.starterRelayDisable, "starterRelayDisable", "", 3},
// {engine->outputChannels.multiSparkCounter, "multiSparkCounter", "", 3},
// {engine->outputChannels.alternatorStatus.pTerm, "alternatorStatus.pTerm", "", 2},
// {engine->outputChannels.alternatorStatus.iTerm, "alternatorStatus.iTerm", "", 2},
// {engine->outputChannels.alternatorStatus.dTerm, "alternatorStatus.dTerm", "", 2},
// {engine->outputChannels.alternatorStatus.output, "alternatorStatus.output", "", 2},
// {engine->outputChannels.alternatorStatus.error, "alternatorStatus.error", "", 2},
// {engine->outputChannels.alternatorStatus.resetCounter, "alternatorStatus.resetCounter", "", 0},
// {engine->outputChannels.idleStatus.pTerm, "idleStatus.pTerm", "", 2},
// {engine->outputChannels.idleStatus.iTerm, "idleStatus.iTerm", "", 2},
// {engine->outputChannels.idleStatus.dTerm, "idleStatus.dTerm", "", 2},
// {engine->outputChannels.idleStatus.output, "idleStatus.output", "", 2},
// {engine->outputChannels.idleStatus.error, "idleStatus.error", "", 2},
// {engine->outputChannels.idleStatus.resetCounter, "idleStatus.resetCounter", "", 0},
// {engine->outputChannels.etbStatus.pTerm, "etbStatus.pTerm", "", 2},
// {engine->outputChannels.etbStatus.iTerm, "etbStatus.iTerm", "", 2},
// {engine->outputChannels.etbStatus.dTerm, "etbStatus.dTerm", "", 2},
// {engine->outputChannels.etbStatus.output, "etbStatus.output", "", 2},
// {engine->outputChannels.etbStatus.error, "etbStatus.error", "", 2},
// {engine->outputChannels.etbStatus.resetCounter, "etbStatus.resetCounter", "", 0},
// {engine->outputChannels.boostStatus.pTerm, "boostStatus.pTerm", "", 2},
// {engine->outputChannels.boostStatus.iTerm, "boostStatus.iTerm", "", 2},
// {engine->outputChannels.boostStatus.dTerm, "boostStatus.dTerm", "", 2},
// {engine->outputChannels.boostStatus.output, "boostStatus.output", "", 2},
// {engine->outputChannels.boostStatus.error, "boostStatus.error", "", 2},
// {engine->outputChannels.boostStatus.resetCounter, "boostStatus.resetCounter", "", 0},
{engine->outputChannels.starterState, "starterState", "", 3},
{engine->outputChannels.starterRelayDisable, "starterRelayDisable", "", 3},
{engine->outputChannels.multiSparkCounter, "multiSparkCounter", "", 3},
{engine->outputChannels.alternatorStatus.pTerm, "alternatorStatus.pTerm", "", 2},
{engine->outputChannels.alternatorStatus.iTerm, "alternatorStatus.iTerm", "", 2},
{engine->outputChannels.alternatorStatus.dTerm, "alternatorStatus.dTerm", "", 2},
{engine->outputChannels.alternatorStatus.output, "alternatorStatus.output", "", 2},
{engine->outputChannels.alternatorStatus.error, "alternatorStatus.error", "", 2},
{engine->outputChannels.alternatorStatus.resetCounter, "alternatorStatus.resetCounter", "", 0},
{engine->outputChannels.idleStatus.pTerm, "idleStatus.pTerm", "", 2},
{engine->outputChannels.idleStatus.iTerm, "idleStatus.iTerm", "", 2},
{engine->outputChannels.idleStatus.dTerm, "idleStatus.dTerm", "", 2},
{engine->outputChannels.idleStatus.output, "idleStatus.output", "", 2},
{engine->outputChannels.idleStatus.error, "idleStatus.error", "", 2},
{engine->outputChannels.idleStatus.resetCounter, "idleStatus.resetCounter", "", 0},
{engine->outputChannels.etbStatus.pTerm, "etbStatus.pTerm", "", 2},
{engine->outputChannels.etbStatus.iTerm, "etbStatus.iTerm", "", 2},
{engine->outputChannels.etbStatus.dTerm, "etbStatus.dTerm", "", 2},
{engine->outputChannels.etbStatus.output, "etbStatus.output", "", 2},
{engine->outputChannels.etbStatus.error, "etbStatus.error", "", 2},
{engine->outputChannels.etbStatus.resetCounter, "etbStatus.resetCounter", "", 0},
{engine->outputChannels.boostStatus.pTerm, "boostStatus.pTerm", "", 2},
{engine->outputChannels.boostStatus.iTerm, "boostStatus.iTerm", "", 2},
{engine->outputChannels.boostStatus.dTerm, "boostStatus.dTerm", "", 2},
{engine->outputChannels.boostStatus.output, "boostStatus.output", "", 2},
{engine->outputChannels.boostStatus.error, "boostStatus.error", "", 2},
{engine->outputChannels.boostStatus.resetCounter, "boostStatus.resetCounter", "", 0},
// {engine->outputChannels.auxSpeed1, "aux speed 1", "s", 0},
// {engine->outputChannels.auxSpeed2, "aux speed 2", "s", 0},
// {engine->outputChannels.ISSValue, "Input Shaft Speed", "RPM", 0},

4
java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsConsumer.java
View File

@ -51,9 +51,9 @@ public class SdCardFieldsConsumer implements ConfigurationConsumer {
if (configField.isFromIterate()) {
String name = configField.getIterateOriginalName() + "[" + (configField.getIterateIndex() - 1) + "]";
return getLine(readerState, configField, prefix, name);
return getLine(readerState, configField, prefix, prefix + name);
} else {
return getLine(readerState, configField, prefix, configField.getName());
return getLine(readerState, configField, prefix, prefix + configField.getName());
}
}

2
java_tools/configuration_definition/src/test/java/com/rusefi/test/SdCardFieldsGeneratorTest.java
View File

@ -68,7 +68,7 @@ public class SdCardFieldsGeneratorTest {
" end_struct\n" +
"\tpid_status_s alternatorStatus\n" +
"end_struct",
"\t{engine->outputChannels.pTerm, \"alternatorStatus.pTerm\", \"\", 2},\n",
"\t{engine->outputChannels.alternatorStatus.pTerm, \"alternatorStatus.pTerm\", \"\", 2},\n",
readerState -> {
});