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

placing all logs into same folder

This commit is contained in:
rusefillc 2021-10-23 20:18:09 -04:00
parent 5d5b4f0d56
commit 3882d3d824
13 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/hellen/cypress/config/gen_config.sh
View File

@ -18,7 +18,7 @@ source gen_config_common.sh
echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"
java \
-DSystemOut.name=gen_config_hellen_cypress \
-DSystemOut.name=logs/gen_config_hellen_cypress \
$COMMON_GEN_CONFIG \
-cache hellen_cypress \
-tool hellen_cypress_gen_config.bat \

2
firmware/config/boards/hellen/cypress/config/hellen_cypress_gen_enum_to_string.sh
View File

@ -4,7 +4,7 @@
cd ../../../../..
java -DSystemOut.name=gen_enum_to_string_hellen_cypress \
java -DSystemOut.name=logs/gen_enum_to_string_hellen_cypress \
-jar ../java_tools/enum2string.jar \
-outputPath config/boards/hellen/cypress/config/controllers/algo \
-enumInputFile config/boards/hellen/cypress/rusefi_hw_enums.h

2
firmware/config/boards/kinetis/config/gen_config.sh
View File

@ -18,7 +18,7 @@ source gen_config_common.sh
echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"
java \
-DSystemOut.name=gen_config_kinetis \
-DSystemOut.name=logs/gen_config_kinetis \
$COMMON_GEN_CONFIG \
-cache kinetis \
-tool kinetis_gen_config.bat \

2
firmware/config/boards/kinetis/config/kinetis_gen_enum_to_string.sh
View File

@ -2,7 +2,7 @@
cd ../../../..
java -DSystemOut.name=gen_enum_to_string_kinetis \
java -DSystemOut.name=logs/gen_enum_to_string_kinetis \
-jar ../java_tools/enum2string.jar \
-outputPath config/boards/kinetis/config/controllers/algo \
-enumInputFile config/boards/kinetis/rusefi_hw_enums.h

2
firmware/config/boards/subaru_eg33/config/gen_config.sh
View File

@ -18,7 +18,7 @@ source gen_config_common.sh
echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"
java \
-DSystemOut.name=gen_config_subaru_eg33 \
-DSystemOut.name=logs/gen_config_subaru_eg33 \
$COMMON_GEN_CONFIG \
-cache ${SHORT_BOARDNAME} \
-tool ${BOARD_DIR}/config/gen_config.sh \

2
firmware/config/boards/subaru_eg33/config/gen_enum_to_string.sh
View File

@ -7,7 +7,7 @@ echo This batch files reads rusefi_enums.h and produces auto_generated_enums.* f
BOARD=subaru_eg33
java -DSystemOut.name=gen_enum_to_string \
java -DSystemOut.name=logs/gen_enum_to_string \
-jar ../java_tools/enum2string.jar \
-inputPath . \
-outputPath config/boards/${BOARD}/config/controllers/algo \

2
firmware/gen_config_board.sh
View File

@ -46,7 +46,7 @@ source gen_config_common.sh
echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"
# work in progress: migrating to rusefi_${BUNDLE_NAME}.txt
java -DSystemOut.name=gen_config_board \
java -DSystemOut.name=logs/gen_config_board \
$COMMON_GEN_CONFIG \
-romraider integration \
-tool gen_config.sh \

12
firmware/gen_enum_to_string.sh
View File

@ -4,14 +4,14 @@ echo "This batch files reads rusefi_enums.h and produces auto_generated_enums.*
rm gen_enum_to_string.log
java -DSystemOut.name=gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile controllers/algo/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile controllers/algo/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=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
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; }
java -DSystemOut.name=gen_enum_to_string \
java -DSystemOut.name=logs/gen_enum_to_string \
-jar ../java_tools/enum2string.jar \
-outputPath controllers/algo \
-generatedFile codes \
@ -19,7 +19,7 @@ java -DSystemOut.name=gen_enum_to_string \
[ $? -eq 0 ] || { echo "ERROR generating obd_error_codes"; exit 1; }
java -DSystemOut.name=gen_enum_to_string \
java -DSystemOut.name=logs/gen_enum_to_string \
-jar ../java_tools/enum2string.jar \
-outputPath controllers/algo \
-generatedFile commonenum \
@ -29,14 +29,14 @@ java -DSystemOut.name=gen_enum_to_string \
# TODO: rearrange enums so that we have WAY less duplicated generated code? at the moment too many enums are generated 4 times
java -DSystemOut.name=gen_enum_to_string \
java -DSystemOut.name=logs/gen_enum_to_string \
-jar ../java_tools/enum2string.jar \
-outputPath controllers/algo \
-enumInputFile controllers/algo/rusefi_hw_enums.h \
[ $? -eq 0 ] || { echo "ERROR generating hw_enums"; exit 1; }
java -DSystemOut.name=gen_enum_to_string \
java -DSystemOut.name=logs/gen_enum_to_string \
-jar ../java_tools/enum2string.jar \
-outputPath controllers/sensors \
-generatedFile sensor \

2
firmware/gen_live_documentation.sh
View File

@ -23,7 +23,7 @@ bash gen_live_documentation_one_file.sh wall_fuel_state WallFuelState.java contr
bash gen_live_documentation_one_file.sh idle_state IdleState.java controllers/actuators
[ $? -eq 0 ] || { echo "ERROR generating"; exit 1; }
java -DSystemOut.name=gen_live_documentation \
java -DSystemOut.name=logs/gen_live_documentation \
-cp ../java_tools/ConfigDefinition.jar \
com.rusefi.ldmp.UsagesReader integration/LiveData.yaml
[ $? -eq 0 ] || { echo "ERROR generating"; exit 1; }

2
firmware/gen_live_documentation_one_file.sh
View File

@ -14,7 +14,7 @@ meta_file_name=${meta_name}.txt
header_file="${meta_name}_generated.h"
java -DSystemOut.name=gen_live_documentation \
java -DSystemOut.name=logs/gen_live_documentation \
-jar ../java_tools/ConfigDefinition.jar \
-definition $folder/$meta_file_name \
-cache_zip_file tunerstudio/generated/cache.zip \

4
java_console/logging/src/main/java/com/rusefi/util/SystemOut.java
View File

@ -1,5 +1,6 @@
package com.rusefi.util;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
@ -27,6 +28,9 @@ public class SystemOut {
return;
String fileName = System.getProperty("SystemOut.name", "rusefi_tool") + LOG;
System.out.println("Opening " + fileName);
File parentFile = new File(fileName).getParentFile();
if (parentFile != null)
parentFile.mkdirs();
logFile = new PrintWriter(new FileWriter(fileName, true));
Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
@Override

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

3
java_tools/configuration_definition/src/main/java/com/rusefi/test/BitParsingTest.java
View File

@ -8,6 +8,7 @@ import org.junit.Test;
import java.io.*;
import java.util.Arrays;
import java.util.Collections;
import static org.junit.Assert.assertTrue;
@ -30,7 +31,7 @@ public class BitParsingTest {
writeContent(fieldsSection, new TsFileContent("", ""), createOutput(sw));
}
};
state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer));
state.readBufferedReader(reader, Collections.singletonList(javaFieldsConsumer));
System.out.printf("start[" + sw + "]end");