From 6df4d76bb99e580a3d6b35bd968050cb0bfd11db Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Sat, 13 Feb 2021 01:43:05 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/generated/signature_all.h | 4 ++-- .../generated/signature_frankenso_na6.h | 4 ++-- .../generated/signature_hellen72.h | 4 ++-- .../generated/signature_hellen_cypress.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 ++-- .../generated/signature_subaru_eg33_f7.h | 4 ++-- firmware/tunerstudio/generated/cache.zip | Bin 1151642 -> 1151138 bytes firmware/tunerstudio/generated/rusefi.ini | 17 ++++++++--------- .../generated/rusefi_frankenso_na6.ini | 17 ++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 17 ++++++++--------- .../generated/rusefi_hellen_cypress.ini | 17 ++++++++--------- .../tunerstudio/generated/rusefi_kinetis.ini | 17 ++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 17 ++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 17 ++++++++--------- .../generated/rusefi_prometheus_405.ini | 17 ++++++++--------- .../generated/rusefi_prometheus_469.ini | 17 ++++++++--------- .../generated/rusefi_proteus_f4.ini | 17 ++++++++--------- .../generated/rusefi_proteus_f7.ini | 17 ++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 17 ++++++++--------- 25 files changed, 120 insertions(+), 132 deletions(-) diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 0afe700b14..bde6848c1f 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 2021.02.13 -#define SIGNATURE_HASH 1131581110 -#define TS_SIGNATURE "rusEFI 2021.02.13.all.1131581110" +#define SIGNATURE_HASH 3093836188 +#define TS_SIGNATURE "rusEFI 2021.02.13.all.3093836188" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index dbd6c64de3..a1bef034eb 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 2021.02.13 -#define SIGNATURE_HASH 3339232037 -#define TS_SIGNATURE "rusEFI 2021.02.13.frankenso_na6.3339232037" +#define SIGNATURE_HASH 1007819791 +#define TS_SIGNATURE "rusEFI 2021.02.13.frankenso_na6.1007819791" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index eb77cddf4b..cd1c7f3de8 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen72 #define SIGNATURE_DATE 2021.02.13 -#define SIGNATURE_HASH 1361499662 -#define TS_SIGNATURE "rusEFI 2021.02.13.hellen72.1361499662" +#define SIGNATURE_HASH 2856085796 +#define TS_SIGNATURE "rusEFI 2021.02.13.hellen72.2856085796" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 1b95de21c2..fa77cf0d2b 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.02.13 -#define SIGNATURE_HASH 17716582 -#define TS_SIGNATURE "rusEFI 2021.02.13.hellen_cypress.17716582" +#define SIGNATURE_HASH 4195674700 +#define TS_SIGNATURE "rusEFI 2021.02.13.hellen_cypress.4195674700" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index c3e9471a41..9e01b0350d 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 2021.02.13 -#define SIGNATURE_HASH 4272658842 -#define TS_SIGNATURE "rusEFI 2021.02.13.kin.4272658842" +#define SIGNATURE_HASH 95495856 +#define TS_SIGNATURE "rusEFI 2021.02.13.kin.95495856" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 895fe87069..25ab2130e7 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 2021.02.13 -#define SIGNATURE_HASH 1840577628 -#define TS_SIGNATURE "rusEFI 2021.02.13.mre_f4.1840577628" +#define SIGNATURE_HASH 2528002934 +#define TS_SIGNATURE "rusEFI 2021.02.13.mre_f4.2528002934" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index b81c71e288..2ef76e111e 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 2021.02.13 -#define SIGNATURE_HASH 1840577628 -#define TS_SIGNATURE "rusEFI 2021.02.13.mre_f7.1840577628" +#define SIGNATURE_HASH 2528002934 +#define TS_SIGNATURE "rusEFI 2021.02.13.mre_f7.2528002934" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 39e4471539..deebeffb75 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 2021.02.13 -#define SIGNATURE_HASH 1373932672 -#define TS_SIGNATURE "rusEFI 2021.02.13.prometheus_405.1373932672" +#define SIGNATURE_HASH 2868786090 +#define TS_SIGNATURE "rusEFI 2021.02.13.prometheus_405.2868786090" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 51d4091735..3a0029828a 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 2021.02.13 -#define SIGNATURE_HASH 1373932672 -#define TS_SIGNATURE "rusEFI 2021.02.13.prometheus_469.1373932672" +#define SIGNATURE_HASH 2868786090 +#define TS_SIGNATURE "rusEFI 2021.02.13.prometheus_469.2868786090" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 2278e828aa..181c78f117 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 2021.02.13 -#define SIGNATURE_HASH 608388761 -#define TS_SIGNATURE "rusEFI 2021.02.13.proteus_f4.608388761" +#define SIGNATURE_HASH 3747215795 +#define TS_SIGNATURE "rusEFI 2021.02.13.proteus_f4.3747215795" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index d9fc3030a9..b5b194452c 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 2021.02.13 -#define SIGNATURE_HASH 608388761 -#define TS_SIGNATURE "rusEFI 2021.02.13.proteus_f7.608388761" +#define SIGNATURE_HASH 3747215795 +#define TS_SIGNATURE "rusEFI 2021.02.13.proteus_f7.3747215795" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index bf2caf38a6..ba9ab2c531 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.02.13 -#define SIGNATURE_HASH 510392745 -#define TS_SIGNATURE "rusEFI 2021.02.13.subaru_eg33_f7.510392745" +#define SIGNATURE_HASH 3849406083 +#define TS_SIGNATURE "rusEFI 2021.02.13.subaru_eg33_f7.3849406083" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 3d9b6c35a27c773c5e1b61d84be3a0ec68251d12..bbd2ef0c3b74af413594d14333242cf426cd64d6 100644 GIT binary patch delta 171844 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鍠Uz|jFm2OJ%6bimO8 zM+Y1oaCE@Y0Y?WM9dLBO(E鍠Uz|jFm2OJ%6bimO8M+Y1oaCE@Y0Y?WM9dLBO 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 zYL(Ui8)oConnection - dialog = tsPort, "TunerStudio Port" - field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed + dialog = tsPort, "Secondary Serial" field = "Use UART/TTL serial?", useSerialPort + field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed, {useSerialPort == 1} field = "TX pin", binarySerialTxPin, {useSerialPort == 1} field = "RX pin", binarySerialRxPin, {useSerialPort == 1} - field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - + dialog = canBus, "CAN Bus" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled @@ -4339,8 +4338,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin - ; we want to show baud rate even if pins are hard-coded like on microRusEFI - field = "Serial Baud Rate", auxSerialSpeed + field = "Serial Baud Rate", auxSerialSpeed dialog = sdCard, "SD Card Logger" field = "Enable SD Card", isSdCardEnabled @@ -4376,6 +4374,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc panel = tsPort + field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed panel = auxSerial panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 9742552007..b9da66025b 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 2021.02.13.frankenso_na6.3339232037" + signature = "rusEFI 2021.02.13.frankenso_na6.1007819791" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.13.frankenso_na6.3339232037" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.13.frankenso_na6.1007819791" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Feb 13 01:29:26 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Feb 13 01:42:35 UTC 2021 pageSize = 20000 page = 1 @@ -4301,13 +4301,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Board->Connection - dialog = tsPort, "TunerStudio Port" - field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed + dialog = tsPort, "Secondary Serial" field = "Use UART/TTL serial?", useSerialPort + field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed, {useSerialPort == 1} field = "TX pin", binarySerialTxPin, {useSerialPort == 1} field = "RX pin", binarySerialRxPin, {useSerialPort == 1} - field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - + dialog = canBus, "CAN Bus" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled @@ -4339,8 +4338,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin - ; we want to show baud rate even if pins are hard-coded like on microRusEFI - field = "Serial Baud Rate", auxSerialSpeed + field = "Serial Baud Rate", auxSerialSpeed dialog = sdCard, "SD Card Logger" field = "Enable SD Card", isSdCardEnabled @@ -4376,6 +4374,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc panel = tsPort + field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed panel = auxSerial panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 241e7dcd4a..1b545cb739 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.13.hellen72.1361499662" + signature = "rusEFI 2021.02.13.hellen72.2856085796" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.13.hellen72.1361499662" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.13.hellen72.2856085796" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Feb 13 01:29:17 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Feb 13 01:42:28 UTC 2021 pageSize = 20000 page = 1 @@ -4283,13 +4283,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Board->Connection - dialog = tsPort, "TunerStudio Port" - field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed + dialog = tsPort, "Secondary Serial" field = "Use UART/TTL serial?", useSerialPort + field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed, {useSerialPort == 1} field = "TX pin", binarySerialTxPin, {useSerialPort == 1} field = "RX pin", binarySerialRxPin, {useSerialPort == 1} - field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - + dialog = canBus, "CAN Bus" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled @@ -4316,8 +4315,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin - ; we want to show baud rate even if pins are hard-coded like on microRusEFI - field = "Serial Baud Rate", auxSerialSpeed + field = "Serial Baud Rate", auxSerialSpeed dialog = sdCard, "SD Card Logger" field = "Enable SD Card", isSdCardEnabled @@ -4352,6 +4350,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc + field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed panel = auxSerial diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 21f569a1df..64ab2689d5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.13.hellen_cypress.17716582" + signature = "rusEFI 2021.02.13.hellen_cypress.4195674700" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.13.hellen_cypress.17716582" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.13.hellen_cypress.4195674700" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Feb 13 01:29:36 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Feb 13 01:42:46 UTC 2021 pageSize = 20000 page = 1 @@ -4301,13 +4301,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Board->Connection - dialog = tsPort, "TunerStudio Port" - field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed + dialog = tsPort, "Secondary Serial" field = "Use UART/TTL serial?", useSerialPort + field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed, {useSerialPort == 1} field = "TX pin", binarySerialTxPin, {useSerialPort == 1} field = "RX pin", binarySerialRxPin, {useSerialPort == 1} - field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - + dialog = canBus, "CAN Bus" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled @@ -4339,8 +4338,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin - ; we want to show baud rate even if pins are hard-coded like on microRusEFI - field = "Serial Baud Rate", auxSerialSpeed + field = "Serial Baud Rate", auxSerialSpeed dialog = sdCard, "SD Card Logger" field = "Enable SD Card", isSdCardEnabled @@ -4376,6 +4374,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc panel = tsPort + field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed panel = auxSerial panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index a346975593..1211d35254 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 2021.02.13.kin.4272658842" + signature = "rusEFI 2021.02.13.kin.95495856" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.13.kin.4272658842" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.13.kin.95495856" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Feb 13 01:29:34 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Feb 13 01:42:45 UTC 2021 pageSize = 19972 page = 1 @@ -4283,13 +4283,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Board->Connection - dialog = tsPort, "TunerStudio Port" - field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed + dialog = tsPort, "Secondary Serial" field = "Use UART/TTL serial?", useSerialPort + field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed, {useSerialPort == 1} field = "TX pin", binarySerialTxPin, {useSerialPort == 1} field = "RX pin", binarySerialRxPin, {useSerialPort == 1} - field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - + dialog = canBus, "CAN Bus" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled @@ -4321,8 +4320,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin - ; we want to show baud rate even if pins are hard-coded like on microRusEFI - field = "Serial Baud Rate", auxSerialSpeed + field = "Serial Baud Rate", auxSerialSpeed dialog = sdCard, "SD Card Logger" field = "Enable SD Card", isSdCardEnabled @@ -4358,6 +4356,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc panel = tsPort + field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed panel = auxSerial panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 1e243d44c0..586afc885e 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 2021.02.13.mre_f4.1840577628" + signature = "rusEFI 2021.02.13.mre_f4.2528002934" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.13.mre_f4.1840577628" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.13.mre_f4.2528002934" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Feb 13 01:29:25 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Feb 13 01:42:33 UTC 2021 pageSize = 20000 page = 1 @@ -4283,13 +4283,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Board->Connection - dialog = tsPort, "TunerStudio Port" - field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed + dialog = tsPort, "Secondary Serial" field = "Use UART/TTL serial?", useSerialPort + field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed, {useSerialPort == 1} field = "TX pin", binarySerialTxPin, {useSerialPort == 1} field = "RX pin", binarySerialRxPin, {useSerialPort == 1} - field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - + dialog = canBus, "CAN Bus" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled @@ -4316,8 +4315,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin - ; we want to show baud rate even if pins are hard-coded like on microRusEFI - field = "Serial Baud Rate", auxSerialSpeed + field = "Serial Baud Rate", auxSerialSpeed dialog = sdCard, "SD Card Logger" field = "Enable SD Card", isSdCardEnabled @@ -4352,6 +4350,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc + field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed panel = auxSerial diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 83b73bf454..e52acb95ff 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 2021.02.13.mre_f7.1840577628" + signature = "rusEFI 2021.02.13.mre_f7.2528002934" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.13.mre_f7.1840577628" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.13.mre_f7.2528002934" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Feb 13 01:29:22 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Feb 13 01:42:32 UTC 2021 pageSize = 20000 page = 1 @@ -4283,13 +4283,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Board->Connection - dialog = tsPort, "TunerStudio Port" - field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed + dialog = tsPort, "Secondary Serial" field = "Use UART/TTL serial?", useSerialPort + field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed, {useSerialPort == 1} field = "TX pin", binarySerialTxPin, {useSerialPort == 1} field = "RX pin", binarySerialRxPin, {useSerialPort == 1} - field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - + dialog = canBus, "CAN Bus" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled @@ -4316,8 +4315,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin - ; we want to show baud rate even if pins are hard-coded like on microRusEFI - field = "Serial Baud Rate", auxSerialSpeed + field = "Serial Baud Rate", auxSerialSpeed dialog = sdCard, "SD Card Logger" field = "Enable SD Card", isSdCardEnabled @@ -4352,6 +4350,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc + field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed panel = auxSerial diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 5f1dff385f..baa2526384 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 2021.02.13.prometheus_405.1373932672" + signature = "rusEFI 2021.02.13.prometheus_405.2868786090" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.13.prometheus_405.1373932672" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.13.prometheus_405.2868786090" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Feb 13 01:29:29 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Feb 13 01:42:38 UTC 2021 pageSize = 20000 page = 1 @@ -4297,13 +4297,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Board->Connection - dialog = tsPort, "TunerStudio Port" - field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed + dialog = tsPort, "Secondary Serial" field = "Use UART/TTL serial?", useSerialPort + field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed, {useSerialPort == 1} field = "TX pin", binarySerialTxPin, {useSerialPort == 1} field = "RX pin", binarySerialRxPin, {useSerialPort == 1} - field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - + dialog = canBus, "CAN Bus" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled @@ -4335,8 +4334,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin - ; we want to show baud rate even if pins are hard-coded like on microRusEFI - field = "Serial Baud Rate", auxSerialSpeed + field = "Serial Baud Rate", auxSerialSpeed dialog = sdCard, "SD Card Logger" field = "Enable SD Card", isSdCardEnabled @@ -4372,6 +4370,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc panel = tsPort + field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed panel = auxSerial panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 96b5cb44e6..1e7d51c3a8 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 2021.02.13.prometheus_469.1373932672" + signature = "rusEFI 2021.02.13.prometheus_469.2868786090" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.13.prometheus_469.1373932672" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.13.prometheus_469.2868786090" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Feb 13 01:29:28 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Feb 13 01:42:37 UTC 2021 pageSize = 20000 page = 1 @@ -4297,13 +4297,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Board->Connection - dialog = tsPort, "TunerStudio Port" - field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed + dialog = tsPort, "Secondary Serial" field = "Use UART/TTL serial?", useSerialPort + field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed, {useSerialPort == 1} field = "TX pin", binarySerialTxPin, {useSerialPort == 1} field = "RX pin", binarySerialRxPin, {useSerialPort == 1} - field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - + dialog = canBus, "CAN Bus" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled @@ -4335,8 +4334,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin - ; we want to show baud rate even if pins are hard-coded like on microRusEFI - field = "Serial Baud Rate", auxSerialSpeed + field = "Serial Baud Rate", auxSerialSpeed dialog = sdCard, "SD Card Logger" field = "Enable SD Card", isSdCardEnabled @@ -4372,6 +4370,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc panel = tsPort + field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed panel = auxSerial panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index a16c26e9a4..abba92529a 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 2021.02.13.proteus_f4.608388761" + signature = "rusEFI 2021.02.13.proteus_f4.3747215795" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.13.proteus_f4.608388761" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.13.proteus_f4.3747215795" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Feb 13 01:29:32 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Feb 13 01:42:41 UTC 2021 pageSize = 20000 page = 1 @@ -4277,13 +4277,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Board->Connection - dialog = tsPort, "TunerStudio Port" - field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed + dialog = tsPort, "Secondary Serial" field = "Use UART/TTL serial?", useSerialPort + field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed, {useSerialPort == 1} field = "TX pin", binarySerialTxPin, {useSerialPort == 1} field = "RX pin", binarySerialRxPin, {useSerialPort == 1} - field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - + dialog = canBus, "CAN Bus" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled @@ -4310,8 +4309,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin - ; we want to show baud rate even if pins are hard-coded like on microRusEFI - field = "Serial Baud Rate", auxSerialSpeed + field = "Serial Baud Rate", auxSerialSpeed dialog = sdCard, "SD Card Logger" field = "Enable SD Card", isSdCardEnabled @@ -4344,6 +4342,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc + field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed panel = auxSerial diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 2747347833..fb2eceae21 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 2021.02.13.proteus_f7.608388761" + signature = "rusEFI 2021.02.13.proteus_f7.3747215795" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.13.proteus_f7.608388761" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.13.proteus_f7.3747215795" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Feb 13 01:29:30 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Feb 13 01:42:40 UTC 2021 pageSize = 20000 page = 1 @@ -4277,13 +4277,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Board->Connection - dialog = tsPort, "TunerStudio Port" - field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed + dialog = tsPort, "Secondary Serial" field = "Use UART/TTL serial?", useSerialPort + field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed, {useSerialPort == 1} field = "TX pin", binarySerialTxPin, {useSerialPort == 1} field = "RX pin", binarySerialRxPin, {useSerialPort == 1} - field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - + dialog = canBus, "CAN Bus" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled @@ -4310,8 +4309,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin - ; we want to show baud rate even if pins are hard-coded like on microRusEFI - field = "Serial Baud Rate", auxSerialSpeed + field = "Serial Baud Rate", auxSerialSpeed dialog = sdCard, "SD Card Logger" field = "Enable SD Card", isSdCardEnabled @@ -4344,6 +4342,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc + field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed panel = auxSerial diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 654027b93c..d08d682178 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.13.subaru_eg33_f7.510392745" + signature = "rusEFI 2021.02.13.subaru_eg33_f7.3849406083" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.13.subaru_eg33_f7.510392745" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.13.subaru_eg33_f7.3849406083" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Feb 13 01:29:33 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Feb 13 01:42:43 UTC 2021 pageSize = 20000 page = 1 @@ -4294,13 +4294,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Board->Connection - dialog = tsPort, "TunerStudio Port" - field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed + dialog = tsPort, "Secondary Serial" field = "Use UART/TTL serial?", useSerialPort + field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed, {useSerialPort == 1} field = "TX pin", binarySerialTxPin, {useSerialPort == 1} field = "RX pin", binarySerialRxPin, {useSerialPort == 1} - field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - + dialog = canBus, "CAN Bus" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled @@ -4332,8 +4331,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin - ; we want to show baud rate even if pins are hard-coded like on microRusEFI - field = "Serial Baud Rate", auxSerialSpeed + field = "Serial Baud Rate", auxSerialSpeed dialog = sdCard, "SD Card Logger" field = "Enable SD Card", isSdCardEnabled @@ -4368,6 +4366,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc + field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed panel = auxSerial