diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 1cab360004..3438438169 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,8 +1,7 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:02 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:02 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin -#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H -#define CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H +#pragma once #include "rusefi_types.h" // start of stft_cell_cfg_s struct stft_cell_cfg_s { @@ -3520,6 +3519,5 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; -#endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:02 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:02 UTC 2020 diff --git a/firmware/controllers/generated/engine_state_generated.h b/firmware/controllers/generated/engine_state_generated.h index 959dbf297c..9f02197f36 100644 --- a/firmware/controllers/generated/engine_state_generated.h +++ b/firmware/controllers/generated/engine_state_generated.h @@ -1,10 +1,8 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/engine_state.txt Mon Jul 06 05:10:55 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/engine_state.txt Mon Jul 06 06:07:19 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin -#ifndef CONTROLLERS_GENERATED_ENGINE_STATE_GENERATED_H -#define CONTROLLERS_GENERATED_ENGINE_STATE_GENERATED_H +#pragma once #include "rusefi_types.h" -#define SIGNATURE_HASH 3980360194 // start of speed_density_s struct speed_density_s { /** @@ -429,6 +427,5 @@ struct engine_state2_s { typedef struct engine_state2_s engine_state2_s; -#endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/engine_state.txt Mon Jul 06 05:10:55 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/engine_state.txt Mon Jul 06 06:07:19 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index e8d8d4d36c..8d85343805 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:02 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:02 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 3f3ecd2f28..0de7c42370 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:02 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:02 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 6dbd58c795..51a845fc22 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:02 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:02 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index fc699e5d10..7fe3dad896 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:02 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:02 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/pid_state_generated.h b/firmware/controllers/generated/pid_state_generated.h index 9ebae08786..d94c8fc154 100644 --- a/firmware/controllers/generated/pid_state_generated.h +++ b/firmware/controllers/generated/pid_state_generated.h @@ -1,10 +1,8 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/pid_state.txt Mon Jul 06 05:10:55 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/pid_state.txt Mon Jul 06 06:07:19 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin -#ifndef CONTROLLERS_GENERATED_PID_STATE_GENERATED_H -#define CONTROLLERS_GENERATED_PID_STATE_GENERATED_H +#pragma once #include "rusefi_types.h" -#define SIGNATURE_HASH 79654544 // start of pid_state_s struct pid_state_s { /** @@ -44,6 +42,5 @@ struct pid_state_s { typedef struct pid_state_s pid_state_s; -#endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/pid_state.txt Mon Jul 06 05:10:55 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/pid_state.txt Mon Jul 06 06:07:19 UTC 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 24f75c1073..edad067e59 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1061,7 +1061,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.07.06 -#define SIGNATURE_HASH 1715728722 +#define SIGNATURE_HASH 877441627 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1321,7 +1321,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.06.all.1715728722" +#define TS_SIGNATURE "rusEFI 2020.07.06.all.877441627" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index f1e3d02a66..420102287b 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.07.06 -#define SIGNATURE_HASH 1715728722 -#define TS_SIGNATURE "rusEFI 2020.07.06.all.1715728722" +#define SIGNATURE_HASH 877441627 +#define TS_SIGNATURE "rusEFI 2020.07.06.all.877441627" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 48de22d7cf..cb541aedc5 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.07.06 -#define SIGNATURE_HASH 3099893169 -#define TS_SIGNATURE "rusEFI 2020.07.06.frankenso_na6.3099893169" +#define SIGNATURE_HASH 3939229368 +#define TS_SIGNATURE "rusEFI 2020.07.06.frankenso_na6.3939229368" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 5d19ca8cee..ae28cfb530 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.07.06 -#define SIGNATURE_HASH 800925660 -#define TS_SIGNATURE "rusEFI 2020.07.06.mre_f4.800925660" +#define SIGNATURE_HASH 2108843221 +#define TS_SIGNATURE "rusEFI 2020.07.06.mre_f4.2108843221" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 4e39c7eddb..67aff24350 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.07.06 -#define SIGNATURE_HASH 800925660 -#define TS_SIGNATURE "rusEFI 2020.07.06.mre_f7.800925660" +#define SIGNATURE_HASH 2108843221 +#define TS_SIGNATURE "rusEFI 2020.07.06.mre_f7.2108843221" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 1b79c0451c..e47f3cb5b9 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.07.06 -#define SIGNATURE_HASH 2472487382 -#define TS_SIGNATURE "rusEFI 2020.07.06.prometheus_405.2472487382" +#define SIGNATURE_HASH 3243272927 +#define TS_SIGNATURE "rusEFI 2020.07.06.prometheus_405.3243272927" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index bc3ee68352..e6d8071e24 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.07.06 -#define SIGNATURE_HASH 2472487382 -#define TS_SIGNATURE "rusEFI 2020.07.06.prometheus_469.2472487382" +#define SIGNATURE_HASH 3243272927 +#define TS_SIGNATURE "rusEFI 2020.07.06.prometheus_469.3243272927" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 120a8c7c76..7b19e92ec5 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.07.06 -#define SIGNATURE_HASH 3956441245 -#define TS_SIGNATURE "rusEFI 2020.07.06.proteus_f4.3956441245" +#define SIGNATURE_HASH 3118318484 +#define TS_SIGNATURE "rusEFI 2020.07.06.proteus_f4.3118318484" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 7d28f841d1..3940d56efb 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.07.06 -#define SIGNATURE_HASH 3956441245 -#define TS_SIGNATURE "rusEFI 2020.07.06.proteus_f7.3956441245" +#define SIGNATURE_HASH 3118318484 +#define TS_SIGNATURE "rusEFI 2020.07.06.proteus_f7.3118318484" diff --git a/firmware/controllers/generated/trigger_central_generated.h b/firmware/controllers/generated/trigger_central_generated.h index 617323c726..b04572077c 100644 --- a/firmware/controllers/generated/trigger_central_generated.h +++ b/firmware/controllers/generated/trigger_central_generated.h @@ -1,11 +1,9 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_central.txt Mon Jul 06 05:10:55 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_central.txt Mon Jul 06 06:07:20 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin -#ifndef CONTROLLERS_GENERATED_TRIGGER_CENTRAL_GENERATED_H -#define CONTROLLERS_GENERATED_TRIGGER_CENTRAL_GENERATED_H +#pragma once #include "rusefi_types.h" #define HW_EVENT_TYPES 6 -#define SIGNATURE_HASH 3281507236 // start of trigger_central_s struct trigger_central_s { trigger_central_s(); @@ -31,6 +29,5 @@ struct trigger_central_s { typedef struct trigger_central_s trigger_central_s; -#endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_central.txt Mon Jul 06 05:10:55 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_central.txt Mon Jul 06 06:07:20 UTC 2020 diff --git a/firmware/controllers/generated/trigger_state_generated.h b/firmware/controllers/generated/trigger_state_generated.h index 30aa5029e5..8fc2123835 100644 --- a/firmware/controllers/generated/trigger_state_generated.h +++ b/firmware/controllers/generated/trigger_state_generated.h @@ -1,10 +1,8 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_state.txt Mon Jul 06 05:10:55 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_state.txt Mon Jul 06 06:07:20 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin -#ifndef CONTROLLERS_GENERATED_TRIGGER_STATE_GENERATED_H -#define CONTROLLERS_GENERATED_TRIGGER_STATE_GENERATED_H +#pragma once #include "rusefi_types.h" -#define SIGNATURE_HASH 2030060969 // start of trigger_state_s struct trigger_state_s { /** @@ -16,6 +14,5 @@ struct trigger_state_s { typedef struct trigger_state_s trigger_state_s; -#endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_state.txt Mon Jul 06 05:10:55 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_state.txt Mon Jul 06 06:07:20 UTC 2020 diff --git a/firmware/controllers/generated/wall_fuel_generated.h b/firmware/controllers/generated/wall_fuel_generated.h index bc0701e976..5d62becc1d 100644 --- a/firmware/controllers/generated/wall_fuel_generated.h +++ b/firmware/controllers/generated/wall_fuel_generated.h @@ -1,10 +1,8 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/wall_fuel_state.txt Mon Jul 06 05:10:56 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/wall_fuel_state.txt Mon Jul 06 06:07:20 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin -#ifndef CONTROLLERS_GENERATED_WALL_FUEL_GENERATED_H -#define CONTROLLERS_GENERATED_WALL_FUEL_GENERATED_H +#pragma once #include "rusefi_types.h" -#define SIGNATURE_HASH 1089557312 // start of wall_fuel_state struct wall_fuel_state { /** @@ -22,6 +20,5 @@ struct wall_fuel_state { typedef struct wall_fuel_state wall_fuel_state; -#endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/wall_fuel_state.txt Mon Jul 06 05:10:56 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/wall_fuel_state.txt Mon Jul 06 06:07:20 UTC 2020 diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 5ccf848aba..1554601a30 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 8104334cbf..2d58baaedd 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.06.frankenso_na6.3099893169" + signature = "rusEFI 2020.07.06.frankenso_na6.3939229368" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.06.frankenso_na6.3099893169" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.06.frankenso_na6.3939229368" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:05 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:12 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 004c7b2a54..2839653124 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.06.mre_f4.800925660" + signature = "rusEFI 2020.07.06.mre_f4.2108843221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.06.mre_f4.800925660" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.06.mre_f4.2108843221" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:04 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:04 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 54b651af1f..871372f7cd 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.06.mre_f7.800925660" + signature = "rusEFI 2020.07.06.mre_f7.2108843221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.06.mre_f7.800925660" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.06.mre_f7.2108843221" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:03 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:03 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 0c979352d3..05b3bb297f 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.06.prometheus_405.2472487382" + signature = "rusEFI 2020.07.06.prometheus_405.3243272927" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.06.prometheus_405.2472487382" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.06.prometheus_405.3243272927" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:08 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:14 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 712d192d24..8764b79952 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.06.prometheus_469.2472487382" + signature = "rusEFI 2020.07.06.prometheus_469.3243272927" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.06.prometheus_469.2472487382" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.06.prometheus_469.3243272927" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:07 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:13 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 1f76476f29..45a96b4959 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.06.proteus_f4.3956441245" + signature = "rusEFI 2020.07.06.proteus_f4.3118318484" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.06.proteus_f4.3956441245" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.06.proteus_f4.3118318484" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:10 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:16 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index ebc27d759e..397ba58d13 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.06.proteus_f7.3956441245" + signature = "rusEFI 2020.07.06.proteus_f7.3118318484" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.06.proteus_f7.3956441245" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.06.proteus_f7.3118318484" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:09 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:15 UTC 2020 pageSize = 20000 page = 1 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index a6c7f5a368..5f2a03a816 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/engine_state.txt Thu Jul 02 12:27:25 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/engine_state.txt Mon Jul 06 06:07:19 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 45563ccf81..253c137bf4 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 05:30:02 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 06 06:07:02 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1042,7 +1042,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; - public static final int SIGNATURE_HASH = 1715728722; + public static final int SIGNATURE_HASH = 877441627; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1281,7 +1281,7 @@ public class Fields { public static final int TS_RESPONSE_COMMAND_OK = 7; public static final int TS_RESPONSE_OK = 0; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.07.06.all.1715728722"; + public static final String TS_SIGNATURE = "rusEFI 2020.07.06.all.877441627"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/PidState.java b/java_console/models/src/main/java/com/rusefi/config/generated/PidState.java index ad64accc32..629b52f6f1 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/PidState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/PidState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/pid_state.txt Thu Jul 02 12:27:24 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/pid_state.txt Mon Jul 06 06:07:19 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java index c04f2ecc6a..7ece052c01 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_central.txt Thu Jul 02 12:27:25 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_central.txt Mon Jul 06 06:07:20 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index 3ef1d6233f..fabf7267c1 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_state.txt Thu Jul 02 12:27:25 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_state.txt Mon Jul 06 06:07:20 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java index 255c307a14..3f2f179547 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/wall_fuel_state.txt Thu Jul 02 12:27:25 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/wall_fuel_state.txt Mon Jul 06 06:07:20 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 6e6df25d94..9980604961 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +