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

bumping configuration version in light of #773

This commit is contained in:
rusefi 2019-06-14 13:04:04 -04:00
parent ff39a72633
commit e07b119a7f
12 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/tunerstudio_io.h
View File

@ -18,8 +18,6 @@
#define BINARY_SWITCH_TAG 0x7e0a
#define PROTOCOL "001"
// this should match 'signature' in rusefi.ini
#define TS_SIGNATURE "rusEFI v1.05"
#define TS_RESPONSE_OK 0x00
#define TS_RESPONSE_BURN_OK 0x04

1
firmware/controllers/algo/rusefi_generated.h
View File

@ -1774,6 +1774,7 @@
#define ts_show_hip9011 true
#define ts_show_joystick true
#define ts_show_lcd true
#define TS_SIGNATURE "rusEFI v1.06"
#define tunerStudioSerialSpeed_offset 728
#define tunerStudioSerialSpeed_offset_hex 2d8
#define twoWireBatchIgnition_offset 1476

2
firmware/controllers/engine_controller.cpp
View File

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

3
firmware/integration/rusefi_config.txt
View File

@ -23,6 +23,9 @@
! type name;comment
#define TS_SIGNATURE "rusEFI v1.06"
! all the sub-structures are going to be nested withint the primary structure, that's
! needed to get a proper TunerStudio file

4
firmware/tunerstudio/rusefi.ini
View File

@ -41,7 +41,7 @@ enable2ndByteCanID = false
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI v1.05" ; signature is expected to be 7 or more characters.
signature = "rusEFI v1.06" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -82,7 +82,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jun 13 14:55:38 EDT 2019
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 14 13:02:44 EDT 2019
pageSize = 20000
page = 1

2
firmware/tunerstudio/rusefi.input
View File

@ -41,7 +41,7 @@ enable2ndByteCanID = false
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI v1.05" ; signature is expected to be 7 or more characters.
signature = @@TS_SIGNATURE@@ ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC

4
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -41,7 +41,7 @@ enable2ndByteCanID = false
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI v1.05" ; signature is expected to be 7 or more characters.
signature = "rusEFI v1.06" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -82,7 +82,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jun 13 14:55:43 EDT 2019
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 14 13:02:49 EDT 2019
pageSize = 20000
page = 1

4
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -41,7 +41,7 @@ enable2ndByteCanID = false
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI v1.05" ; signature is expected to be 7 or more characters.
signature = "rusEFI v1.06" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -82,7 +82,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jun 13 14:55:41 EDT 2019
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 14 13:02:47 EDT 2019
pageSize = 20000
page = 1

4
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -41,7 +41,7 @@ enable2ndByteCanID = false
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI v1.05" ; signature is expected to be 7 or more characters.
signature = "rusEFI v1.06" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -82,7 +82,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jun 13 14:55:46 EDT 2019
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 14 13:02:52 EDT 2019
pageSize = 20000
page = 1

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

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 14 00:38:21 EDT 2019
// this file was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 14 13:02:44 EDT 2019
public class Fields {
public static final int accelerometerSpiDevice_offset = 2736;
public static final int acCutoffHighRpm_offset = 1498;
@ -1138,6 +1138,7 @@ public class Fields {
public static final int triggerSimulatorPins3_offset = 738;
public static final int TS_FILE_VERSION = 20171101;
public static final int TS_OUTPUT_SIZE = 356;
public static final String TS_SIGNATURE = "rusEFI v1.06";
public static final int tunerStudioSerialSpeed_offset = 728;
public static final int twoWireBatchIgnition_offset = 1476;
public static final int twoWireBatchInjection_offset = 1476;

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

2
java_tools/configuration_definition/src/com/rusefi/output/TSProjectConsumer.java
View File

@ -150,6 +150,8 @@ public class TSProjectConsumer implements ConfigurationConsumer {
line = removeToken(line);
}
line = VariableRegistry.INSTANCE.applyVariables(line);
if (isBeforeStartTag)
prefix.append(line + ConfigDefinition.EOL);