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

generated

This commit is contained in:
rusefi 2020-07-06 01:09:05 -04:00
parent e87e8ed815
commit f93e204c3c
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/gen_config_board.sh
View File

@ -25,7 +25,7 @@ java -DSystemOut.name=gen_config_board \
com.rusefi.board_generator.BoardReader \ com.rusefi.board_generator.BoardReader \
-yaml config/boards/${BOARDNAME}/mapping.yaml \ -yaml config/boards/${BOARDNAME}/mapping.yaml \
-firmware_path . \ -firmware_path . \
-output_file tunerstudio/${BOARDNAME}_prefix.txt \ -output_file tunerstudio/generated/${BOARDNAME}_prefix.txt \
-enumInputFile controllers/algo/rusefi_enums.h \ -enumInputFile controllers/algo/rusefi_enums.h \
-enumInputFile controllers/algo/rusefi_hw_enums.h -enumInputFile controllers/algo/rusefi_hw_enums.h
@ -43,7 +43,7 @@ java -DSystemOut.name=gen_config_board \
-ts_output_name rusefi_${SHORT_BOARDNAME}.ini \ -ts_output_name rusefi_${SHORT_BOARDNAME}.ini \
-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \ -signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \ -signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
-prepend tunerstudio/${BOARDNAME}_prefix.txt \ -prepend tunerstudio/generated/${BOARDNAME}_prefix.txt \
-prepend config/boards/${BOARDNAME}/prepend.txt -prepend config/boards/${BOARDNAME}/prepend.txt
java -DSystemOut.name=gen_config_board \ java -DSystemOut.name=gen_config_board \
@ -57,7 +57,7 @@ java -DSystemOut.name=gen_config_board \
-ts_output_name rusefi_${BOARDNAME}.ini \ -ts_output_name rusefi_${BOARDNAME}.ini \
-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \ -signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \ -signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
-prepend tunerstudio/${BOARDNAME}_prefix.txt \ -prepend tunerstudio/generated/${BOARDNAME}_prefix.txt \
-prepend config/boards/${BOARDNAME}/prepend.txt -prepend config/boards/${BOARDNAME}/prepend.txt
[ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; } [ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; }

7
java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java
View File

@ -24,11 +24,9 @@ public class BoardReader {
private static final String KEY_BOARD_NAME = "-board"; private static final String KEY_BOARD_NAME = "-board";
private static final String YAML_INPUT_NAME = "-yaml"; private static final String YAML_INPUT_NAME = "-yaml";
private static final String OUTPUT_FILE_NAME = "-output_file"; private static final String OUTPUT_FILE_NAME = "-output_file";
private static final String KEY_OUTFOLDER = "-out";
private static final String KEY_FIRMWARE_PATH = "-firmware_path"; private static final String KEY_FIRMWARE_PATH = "-firmware_path";
private final static String KEY_ENUM_INPUT_FILE = "-enumInputFile"; private final static String KEY_ENUM_INPUT_FILE = "-enumInputFile";
private static final String OUTPUT_FILE_PREFIX = "_prefix.txt";
private static final String MAPPING_YAML = "mapping.yaml"; private static final String MAPPING_YAML = "mapping.yaml";
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
@ -41,7 +39,6 @@ public class BoardReader {
} }
String boardName = null; String boardName = null;
String firmwarePath = "firmware"; String firmwarePath = "firmware";
String outputPath = ".";
String yamlInputFile = null; String yamlInputFile = null;
String outputFileName = null; String outputFileName = null;
for (int i = 0; i < args.length - 1; i += 2) { for (int i = 0; i < args.length - 1; i += 2) {
@ -58,8 +55,6 @@ public class BoardReader {
} else if (key.equals(KEY_ENUM_INPUT_FILE)) { } else if (key.equals(KEY_ENUM_INPUT_FILE)) {
String inputFile = args[i + 1]; String inputFile = args[i + 1];
EnumsReader.process(new FileReader(firmwarePath + File.separator + inputFile)); EnumsReader.process(new FileReader(firmwarePath + File.separator + inputFile));
} else if (key.equals(KEY_OUTFOLDER)) {
outputPath = args[i + 1];
} }
} }
@ -70,8 +65,6 @@ public class BoardReader {
} else { } else {
SystemOut.println(data); SystemOut.println(data);
if (outputFileName == null)
outputFileName = outputPath + File.separator + boardName + OUTPUT_FILE_PREFIX;
Output bw = new LazyFile(outputFileName); Output bw = new LazyFile(outputFileName);
bw.write(processSection(data, "brain_pin_e", "output_pin_e", "outputs", "GPIO_UNASSIGNED")); bw.write(processSection(data, "brain_pin_e", "output_pin_e", "outputs", "GPIO_UNASSIGNED"));