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

Revert "fresh integration & changing protocol versions & versions" 

This reverts commit 8a8ea6c0
This commit is contained in:
rusefi 2019-12-21 15:02:37 -05:00
parent dda3d52d18
commit 5c679034a7
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/engine_controller.cpp
View File

@ -819,6 +819,6 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0) if (initBootloader() != 0)
return 123; return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */ #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20191221; return 20191213;
} }
#endif /* EFI_UNIT_TEST */ #endif /* EFI_UNIT_TEST */

4
firmware/integration/rusefi_config.txt
View File

@ -23,12 +23,12 @@
! type name;comment ! type name;comment
#define TS_SIGNATURE "rusEFI v1.08" #define TS_SIGNATURE "rusEFI v1.07"
! !
! this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version ! this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
! so not forget to change fileVersion in rusefi.ini ! so not forget to change fileVersion in rusefi.ini
! todo: is this not needed in light of TS_SIGNATURE? ! todo: is this not needed in light of TS_SIGNATURE?
#define TS_FILE_VERSION 20191221 #define TS_FILE_VERSION 20190701
! all the sub-structures are going to be nested within the primary structure, that's ! all the sub-structures are going to be nested within the primary structure, that's

8
java_console/models/src/com/rusefi/config/generated/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated; package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 12:07:30 EST 2019 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 14 16:03:19 EST 2019
// by class com.rusefi.output.FileJavaFieldsConsumer // by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*; import com.rusefi.config.*;
@ -1296,9 +1296,9 @@ public class Fields {
public static final int triggerSimulatorPins1_offset = 736; public static final int triggerSimulatorPins1_offset = 736;
public static final int triggerSimulatorPins2_offset = 737; public static final int triggerSimulatorPins2_offset = 737;
public static final int triggerSimulatorPins3_offset = 738; public static final int triggerSimulatorPins3_offset = 738;
public static final int TS_FILE_VERSION = 20191221; public static final int TS_FILE_VERSION = 20190701;
public static final int TS_OUTPUT_SIZE = 220; public static final int TS_OUTPUT_SIZE = 356;
public static final String TS_SIGNATURE = "rusEFI v1.08"; public static final String TS_SIGNATURE = "rusEFI v1.07";
public static final int tunerStudioSerialSpeed_offset = 728; public static final int tunerStudioSerialSpeed_offset = 728;
public static final int twoWireBatchIgnition_offset = 1476; public static final int twoWireBatchIgnition_offset = 1476;
public static final int twoWireBatchInjection_offset = 1476; public static final int twoWireBatchInjection_offset = 1476;

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

@ -49,7 +49,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel * @see EngineSnifferPanel
*/ */
public class Launcher { public class Launcher {
public static final int CONSOLE_VERSION = 20191221; public static final int CONSOLE_VERSION = 20191201;
public static final String INI_FILE_PATH = System.getProperty("ini_file_path", ".."); public static final String INI_FILE_PATH = System.getProperty("ini_file_path", "..");
public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", ".."); public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", "..");
public static final String TOOLS_PATH = System.getProperty("tools_path", "."); public static final String TOOLS_PATH = System.getProperty("tools_path", ".");