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

reducing or increasing comlexity with two sets of files 

reducing bundle size
This commit is contained in:
rusefi 2019-06-08 16:15:32 -04:00
parent bd4c5a017e
commit 18a9147451
8 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
firmware/clean_compile_two_versions.bat
View File

@ -6,23 +6,20 @@ 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'
cp build\rusefi.elf deliver\rusefi_release.elf
cp build\rusefi.bin deliver\rusefi_release.bin
cp build\rusefi.hex deliver\rusefi_release.hex
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
echo Release compilation results 1/2
echo "TIMESTAMP %date% %time%"
ls -l build
if not exist deliver/rusefi_release.hex echo FAILED to compile RELEASE
if not exist deliver/rusefi_release.hex exit -1
if not exist deliver/rusefi_no_asserts.hex echo FAILED to compile NO ASSERTS version
if not exist deliver/rusefi_no_asserts.hex exit -1
call clean.bat
echo "TIMESTAMP %date% %time%"
make -j4
cp build\rusefi.elf deliver\rusefi_debug.elf
cp build\rusefi.bin deliver\rusefi_debug.bin
cp build\rusefi.hex deliver\rusefi_debug.hex
echo Debug compilation results 2/2
echo "TIMESTAMP %date% %time%"
ls -l build
if not exist deliver/rusefi_debug.hex echo FAILED to compile DEBUG
if not exist deliver/rusefi_debug.hex exit -1
if not exist deliver/rusefi.hex echo FAILED to compile DEFAULT with DEBUG
if not exist deliver/rusefi.hex exit -1

2
firmware/flash_dfu.bat
View File

@ -1,6 +1,6 @@
rem on linux that would be
rem dfu-util -a 0 -D rusefi_release.dfu -R
rem dfu-util -a 0 -D rusefi_no_asserts.dfu -R
rem ..\misc\hex2dfu\HEX2DFU.exe build/rusefi.hex -out build/rusefi.dfu
DfuSeCommand.exe -c -d --fn build/rusefi.dfu

2
firmware/flash_release.bat
View File

@ -1 +1 @@
st-link_cli -c SWD ur -P deliver\rusefi_release.hex -Rst -Run
st-link_cli -c SWD ur -P deliver\rusefi_no_asserts.hex -Rst -Run

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -46,7 +46,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20190503;
public static final int CONSOLE_VERSION = 20190608;
public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port";

10
java_console/ui/src/com/rusefi/StartupFrame.java
View File

@ -129,13 +129,11 @@ public class StartupFrame {
if (ProcessStatusWindow.isWindows()) {
realHardwarePanel.add(new HorizontalLine());
if (new File(FirmwareFlasher.IMAGE_FILE).exists()) {
// for F7 builds we just build one file at the moment
realHardwarePanel.add(new FirmwareFlasher(FirmwareFlasher.IMAGE_FILE, "Program Firmware").getButton());
} else {
// for F7 builds we just build one file at the moment
realHardwarePanel.add(new FirmwareFlasher(FirmwareFlasher.IMAGE_FILE, "Program Firmware").getButton());
if (new File(FirmwareFlasher.IMAGE_NO_ASSERTS_FILE).exists()) {
// 407 build
realHardwarePanel.add(new FirmwareFlasher(FirmwareFlasher.IMAGE_DEBUG_FILE, "Program Firmware/Debug").getButton());
realHardwarePanel.add(new FirmwareFlasher(FirmwareFlasher.IMAGE_RELEASE_FILE, "Program Firmware/Release").getButton());
realHardwarePanel.add(new FirmwareFlasher(FirmwareFlasher.IMAGE_NO_ASSERTS_FILE, "Program Firmware/NoAsserts").getButton());
}
realHardwarePanel.add(new EraseChip().getButton());
}

3
java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java
View File

@ -11,8 +11,7 @@ import java.io.File;
*/
public class FirmwareFlasher extends ProcessStatusWindow {
public static final String IMAGE_FILE = "rusefi.bin";
public static final String IMAGE_DEBUG_FILE = "rusefi_debug.bin";
public static final String IMAGE_RELEASE_FILE = "rusefi_release.bin";
public static final String IMAGE_NO_ASSERTS_FILE = "rusefi_no_asserts.bin";
static final String OPENOCD_EXE = "openocd/openocd.exe";
static final String BINARY_LOCATION = ".";
private static final String SUCCESS_MESSAGE_TAG = "shutdown command invoked";

10
misc/jenkins/build_working_folder.bat
View File

@ -12,11 +12,13 @@ cp firmware/tunerstudio/rusefi.ini %folder%
cp firmware/svnversion.h %folder%
cp -r misc/install/openocd %folder%
cp java_console/rusefi.xml %folder%
rem 407 has two versions
cp firmware/deliver/rusefi_release.* %folder%
cp firmware/deliver/rusefi_debug.* %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.* %folder%
cp firmware/build/rusefi.hex %folder%
cp firmware/build/rusefi.bin %folder%
cp firmware/build/rusefi.elf %folder%
cp firmware/build/rusefi.dfu %folder%
cp misc/console_launcher/rusefi_console.exe %folder%

12
misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
View File

@ -44,14 +44,14 @@ git submodule update --init
call update_version.bat
call clean_compile_two_versions.bat
if not exist deliver/rusefi_release.hex echo Just to confirm - FAILED to compile RELEASE
if not exist deliver/rusefi_release.hex exit -1
if not exist deliver/rusefi_no_asserts.hex echo Just to confirm - FAILED to compile no_asserts
if not exist deliver/rusefi_no_asserts.hex exit -1
if not exist deliver/rusefi_debug.hex echo Just to confirm - FAILED to compile DEBUG
if not exist deliver/rusefi_debug.hex exit -1
if not exist deliver/rusefi.hex echo Just to confirm - FAILED to compile default DEBUG
if not exist deliver/rusefi.hex exit -1
..\misc\hex2dfu\HEX2DFU.exe deliver/rusefi_release.hex -out deliver/rusefi_release.dfu
..\misc\hex2dfu\HEX2DFU.exe deliver/rusefi_debug.hex -out deliver/rusefi_debug.dfu
..\misc\hex2dfu\HEX2DFU.exe deliver/rusefi_no_asserts.hex -out deliver/rusefi_no_asserts.dfu
..\misc\hex2dfu\HEX2DFU.exe deliver/rusefi.hex -out deliver/rusefi.dfu
cd ..
call misc\jenkins\build_java_console.bat