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

Adding stuff into livedata.yaml needs _two_ rounds of config generation #4514

This commit is contained in:
rusefillc 2022-09-02 23:15:47 -04:00
parent d7f1207b93
commit 741cad0b07
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/gen_enum_to_string.sh
View File

@ -4,8 +4,9 @@ echo "This batch files reads rusefi_enums.h and produces auto_generated_enums.*
rm gen_enum_to_string.log
java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile console/binary/generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
[ $? -eq 0 ] || { echo "ERROR generating live data ids"; exit 1; }
# todo: remove me soon, UsageReader generates java by itself now!
#java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile console/binary/generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
#[ $? -eq 0 ] || { echo "ERROR generating live data ids"; exit 1; }
java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile controllers/sensors/sensor_type.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
[ $? -eq 0 ] || { echo "ERROR generating sensors"; exit 1; }

10
java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java
View File

@ -1,6 +1,8 @@
package com.rusefi.ldmp;
import com.devexperts.logging.Logging;
import com.rusefi.EnumToString;
import com.rusefi.InvokeReader;
import com.rusefi.ReaderState;
import com.rusefi.output.*;
import org.yaml.snakeyaml.Yaml;
@ -10,6 +12,7 @@ import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
@ -174,12 +177,17 @@ public class UsagesReader {
}
private void writeFiles() throws IOException {
try (FileWriter fw = new FileWriter("console/binary/generated/live_data_ids.h")) {
String liveDataIdsHeader = "console/binary/generated/live_data_ids.h";
try (FileWriter fw = new FileWriter(liveDataIdsHeader)) {
fw.write(enumContent.toString());
}
try (FileWriter fw = new FileWriter("console/binary/generated/live_data_fragments.h")) {
fw.write(fragmentsContent.toString());
}
String outputPath = "../java_console/io/src/main/java/com/rusefi/enums";
InvokeReader request = new InvokeReader(outputPath, Collections.singletonList(liveDataIdsHeader));
EnumToString.handleRequest(request);
}
}

BIN
java_tools/enum2string.jar
View File

Binary file not shown.