diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index af6127a844..0d6eae38ea 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.01 -#define SIGNATURE_HASH 839537058 -#define TS_SIGNATURE "rusEFI 2020.08.01.all.839537058" +#define SIGNATURE_HASH 1472596770 +#define TS_SIGNATURE "rusEFI 2020.08.01.all.1472596770" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index a2ee256105..84530a5ac5 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.01 -#define SIGNATURE_HASH 3968679233 -#define TS_SIGNATURE "rusEFI 2020.08.01.frankenso_na6.3968679233" +#define SIGNATURE_HASH 2302764993 +#define TS_SIGNATURE "rusEFI 2020.08.01.frankenso_na6.2302764993" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 1133c72a58..63098018c0 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.01 -#define SIGNATURE_HASH 4281634104 -#define TS_SIGNATURE "rusEFI 2020.08.01.kin.4281634104" +#define SIGNATURE_HASH 2599999416 +#define TS_SIGNATURE "rusEFI 2020.08.01.kin.2599999416" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 80ed5a09eb..f4e77bda19 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.01 -#define SIGNATURE_HASH 2079622956 -#define TS_SIGNATURE "rusEFI 2020.08.01.mre_f4.2079622956" +#define SIGNATURE_HASH 507043244 +#define TS_SIGNATURE "rusEFI 2020.08.01.mre_f4.507043244" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 0600c06083..41efdaf01f 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.01 -#define SIGNATURE_HASH 2079622956 -#define TS_SIGNATURE "rusEFI 2020.08.01.mre_f7.2079622956" +#define SIGNATURE_HASH 507043244 +#define TS_SIGNATURE "rusEFI 2020.08.01.mre_f7.507043244" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index a267eda810..a74fc8fb0c 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.01 -#define SIGNATURE_HASH 3340142886 -#define TS_SIGNATURE "rusEFI 2020.08.01.prometheus_405.3340142886" +#define SIGNATURE_HASH 2732250022 +#define TS_SIGNATURE "rusEFI 2020.08.01.prometheus_405.2732250022" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 44751f2b12..49e7cb68e8 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.01 -#define SIGNATURE_HASH 3340142886 -#define TS_SIGNATURE "rusEFI 2020.08.01.prometheus_469.3340142886" +#define SIGNATURE_HASH 2732250022 +#define TS_SIGNATURE "rusEFI 2020.08.01.prometheus_469.2732250022" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 67abf0677a..a2522d5124 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.01 -#define SIGNATURE_HASH 3214614637 -#define TS_SIGNATURE "rusEFI 2020.08.01.proteus_f4.3214614637" +#define SIGNATURE_HASH 3663166189 +#define TS_SIGNATURE "rusEFI 2020.08.01.proteus_f4.3663166189" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 9d1c5bd95d..9b11107bef 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.01 -#define SIGNATURE_HASH 3214614637 -#define TS_SIGNATURE "rusEFI 2020.08.01.proteus_f7.3214614637" +#define SIGNATURE_HASH 3663166189 +#define TS_SIGNATURE "rusEFI 2020.08.01.proteus_f7.3663166189" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index be09dc78a2..16d0cea9f5 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 82f11a3690..524c24d18e 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.01.all.839537058" + signature = "rusEFI 2020.08.01.all.1472596770" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.01.all.839537058" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.01.all.1472596770" ; 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 01 01:20:06 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 01 03:55:01 UTC 2020 pageSize = 20000 page = 1 @@ -1633,6 +1633,7 @@ page = 1 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 + sd_status = scalar, U08, 246, "", 1.0, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2328,6 +2329,11 @@ gaugeCategory = Sensors - Raw indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black indicator = { ind_injection_enabled}, "no injection", "injection", yellow, black, white, black indicator = { ind_isTriggerError}, "trigger ok", "trigger err", white, black, red, black + + indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black + indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black + indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black + indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling @@ -2487,6 +2493,9 @@ gaugeCategory = Sensors - Raw [Menu] menuDialog = main + menu = "Data Logging" + subMenu = std_ms3SdConsole, "Browse / Import SD Card" + menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 3255705a9d..1286dd7ab8 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.01.frankenso_na6.3968679233" + signature = "rusEFI 2020.08.01.frankenso_na6.2302764993" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.01.frankenso_na6.3968679233" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.01.frankenso_na6.2302764993" ; 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 01 01:20:10 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 01 03:55:06 UTC 2020 pageSize = 20000 page = 1 @@ -1633,6 +1633,7 @@ page = 1 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 + sd_status = scalar, U08, 246, "", 1.0, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2328,6 +2329,11 @@ gaugeCategory = Sensors - Raw indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black indicator = { ind_injection_enabled}, "no injection", "injection", yellow, black, white, black indicator = { ind_isTriggerError}, "trigger ok", "trigger err", white, black, red, black + + indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black + indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black + indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black + indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling @@ -2487,6 +2493,9 @@ gaugeCategory = Sensors - Raw [Menu] menuDialog = main + menu = "Data Logging" + subMenu = std_ms3SdConsole, "Browse / Import SD Card" + menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index d7c003c789..0d231db4f4 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.01.kin.4281634104" + signature = "rusEFI 2020.08.01.kin.2599999416" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.01.kin.4281634104" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.01.kin.2599999416" ; 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 01 01:20:16 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 01 03:55:13 UTC 2020 pageSize = 20000 page = 1 @@ -1633,6 +1633,7 @@ page = 1 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 + sd_status = scalar, U08, 246, "", 1.0, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2328,6 +2329,11 @@ gaugeCategory = Sensors - Raw indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black indicator = { ind_injection_enabled}, "no injection", "injection", yellow, black, white, black indicator = { ind_isTriggerError}, "trigger ok", "trigger err", white, black, red, black + + indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black + indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black + indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black + indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling @@ -2487,6 +2493,9 @@ gaugeCategory = Sensors - Raw [Menu] menuDialog = main + menu = "Data Logging" + subMenu = std_ms3SdConsole, "Browse / Import SD Card" + menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 88e9d12500..db8ca1c870 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.01.mre_f4.2079622956" + signature = "rusEFI 2020.08.01.mre_f4.507043244" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.01.mre_f4.2079622956" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.01.mre_f4.507043244" ; 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 01 01:20:08 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 01 03:55:04 UTC 2020 pageSize = 20000 page = 1 @@ -1633,6 +1633,7 @@ page = 1 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 + sd_status = scalar, U08, 246, "", 1.0, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2328,6 +2329,11 @@ gaugeCategory = Sensors - Raw indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black indicator = { ind_injection_enabled}, "no injection", "injection", yellow, black, white, black indicator = { ind_isTriggerError}, "trigger ok", "trigger err", white, black, red, black + + indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black + indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black + indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black + indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling @@ -2487,6 +2493,9 @@ gaugeCategory = Sensors - Raw [Menu] menuDialog = main + menu = "Data Logging" + subMenu = std_ms3SdConsole, "Browse / Import SD Card" + menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 112a6cb18f..402d30c60d 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.01.mre_f7.2079622956" + signature = "rusEFI 2020.08.01.mre_f7.507043244" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.01.mre_f7.2079622956" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.01.mre_f7.507043244" ; 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 01 01:20:07 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 01 03:55:03 UTC 2020 pageSize = 20000 page = 1 @@ -1633,6 +1633,7 @@ page = 1 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 + sd_status = scalar, U08, 246, "", 1.0, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2328,6 +2329,11 @@ gaugeCategory = Sensors - Raw indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black indicator = { ind_injection_enabled}, "no injection", "injection", yellow, black, white, black indicator = { ind_isTriggerError}, "trigger ok", "trigger err", white, black, red, black + + indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black + indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black + indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black + indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling @@ -2487,6 +2493,9 @@ gaugeCategory = Sensors - Raw [Menu] menuDialog = main + menu = "Data Logging" + subMenu = std_ms3SdConsole, "Browse / Import SD Card" + menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 9b805b8d85..a266224958 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.01.prometheus_405.3340142886" + signature = "rusEFI 2020.08.01.prometheus_405.2732250022" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.01.prometheus_405.3340142886" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.01.prometheus_405.2732250022" ; 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 01 01:20:12 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 01 03:55:09 UTC 2020 pageSize = 20000 page = 1 @@ -1633,6 +1633,7 @@ page = 1 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 + sd_status = scalar, U08, 246, "", 1.0, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2328,6 +2329,11 @@ gaugeCategory = Sensors - Raw indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black indicator = { ind_injection_enabled}, "no injection", "injection", yellow, black, white, black indicator = { ind_isTriggerError}, "trigger ok", "trigger err", white, black, red, black + + indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black + indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black + indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black + indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling @@ -2487,6 +2493,9 @@ gaugeCategory = Sensors - Raw [Menu] menuDialog = main + menu = "Data Logging" + subMenu = std_ms3SdConsole, "Browse / Import SD Card" + menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index fe24017d55..17e12cbca9 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.01.prometheus_469.3340142886" + signature = "rusEFI 2020.08.01.prometheus_469.2732250022" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.01.prometheus_469.3340142886" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.01.prometheus_469.2732250022" ; 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 01 01:20:11 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 01 03:55:07 UTC 2020 pageSize = 20000 page = 1 @@ -1633,6 +1633,7 @@ page = 1 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 + sd_status = scalar, U08, 246, "", 1.0, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2328,6 +2329,11 @@ gaugeCategory = Sensors - Raw indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black indicator = { ind_injection_enabled}, "no injection", "injection", yellow, black, white, black indicator = { ind_isTriggerError}, "trigger ok", "trigger err", white, black, red, black + + indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black + indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black + indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black + indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling @@ -2487,6 +2493,9 @@ gaugeCategory = Sensors - Raw [Menu] menuDialog = main + menu = "Data Logging" + subMenu = std_ms3SdConsole, "Browse / Import SD Card" + menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 8b647e4ccb..fe8f07dfa9 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.01.proteus_f4.3214614637" + signature = "rusEFI 2020.08.01.proteus_f4.3663166189" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.01.proteus_f4.3214614637" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.01.proteus_f4.3663166189" ; 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 01 01:20:15 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 01 03:55:11 UTC 2020 pageSize = 20000 page = 1 @@ -1633,6 +1633,7 @@ page = 1 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 + sd_status = scalar, U08, 246, "", 1.0, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2328,6 +2329,11 @@ gaugeCategory = Sensors - Raw indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black indicator = { ind_injection_enabled}, "no injection", "injection", yellow, black, white, black indicator = { ind_isTriggerError}, "trigger ok", "trigger err", white, black, red, black + + indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black + indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black + indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black + indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling @@ -2487,6 +2493,9 @@ gaugeCategory = Sensors - Raw [Menu] menuDialog = main + menu = "Data Logging" + subMenu = std_ms3SdConsole, "Browse / Import SD Card" + menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 547f333c91..1017080b61 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.01.proteus_f7.3214614637" + signature = "rusEFI 2020.08.01.proteus_f7.3663166189" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.01.proteus_f7.3214614637" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.01.proteus_f7.3663166189" ; 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 01 01:20:14 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 01 03:55:10 UTC 2020 pageSize = 20000 page = 1 @@ -1633,6 +1633,7 @@ page = 1 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 + sd_status = scalar, U08, 246, "", 1.0, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2328,6 +2329,11 @@ gaugeCategory = Sensors - Raw indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black indicator = { ind_injection_enabled}, "no injection", "injection", yellow, black, white, black indicator = { ind_isTriggerError}, "trigger ok", "trigger err", white, black, red, black + + indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black + indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black + indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black + indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling @@ -2487,6 +2493,9 @@ gaugeCategory = Sensors - Raw [Menu] menuDialog = main + menu = "Data Logging" + subMenu = std_ms3SdConsole, "Browse / Import SD Card" + menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger"