diff --git a/firmware/clean_compile_two_versions.bat b/firmware/clean_compile_two_versions.bat index f9dc301535..e5a0f39ac2 100644 --- a/firmware/clean_compile_two_versions.bat +++ b/firmware/clean_compile_two_versions.bat @@ -6,9 +6,9 @@ call clean.bat echo "TIMESTAMP %date% %time%" make -j4 DEBUG_LEVEL_OPT='-O2' EXTRA_PARAMS='-DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_TRACE=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE' -mv build\rusefi.elf deliver\rusefi_no_asserts.elf +rem mv build\rusefi.elf deliver\rusefi_no_asserts.elf mv build\rusefi.bin deliver\rusefi_no_asserts.bin -mv build\rusefi.hex deliver\rusefi_no_asserts.hex +rem mv build\rusefi.hex deliver\rusefi_no_asserts.hex echo Release compilation results 1/2 echo "TIMESTAMP %date% %time%" ls -l build diff --git a/java_console/logging/src/com/rusefi/FileLog.java b/java_console/logging/src/com/rusefi/FileLog.java index c432d1f113..f7fd94c20f 100644 --- a/java_console/logging/src/com/rusefi/FileLog.java +++ b/java_console/logging/src/com/rusefi/FileLog.java @@ -15,7 +15,7 @@ public enum FileLog { MAIN, SIMULATOR_CONSOLE; - public static final String DIR = "out/"; + public static final String DIR = "logs/"; public static final String LOG_INFO_TEXT = "Writing logs to '" + DIR + "'"; public static String currentLogName; public static final String END_OF_TIMESTAND_TAG = ": "; diff --git a/misc/console_launcher/readme.html b/misc/console_launcher/readme.html new file mode 100644 index 0000000000..ad8818b3eb --- /dev/null +++ b/misc/console_launcher/readme.html @@ -0,0 +1,18 @@ + + +
+ +This is rusEfi open source engine control unit bundle. + +


+Source code & links +


+Documentation + +


+ +@author Andrey Belomutskiy, (c) 2012-2019 + + + + \ No newline at end of file diff --git a/misc/jenkins/build_working_folder.bat b/misc/jenkins/build_working_folder.bat index d7055b09b2..7ef8069d24 100644 --- a/misc/jenkins/build_working_folder.bat +++ b/misc/jenkins/build_working_folder.bat @@ -9,15 +9,17 @@ cp java_console_binary/rusefi_console.jar %folder% cp simulator/build/rusefi_simulator.exe %folder% cp firmware/tunerstudio/rusefi.ini %folder% +cp misc/console_launcher/readme.html %folder% + cp firmware/svnversion.h %folder% cp -r misc/install/openocd %folder% cp java_console/rusefi.xml %folder% rem 407 has additional version of firmware cp firmware/deliver/rusefi_no_asserts.* %folder% rem 746 builds one version at the moment -cp firmware/build/rusefi.hex %folder% +rem probably not needed cp firmware/build/rusefi.hex %folder% cp firmware/build/rusefi.bin %folder% -cp firmware/build/rusefi.elf %folder% +rem probably not needed cp firmware/build/rusefi.elf %folder% cp firmware/build/rusefi.dfu %folder% cp misc/console_launcher/rusefi_console.exe %folder%