Fix boards (#1520)

* fix gen_config.sh

* change file extension

* convert kinetis gen_config

Co-authored-by: rusefi <rusefi@users.noreply.github.com>
This commit is contained in:
David Holdeman 2020-06-19 07:10:17 -07:00 committed by GitHub
parent e141d9da1e
commit b31fa89668
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 18 deletions

View File

@ -0,0 +1,33 @@
# This batch files reads rusefi_config.txt and produses firmware persistent configuration headers
# the storage section of rusefi.ini is updated as well
cd ../../../..
pwd
java \
-DSystemOut.name=gen_config_kinetis_board \
-cp ../java_tools/ConfigDefinition.jar \
com.rusefi.board_generator.BoardReader \
-board kinetis \
-firmware_path . \
-out config/boards/kinetis/config/tunerstudio \
-enumInputFile controllers/algo/rusefi_enums.h \
-enumInputFile config/boards/kinetis/rusefi_hw_enums.h
java \
-DSystemOut.name=gen_config_kinetis \
-Drusefi.generator.lazyfile.enabled=true \
-jar ../java_tools/ConfigDefinition.jar \
-definition integration/rusefi_config.txt \
-ts_destination tunerstudio \
-tool kineris_gen_config.bat \
-firing_order controllers/algo/firing_order.h \
-with_c_defines false \
-initialize_to_zero false \
-ts_output_name rusefi_kinetis.ini \
-c_defines config/boards/kinetis/config/controllers/algo/rusefi_generated.h \
-c_destination config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h \
-prepend config/boards/kinetis/config/rusefi_config_kinetis.txt \
-prepend config/boards/kinetis/config/tunerstudio/kinetis_prefix.txt

View File

@ -11,31 +11,24 @@ rm gen_config_board.log
mkdir build
java $(< gen_config.conf)
java $(< ../gen_config.conf)
[ $? -eq 0 ] || (echo "ERROR generating"; exit $?)
if [ -z "${TS_PATH}" ]; then
echo "TS_PATH not defined"
echo "TS_PATH not defined"
else
echo "This would automatically copy latest file to 'dev' TS project at ${TS_PATH}"
cp -v tunerstudio/rusefi.ini $TS_PATH/dev/projectCfg/mainController.ini
cp -v tunerstudio/rusefi_microrusefi.ini $TS_PATH/dev_mre/projectCfg/mainController.ini
echo "This would automatically copy latest file to 'dev' TS project at ${TS_PATH}"
cp -v tunerstudio/rusefi.ini $TS_PATH/dev/projectCfg/mainController.ini
cp -v tunerstudio/rusefi_microrusefi.ini $TS_PATH/dev_mre/projectCfg/mainController.ini
fi
sh gen_config_board.sh microrusefi
[ $? -eq 0 ] || (echo "ERROR generating microrusefi"; exit $?)
for BOARD in "microrusefi" "frankenso" "prometheus" "proteus"; do
sh gen_config_board.sh $BOARD
[ $? -eq 0 ] || (echo "ERROR generating $BOARD"; exit $?)
done
sh gen_config_board.sh frankenso
[ $? -eq 0 ] || (echo "ERROR generating frankenso"; exit $?)
sh gen_config_board.sh prometheus
[ $? -eq 0 ] || (echo "ERROR generating prometheus"; exit $?)
sh gen_config_board.sh proteus
[ $? -eq 0 ] || (echo "ERROR generating proteus"; exit $?)
#cd config\boards\kinetis\config
#!gen_config.bat
cd config/boards/kinetis/config
sh gen_config.sh
exit 0