diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index ef1652aeb5..ad5a144f73 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.08.08 -#define SIGNATURE_HASH 566531569 -#define TS_SIGNATURE "rusEFI 2020.08.08.all.566531569" +#define SIGNATURE_HASH 2348678693 +#define TS_SIGNATURE "rusEFI 2020.08.08.all.2348678693" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 6240d95ef9..6308c09561 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.08.08 -#define SIGNATURE_HASH 497639464 -#define TS_SIGNATURE "rusEFI 2020.08.08.frankenso_na6.497639464" +#define SIGNATURE_HASH 3079670780 +#define TS_SIGNATURE "rusEFI 2020.08.08.frankenso_na6.3079670780" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 02c0e2fd08..0c61fe6fa1 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.08.08 -#define SIGNATURE_HASH 235982929 -#define TS_SIGNATURE "rusEFI 2020.08.08.kin.235982929" +#define SIGNATURE_HASH 2754198405 +#define TS_SIGNATURE "rusEFI 2020.08.08.kin.2754198405" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 5408c2e5b7..d7a011fbdd 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.08.08 -#define SIGNATURE_HASH 3664380074 -#define TS_SIGNATURE "rusEFI 2020.08.08.mre_f4.3664380074" +#define SIGNATURE_HASH 1884515198 +#define TS_SIGNATURE "rusEFI 2020.08.08.mre_f4.1884515198" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index e27c59f448..1bcfe1aaa6 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.08.08 -#define SIGNATURE_HASH 3664380074 -#define TS_SIGNATURE "rusEFI 2020.08.08.mre_f7.3664380074" +#define SIGNATURE_HASH 1884515198 +#define TS_SIGNATURE "rusEFI 2020.08.08.mre_f7.1884515198" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 73d290a84e..a86b71ed0d 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.08.08 -#define SIGNATURE_HASH 909300815 -#define TS_SIGNATURE "rusEFI 2020.08.08.prometheus_405.909300815" +#define SIGNATURE_HASH 2618015643 +#define TS_SIGNATURE "rusEFI 2020.08.08.prometheus_405.2618015643" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index e195dece95..5af5f9fdca 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.08.08 -#define SIGNATURE_HASH 909300815 -#define TS_SIGNATURE "rusEFI 2020.08.08.prometheus_469.909300815" +#define SIGNATURE_HASH 2618015643 +#define TS_SIGNATURE "rusEFI 2020.08.08.prometheus_469.2618015643" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 18bc7444a3..4b8000292b 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.08.08 -#define SIGNATURE_HASH 503847978 -#define TS_SIGNATURE "rusEFI 2020.08.08.proteus_f4.503847978" +#define SIGNATURE_HASH 3023140862 +#define TS_SIGNATURE "rusEFI 2020.08.08.proteus_f4.3023140862" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index a8563fc4ef..f24c38ecaf 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.08.08 -#define SIGNATURE_HASH 503847978 -#define TS_SIGNATURE "rusEFI 2020.08.08.proteus_f7.503847978" +#define SIGNATURE_HASH 3023140862 +#define TS_SIGNATURE "rusEFI 2020.08.08.proteus_f7.3023140862" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 9b94e7f34c..ac24296ff2 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 8c08dd6943..aaa953723d 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.08.all.566531569" + signature = "rusEFI 2020.08.08.all.2348678693" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.all.566531569" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.all.2348678693" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 01:30:43 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 13:09:06 UTC 2020 pageSize = 20000 page = 1 @@ -2666,6 +2666,8 @@ menuDialog = main subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator + subMenu = canBusMain, "CAN Bus Communication" + subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" @@ -3840,6 +3842,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", can2RxPin field = "TX pin", can2TxPin + dialog = canBusMain, "CAN Bus Communication", yAxis + panel = canBus + panel = canBus2 + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3879,10 +3885,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc panel = tsPort - panel = canBus - panel = canBus2 panel = auxSerial - panel = sdCard panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 6080882723..357a6e8df2 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.08.frankenso_na6.497639464" + signature = "rusEFI 2020.08.08.frankenso_na6.3079670780" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.frankenso_na6.497639464" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.frankenso_na6.3079670780" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 01:30:48 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 13:09:11 UTC 2020 pageSize = 20000 page = 1 @@ -2666,6 +2666,8 @@ menuDialog = main subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator + subMenu = canBusMain, "CAN Bus Communication" + subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" @@ -3840,6 +3842,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", can2RxPin field = "TX pin", can2TxPin + dialog = canBusMain, "CAN Bus Communication", yAxis + panel = canBus + panel = canBus2 + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3879,10 +3885,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc panel = tsPort - panel = canBus - panel = canBus2 panel = auxSerial - panel = sdCard panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 140379ffe6..0755ab96bd 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.08.kin.235982929" + signature = "rusEFI 2020.08.08.kin.2754198405" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.kin.235982929" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.kin.2754198405" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 08 01:30:55 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 08 13:09:23 UTC 2020 pageSize = 20000 page = 1 @@ -2666,6 +2666,8 @@ menuDialog = main subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator + subMenu = canBusMain, "CAN Bus Communication" + subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" @@ -3841,6 +3843,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", can2RxPin field = "TX pin", can2TxPin + dialog = canBusMain, "CAN Bus Communication", yAxis + panel = canBus + panel = canBus2 + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3880,10 +3886,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc panel = tsPort - panel = canBus - panel = canBus2 panel = auxSerial - panel = sdCard panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index d57c2a1c15..3f72232238 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.08.mre_f4.3664380074" + signature = "rusEFI 2020.08.08.mre_f4.1884515198" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.mre_f4.3664380074" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.mre_f4.1884515198" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 01:30:47 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 13:09:09 UTC 2020 pageSize = 20000 page = 1 @@ -2662,6 +2662,8 @@ menuDialog = main subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator + subMenu = canBusMain, "CAN Bus Communication" + subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" @@ -3817,6 +3819,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "rusEfi CAN data base address", verboseCan2BaseAddress field = "Can Sleep Period", can2SleepPeriodMs + dialog = canBusMain, "CAN Bus Communication", yAxis + panel = canBus + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3855,9 +3860,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc - panel = canBus panel = auxSerial - panel = sdCard dialog = monitoringSettings, "rusEfi Console Settings" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 45f7e5c391..3706aa2cb5 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.08.mre_f7.3664380074" + signature = "rusEFI 2020.08.08.mre_f7.1884515198" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.mre_f7.3664380074" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.mre_f7.1884515198" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 01:30:45 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 13:09:08 UTC 2020 pageSize = 20000 page = 1 @@ -2662,6 +2662,8 @@ menuDialog = main subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator + subMenu = canBusMain, "CAN Bus Communication" + subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" @@ -3817,6 +3819,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "rusEfi CAN data base address", verboseCan2BaseAddress field = "Can Sleep Period", can2SleepPeriodMs + dialog = canBusMain, "CAN Bus Communication", yAxis + panel = canBus + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3855,9 +3860,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc - panel = canBus panel = auxSerial - panel = sdCard dialog = monitoringSettings, "rusEfi Console Settings" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index cde0e3d3f2..87eaca4084 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.08.prometheus_405.909300815" + signature = "rusEFI 2020.08.08.prometheus_405.2618015643" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.prometheus_405.909300815" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.prometheus_405.2618015643" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 01:30:51 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 13:09:19 UTC 2020 pageSize = 20000 page = 1 @@ -2666,6 +2666,8 @@ menuDialog = main subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator + subMenu = canBusMain, "CAN Bus Communication" + subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" @@ -3836,6 +3838,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", can2RxPin field = "TX pin", can2TxPin + dialog = canBusMain, "CAN Bus Communication", yAxis + panel = canBus + panel = canBus2 + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3875,10 +3881,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc panel = tsPort - panel = canBus - panel = canBus2 panel = auxSerial - panel = sdCard panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 41dbf6ad58..da4babca55 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.08.prometheus_469.909300815" + signature = "rusEFI 2020.08.08.prometheus_469.2618015643" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.prometheus_469.909300815" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.prometheus_469.2618015643" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 01:30:49 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 13:09:13 UTC 2020 pageSize = 20000 page = 1 @@ -2666,6 +2666,8 @@ menuDialog = main subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator + subMenu = canBusMain, "CAN Bus Communication" + subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" @@ -3836,6 +3838,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "RX pin", can2RxPin field = "TX pin", can2TxPin + dialog = canBusMain, "CAN Bus Communication", yAxis + panel = canBus + panel = canBus2 + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3875,10 +3881,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc panel = tsPort - panel = canBus - panel = canBus2 panel = auxSerial - panel = sdCard panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 5cdaa5c73f..489034067c 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.08.proteus_f4.503847978" + signature = "rusEFI 2020.08.08.proteus_f4.3023140862" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.proteus_f4.503847978" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.proteus_f4.3023140862" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 01:30:54 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 13:09:22 UTC 2020 pageSize = 20000 page = 1 @@ -2661,6 +2661,7 @@ menuDialog = main subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator + subMenu = canBusMain, "CAN Bus Communication" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" @@ -3810,6 +3811,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "rusEfi CAN data base address", verboseCan2BaseAddress field = "Can Sleep Period", can2SleepPeriodMs + dialog = canBusMain, "CAN Bus Communication", yAxis + panel = canBus + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3846,7 +3850,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc - panel = canBus panel = auxSerial diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index e4eb24dd08..ea16a36bc7 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.08.proteus_f7.503847978" + signature = "rusEFI 2020.08.08.proteus_f7.3023140862" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.proteus_f7.503847978" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.proteus_f7.3023140862" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 01:30:52 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 13:09:20 UTC 2020 pageSize = 20000 page = 1 @@ -2661,6 +2661,7 @@ menuDialog = main subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator + subMenu = canBusMain, "CAN Bus Communication" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" @@ -3810,6 +3811,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "rusEfi CAN data base address", verboseCan2BaseAddress field = "Can Sleep Period", can2SleepPeriodMs + dialog = canBusMain, "CAN Bus Communication", yAxis + panel = canBus + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3846,7 +3850,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc - panel = canBus panel = auxSerial