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

SD card bit datapoints #7227 

only:embedded structure bugfix
This commit is contained in:
rusefillc 2025-01-07 20:27:20 -05:00
parent f18192dc31
commit 51f96c82a9
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,10 +46,10 @@ public class SdCardFieldsGeneratorTest {
"\t{test->reference.fue2lMult, \"Lua: Fuel mult\", \"\", 0},\n" + "\t{test->reference.fue2lMult, \"Lua: Fuel mult\", \"\", 0},\n" +
"\t{test->reference.rpmAcceleration, \"dRPM\", \"RPM/s\", 2},\n" + "\t{test->reference.rpmAcceleration, \"dRPM\", \"RPM/s\", 2},\n" +
"\t{test->reference.lua.fuelMult, \"Lua: Fuel mult\", \"\", 0},\n" + "\t{test->reference.lua.fuelMult, \"Lua: Fuel mult\", \"\", 0},\n" +
"// structureStartingTsPosition 0 test->reference/\"lua.clutchUpState\", skipping bit at 4 4@0\n" + "// structureStartingTsPosition 0 test->reference/\"lua.clutchUpState\", skipping bit at 24 24@0\n" +
"// structureStartingTsPosition 0 test->reference/\"lua.brakePedalState\", skipping bit at 4 4@1\n" + "// structureStartingTsPosition 0 test->reference/\"lua.brakePedalState\", skipping bit at 24 24@1\n" +
"// structureStartingTsPosition 0 test->reference/\"lua.disableDecelerationFuelCutOff\", skipping bit at 4 4@2\n" + "// structureStartingTsPosition 0 test->reference/\"lua.disableDecelerationFuelCutOff\", skipping bit at 24 24@2\n" +
"// structureStartingTsPosition 0 test->reference/\"lua.torqueReductionState\", skipping bit at 4 4@3\n" + "// structureStartingTsPosition 0 test->reference/\"lua.torqueReductionState\", skipping bit at 24 24@3\n" +
"\t{test->reference.speedToRpmRatio, \"ra\", \"value\", 0},\n", actor, false); "\t{test->reference.speedToRpmRatio, \"ra\", \"value\", 0},\n", actor, false);
} }

2
java_tools/configuration_definition_base/src/main/java/com/rusefi/output/PerFieldWithStructuresIterator.java
View File

@ -40,7 +40,7 @@ class PerFieldWithStructuresIterator extends FieldIterator {
// java side of things does not care for 'cs.withPrefix' // java side of things does not care for 'cs.withPrefix'
String extraPrefix = variableNamePrefix + strategy.getArrayElementName(cf) + prefixSeparator; String extraPrefix = variableNamePrefix + strategy.getArrayElementName(cf) + prefixSeparator;
PerFieldWithStructuresIterator fieldIterator = new PerFieldWithStructuresIterator(state, cs.getTsFields(), extraPrefix, strategy, prefixSeparator); PerFieldWithStructuresIterator fieldIterator = new PerFieldWithStructuresIterator(state, cs.getTsFields(), extraPrefix, strategy, prefixSeparator);
fieldIterator.loop(0); fieldIterator.loop(currentPosition);
content = fieldIterator.sb.toString(); content = fieldIterator.sb.toString();
} }
} else { } else {

4
java_tools/configuration_definition_base/src/main/java/com/rusefi/output/SdCardFieldsContent.java
View File

@ -76,8 +76,8 @@ public class SdCardFieldsContent {
if (configField.isBit()) { if (configField.isBit()) {
// 'structureStartingTsPosition' is about fragment list see fragments.h // 'structureStartingTsPosition' is about fragment list see fragments.h
int offsetWithinCurrentStructure = currentPosition - structureStartingTsPosition; int offsetWithinCurrentStructure = currentPosition - structureStartingTsPosition;
// if (offsetWithinCurrentStructure < 0) if (offsetWithinCurrentStructure < 0)
// throw new IllegalStateException(humanName + " seems broken: " + currentPosition + " vs " + structureStartingTsPosition); throw new IllegalStateException(humanName + " seems broken: " + currentPosition + " vs " + structureStartingTsPosition);
return "// structureStartingTsPosition " + structureStartingTsPosition + " " + expression + "/" + humanName + ", skipping bit " + namePrefix + " at " + currentPosition + " " + offsetWithinCurrentStructure + "@" + perFieldWithStructuresIterator.bitState.get() + "\n"; return "// structureStartingTsPosition " + structureStartingTsPosition + " " + expression + "/" + humanName + ", skipping bit " + namePrefix + " at " + currentPosition + " " + offsetWithinCurrentStructure + "@" + perFieldWithStructuresIterator.bitState.get() + "\n";
} }

8
java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java
View File

@ -164,10 +164,10 @@ public class LiveDataProcessorTest {
"\t{engine->outputChannels.oootempC, \"Temperature\", \"C\", 0},\n" + "\t{engine->outputChannels.oootempC, \"Temperature\", \"C\", 0},\n" +
"\t{engine->outputChannels.oooesr, \"ESR\", \"ohm\", 0},\n" + "\t{engine->outputChannels.oooesr, \"ESR\", \"ohm\", 0},\n" +
"\t{engine->outputChannels.lua.fuelMult, \"Lua: Fuel mult\", \"\", 0},\n" + "\t{engine->outputChannels.lua.fuelMult, \"Lua: Fuel mult\", \"\", 0},\n" +
"// structureStartingTsPosition 24 engine->outputChannels/\"lua.clutchUpState\", skipping bit at 4 -20@0\n" + "// structureStartingTsPosition 24 engine->outputChannels/\"lua.clutchUpState\", skipping bit at 32 8@0\n" +
"// structureStartingTsPosition 24 engine->outputChannels/\"lua.brakePedalState\", skipping bit at 4 -20@1\n" + "// structureStartingTsPosition 24 engine->outputChannels/\"lua.brakePedalState\", skipping bit at 32 8@1\n" +
"// structureStartingTsPosition 24 engine->outputChannels/\"lua.disableDecelerationFuelCutOff\", skipping bit at 4 -20@2\n" + "// structureStartingTsPosition 24 engine->outputChannels/\"lua.disableDecelerationFuelCutOff\", skipping bit at 32 8@2\n" +
"// structureStartingTsPosition 24 engine->outputChannels/\"lua.torqueReductionState\", skipping bit at 4 -20@3\n" + "// structureStartingTsPosition 24 engine->outputChannels/\"lua.torqueReductionState\", skipping bit at 32 8@3\n" +
"};\n", "};\n",
destinationFolder + SdCardFieldsContent.SD_CARD_OUTPUT_FILE_NAME); destinationFolder + SdCardFieldsContent.SD_CARD_OUTPUT_FILE_NAME);