From b1f8c200ba3672bc58fe5acea70da8b0e6056c7f Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Sat, 8 Aug 2020 13:09:42 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/generated/signature_all.h | 4 ++-- .../generated/signature_frankenso_na6.h | 4 ++-- .../controllers/generated/signature_kin.h | 4 ++-- .../controllers/generated/signature_mre_f4.h | 4 ++-- .../controllers/generated/signature_mre_f7.h | 4 ++-- .../generated/signature_prometheus_405.h | 4 ++-- .../generated/signature_prometheus_469.h | 4 ++-- .../generated/signature_proteus_f4.h | 4 ++-- .../generated/signature_proteus_f7.h | 4 ++-- firmware/tunerstudio/generated/cache.zip | Bin 849415 -> 849748 bytes firmware/tunerstudio/generated/rusefi.ini | 15 +++++++++------ .../generated/rusefi_frankenso_na6.ini | 15 +++++++++------ .../tunerstudio/generated/rusefi_kinetis.ini | 15 +++++++++------ .../tunerstudio/generated/rusefi_mre_f4.ini | 13 ++++++++----- .../tunerstudio/generated/rusefi_mre_f7.ini | 13 ++++++++----- .../generated/rusefi_prometheus_405.ini | 15 +++++++++------ .../generated/rusefi_prometheus_469.ini | 15 +++++++++------ .../generated/rusefi_proteus_f4.ini | 11 +++++++---- .../generated/rusefi_proteus_f7.ini | 11 +++++++---- 19 files changed, 93 insertions(+), 66 deletions(-) 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 9b94e7f34cb3fced362ecf9e4bd0c09b092824ae..ac24296ff21fb17e63420544650811fccf33321c 100644 GIT binary patch delta 165967 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 O=D5;m`j-jnum1zP&`N#) delta 165618 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 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