diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index 68f5c5fdae..05e53115c1 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1027,7 +1027,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_49823 +#define SIGNATURE_HASH snap_59789 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1222,6 +1222,7 @@ #define TS_COMMAND_F_char F #define TS_COMPOSITE_DISABLE 2 #define TS_COMPOSITE_ENABLE 1 +#define TS_COMPOSITE_READ 3 #define TS_CRC_CHECK_COMMAND 'k' #define TS_CRC_CHECK_COMMAND_char k #define TS_EXECUTE 'E' @@ -1234,8 +1235,6 @@ #define TS_GET_CONFIG_ERROR_char e #define TS_GET_FIRMWARE_VERSION 'V' #define TS_GET_FIRMWARE_VERSION_char V -#define TS_GET_LOGGER_GET_BUFFER 'L' -#define TS_GET_LOGGER_GET_BUFFER_char L #define TS_GET_OUTPUTS_SIZE '4' #define TS_GET_OUTPUTS_SIZE_char 4 #define TS_GET_PROTOCOL_VERSION_COMMAND_F 'F' @@ -1301,12 +1300,15 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.12.10.cypress.snap_49823" +#define TS_SIGNATURE "rusEFI 2022.12.10.cypress.snap_59789" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t #define TS_TOTAL_OUTPUT_SIZE 1276 +#define TS_TRIGGER_SCOPE_DISABLE 5 +#define TS_TRIGGER_SCOPE_ENABLE 4 +#define TS_TRIGGER_SCOPE_READ 6 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index c5fcae045e..3281f659c0 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1027,7 +1027,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_24659 +#define SIGNATURE_HASH snap_19265 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1222,6 +1222,7 @@ #define TS_COMMAND_F_char F #define TS_COMPOSITE_DISABLE 2 #define TS_COMPOSITE_ENABLE 1 +#define TS_COMPOSITE_READ 3 #define TS_CRC_CHECK_COMMAND 'k' #define TS_CRC_CHECK_COMMAND_char k #define TS_EXECUTE 'E' @@ -1234,8 +1235,6 @@ #define TS_GET_CONFIG_ERROR_char e #define TS_GET_FIRMWARE_VERSION 'V' #define TS_GET_FIRMWARE_VERSION_char V -#define TS_GET_LOGGER_GET_BUFFER 'L' -#define TS_GET_LOGGER_GET_BUFFER_char L #define TS_GET_OUTPUTS_SIZE '4' #define TS_GET_OUTPUTS_SIZE_char 4 #define TS_GET_PROTOCOL_VERSION_COMMAND_F 'F' @@ -1301,12 +1300,15 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.12.10.kin.snap_24659" +#define TS_SIGNATURE "rusEFI 2022.12.10.kin.snap_19265" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t #define TS_TOTAL_OUTPUT_SIZE 1276 +#define TS_TRIGGER_SCOPE_DISABLE 5 +#define TS_TRIGGER_SCOPE_ENABLE 4 +#define TS_TRIGGER_SCOPE_READ 6 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 4ac091b434..9dd872dfd5 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -993,7 +993,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH snap_6981 +#define SIGNATURE_HASH snap_12375 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1189,6 +1189,7 @@ #define TS_COMMAND_F_char F #define TS_COMPOSITE_DISABLE 2 #define TS_COMPOSITE_ENABLE 1 +#define TS_COMPOSITE_READ 3 #define TS_CRC_CHECK_COMMAND 'k' #define TS_CRC_CHECK_COMMAND_char k #define TS_EXECUTE 'E' @@ -1201,8 +1202,6 @@ #define TS_GET_CONFIG_ERROR_char e #define TS_GET_FIRMWARE_VERSION 'V' #define TS_GET_FIRMWARE_VERSION_char V -#define TS_GET_LOGGER_GET_BUFFER 'L' -#define TS_GET_LOGGER_GET_BUFFER_char L #define TS_GET_OUTPUTS_SIZE '4' #define TS_GET_OUTPUTS_SIZE_char 4 #define TS_GET_PROTOCOL_VERSION_COMMAND_F 'F' @@ -1268,12 +1267,15 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.12.10.subaru_eg33_f7.snap_6981" +#define TS_SIGNATURE "rusEFI 2022.12.10.subaru_eg33_f7.snap_12375" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t #define TS_TOTAL_OUTPUT_SIZE 1276 +#define TS_TRIGGER_SCOPE_DISABLE 5 +#define TS_TRIGGER_SCOPE_ENABLE 4 +#define TS_TRIGGER_SCOPE_READ 6 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 3f8f45e921..2aa2e63baa 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -1,5 +1,6 @@ entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 71bca9d32b..f023ea90d4 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -1,6 +1,6 @@ sd_presentGauge = sd_present,"sd_present", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0 sd_logging_internalGauge = sd_logging_internal,"sd_logging_internal", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0 -unusedb4Gauge = unusedb4,"unusedb4", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0 +triggerScopeReadyGauge = triggerScopeReady,"triggerScopeReady", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0 unusedb5Gauge = unusedb5,"unusedb5", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0 isFanOnGauge = isFanOn,"radiator fan", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0 isO2HeaterOnGauge = isO2HeaterOn,"isO2HeaterOn", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 9d275f67af..e1bb8e0664 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -1,6 +1,6 @@ sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index e8202ef8b9..5446c98123 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Dec 04 18:18:31 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Dec 10 12:39:51 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -42,7 +42,7 @@ struct output_channels_s { bool sd_logging_internal : 1 {}; /** offset 0 bit 2 */ - bool unusedb4 : 1 {}; + bool triggerScopeReady : 1 {}; /** offset 0 bit 3 */ bool unusedb5 : 1 {}; @@ -1375,4 +1375,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 748); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Dec 04 18:18:31 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Dec 10 12:39:51 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 46f07411fb..9be916d432 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1027,7 +1027,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_49823 +#define SIGNATURE_HASH snap_59789 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1222,6 +1222,7 @@ #define TS_COMMAND_F_char F #define TS_COMPOSITE_DISABLE 2 #define TS_COMPOSITE_ENABLE 1 +#define TS_COMPOSITE_READ 3 #define TS_CRC_CHECK_COMMAND 'k' #define TS_CRC_CHECK_COMMAND_char k #define TS_EXECUTE 'E' @@ -1234,8 +1235,6 @@ #define TS_GET_CONFIG_ERROR_char e #define TS_GET_FIRMWARE_VERSION 'V' #define TS_GET_FIRMWARE_VERSION_char V -#define TS_GET_LOGGER_GET_BUFFER 'L' -#define TS_GET_LOGGER_GET_BUFFER_char L #define TS_GET_OUTPUTS_SIZE '4' #define TS_GET_OUTPUTS_SIZE_char 4 #define TS_GET_PROTOCOL_VERSION_COMMAND_F 'F' @@ -1301,12 +1300,15 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.12.10.all.snap_49823" +#define TS_SIGNATURE "rusEFI 2022.12.10.all.snap_59789" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t #define TS_TOTAL_OUTPUT_SIZE 1276 +#define TS_TRIGGER_SCOPE_DISABLE 5 +#define TS_TRIGGER_SCOPE_ENABLE 4 +#define TS_TRIGGER_SCOPE_READ 6 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index edf826119c..cde1285679 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_51920 -#define TS_SIGNATURE "rusEFI 2022.12.10.48way.snap_51920" +#define SIGNATURE_HASH snap_57794 +#define TS_SIGNATURE "rusEFI 2022.12.10.48way.snap_57794" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 01b8cda059..b402c80429 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_49823 -#define TS_SIGNATURE "rusEFI 2022.12.10.all.snap_49823" +#define SIGNATURE_HASH snap_59789 +#define TS_SIGNATURE "rusEFI 2022.12.10.all.snap_59789" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 4582764313..e90be20d3e 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_24563 -#define TS_SIGNATURE "rusEFI 2022.12.10.alphax-2chan.snap_24563" +#define SIGNATURE_HASH snap_29921 +#define TS_SIGNATURE "rusEFI 2022.12.10.alphax-2chan.snap_29921" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index f65d6bc029..bb49bce665 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_272 -#define TS_SIGNATURE "rusEFI 2022.12.10.alphax-4chan.snap_272" +#define SIGNATURE_HASH snap_10754 +#define TS_SIGNATURE "rusEFI 2022.12.10.alphax-4chan.snap_10754" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index bcd55522de..e1a47755ba 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_60438 -#define TS_SIGNATURE "rusEFI 2022.12.10.alphax-8chan.snap_60438" +#define SIGNATURE_HASH snap_50948 +#define TS_SIGNATURE "rusEFI 2022.12.10.alphax-8chan.snap_50948" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 23a3466edc..50cef385b0 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_14264 -#define TS_SIGNATURE "rusEFI 2022.12.10.atlas.snap_14264" +#define SIGNATURE_HASH snap_7338 +#define TS_SIGNATURE "rusEFI 2022.12.10.atlas.snap_7338" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index adfd08965d..4103260cbb 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_37734 -#define TS_SIGNATURE "rusEFI 2022.12.10.core8.snap_37734" +#define SIGNATURE_HASH snap_47220 +#define TS_SIGNATURE "rusEFI 2022.12.10.core8.snap_47220" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 883e3b5d8c..476235ce59 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH snap_49823 -#define TS_SIGNATURE "rusEFI 2022.12.10.cypress.snap_49823" +#define SIGNATURE_HASH snap_59789 +#define TS_SIGNATURE "rusEFI 2022.12.10.cypress.snap_59789" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 5ec9e6f9bb..a760ca2294 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_49823 -#define TS_SIGNATURE "rusEFI 2022.12.10.f407-discovery.snap_49823" +#define SIGNATURE_HASH snap_59789 +#define TS_SIGNATURE "rusEFI 2022.12.10.f407-discovery.snap_59789" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 50dcebafc2..efb8721f5f 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_49823 -#define TS_SIGNATURE "rusEFI 2022.12.10.f429-discovery.snap_49823" +#define SIGNATURE_HASH snap_59789 +#define TS_SIGNATURE "rusEFI 2022.12.10.f429-discovery.snap_59789" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 0a7d141fb3..5d18dfc0cc 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_15963 -#define TS_SIGNATURE "rusEFI 2022.12.10.frankenso_na6.snap_15963" +#define SIGNATURE_HASH snap_5449 +#define TS_SIGNATURE "rusEFI 2022.12.10.frankenso_na6.snap_5449" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 68f98d8242..1a69fee779 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_33888 -#define TS_SIGNATURE "rusEFI 2022.12.10.harley81.snap_33888" +#define SIGNATURE_HASH snap_44914 +#define TS_SIGNATURE "rusEFI 2022.12.10.harley81.snap_44914" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 87f7b7b278..84f02c7384 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_41371 -#define TS_SIGNATURE "rusEFI 2022.12.10.hellen-gm-e67.snap_41371" +#define SIGNATURE_HASH snap_35465 +#define TS_SIGNATURE "rusEFI 2022.12.10.hellen-gm-e67.snap_35465" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index f438bf39ba..81f9673c5f 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_62291 -#define TS_SIGNATURE "rusEFI 2022.12.10.hellen-nb1.snap_62291" +#define SIGNATURE_HASH snap_55361 +#define TS_SIGNATURE "rusEFI 2022.12.10.hellen-nb1.snap_55361" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index eeabdabe95..126b6261db 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_16141 -#define TS_SIGNATURE "rusEFI 2022.12.10.hellen121nissan.snap_16141" +#define SIGNATURE_HASH snap_5151 +#define TS_SIGNATURE "rusEFI 2022.12.10.hellen121nissan.snap_5151" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index c1b4c8f843..a7685a6fcc 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_21890 -#define TS_SIGNATURE "rusEFI 2022.12.10.hellen121vag.snap_21890" +#define SIGNATURE_HASH snap_32400 +#define TS_SIGNATURE "rusEFI 2022.12.10.hellen121vag.snap_32400" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 18c46c6724..7dfc54d0e3 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_49060 -#define TS_SIGNATURE "rusEFI 2022.12.10.hellen128.snap_49060" +#define SIGNATURE_HASH snap_38070 +#define TS_SIGNATURE "rusEFI 2022.12.10.hellen128.snap_38070" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 16a0b52ec3..b1e4ab48d7 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_63612 -#define TS_SIGNATURE "rusEFI 2022.12.10.hellen154hyundai.snap_63612" +#define SIGNATURE_HASH snap_54126 +#define TS_SIGNATURE "rusEFI 2022.12.10.hellen154hyundai.snap_54126" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index ad5dd8506a..1185786b7b 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_52244 -#define TS_SIGNATURE "rusEFI 2022.12.10.hellen72.snap_52244" +#define SIGNATURE_HASH snap_59142 +#define TS_SIGNATURE "rusEFI 2022.12.10.hellen72.snap_59142" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 097e0579f0..763a57d339 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_6805 -#define TS_SIGNATURE "rusEFI 2022.12.10.hellen81.snap_6805" +#define SIGNATURE_HASH snap_12679 +#define TS_SIGNATURE "rusEFI 2022.12.10.hellen81.snap_12679" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 54e8d354b4..09a6cf4f1a 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_53587 -#define TS_SIGNATURE "rusEFI 2022.12.10.hellen88bmw.snap_53587" +#define SIGNATURE_HASH snap_64065 +#define TS_SIGNATURE "rusEFI 2022.12.10.hellen88bmw.snap_64065" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 7e07725704..38e3c1ab1a 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_29608 -#define TS_SIGNATURE "rusEFI 2022.12.10.hellenNA6.snap_29608" +#define SIGNATURE_HASH snap_22714 +#define TS_SIGNATURE "rusEFI 2022.12.10.hellenNA6.snap_22714" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 2779127825..bc313db013 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_29559 -#define TS_SIGNATURE "rusEFI 2022.12.10.hellenNA8_96.snap_29559" +#define SIGNATURE_HASH snap_22629 +#define TS_SIGNATURE "rusEFI 2022.12.10.hellenNA8_96.snap_22629" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 371ce1221c..8e323394d9 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH snap_24659 -#define TS_SIGNATURE "rusEFI 2022.12.10.kin.snap_24659" +#define SIGNATURE_HASH snap_19265 +#define TS_SIGNATURE "rusEFI 2022.12.10.kin.snap_19265" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 779d2c0b54..d9dbdaef80 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_42399 -#define TS_SIGNATURE "rusEFI 2022.12.10.mre_f4.snap_42399" +#define SIGNATURE_HASH snap_36493 +#define TS_SIGNATURE "rusEFI 2022.12.10.mre_f4.snap_36493" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 0d879a994b..323aaa187d 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_42399 -#define TS_SIGNATURE "rusEFI 2022.12.10.mre_f7.snap_42399" +#define SIGNATURE_HASH snap_36493 +#define TS_SIGNATURE "rusEFI 2022.12.10.mre_f7.snap_36493" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 61309a0845..4190d1e639 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_7033 -#define TS_SIGNATURE "rusEFI 2022.12.10.prometheus_405.snap_7033" +#define SIGNATURE_HASH snap_12395 +#define TS_SIGNATURE "rusEFI 2022.12.10.prometheus_405.snap_12395" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 47a44577bb..7a04b9b650 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_7033 -#define TS_SIGNATURE "rusEFI 2022.12.10.prometheus_469.snap_7033" +#define SIGNATURE_HASH snap_12395 +#define TS_SIGNATURE "rusEFI 2022.12.10.prometheus_469.snap_12395" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 19a66a8842..0b4bbd4736 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_1513 -#define TS_SIGNATURE "rusEFI 2022.12.10.proteus_f4.snap_1513" +#define SIGNATURE_HASH snap_12027 +#define TS_SIGNATURE "rusEFI 2022.12.10.proteus_f4.snap_12027" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index b0bd355b50..23cb04b590 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_1513 -#define TS_SIGNATURE "rusEFI 2022.12.10.proteus_f7.snap_1513" +#define SIGNATURE_HASH snap_12027 +#define TS_SIGNATURE "rusEFI 2022.12.10.proteus_f7.snap_12027" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index bf6a186e2a..14e48df109 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_1513 -#define TS_SIGNATURE "rusEFI 2022.12.10.proteus_h7.snap_1513" +#define SIGNATURE_HASH snap_12027 +#define TS_SIGNATURE "rusEFI 2022.12.10.proteus_h7.snap_12027" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 343687a17a..967d99e82f 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_6981 -#define TS_SIGNATURE "rusEFI 2022.12.10.subaru_eg33_f7.snap_6981" +#define SIGNATURE_HASH snap_12375 +#define TS_SIGNATURE "rusEFI 2022.12.10.subaru_eg33_f7.snap_12375" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 57f1fb5eb3..3f7a4ee4cf 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_3275 -#define TS_SIGNATURE "rusEFI 2022.12.10.tdg-pdm8.snap_3275" +#define SIGNATURE_HASH snap_10201 +#define TS_SIGNATURE "rusEFI 2022.12.10.tdg-pdm8.snap_10201" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index bfac24a356..78398424a2 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -7,6 +7,8 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.sd_present; case 708639006: return engine->outputChannels.sd_logging_internal; + case -770506808: + return engine->outputChannels.triggerScopeReady; case -1441751117: return engine->outputChannels.isFanOn; case 438683128: diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 16cb7f0248..ae8d49d57e 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 2022.12.10.all.snap_49823" + signature = "rusEFI 2022.12.10.all.snap_59789" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.all.snap_49823" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.all.snap_59789" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:31 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index cae20bc3e0..891e9d1041 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.48way.snap_51920" + signature = "rusEFI 2022.12.10.48way.snap_57794" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.48way.snap_51920" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.48way.snap_57794" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:18 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 4e058cc0f3..5b101fb373 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.alphax-2chan.snap_24563" + signature = "rusEFI 2022.12.10.alphax-2chan.snap_29921" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.alphax-2chan.snap_24563" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.alphax-2chan.snap_29921" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:54:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:39:56 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 9ba6e2bcff..87852c37f0 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.alphax-4chan.snap_272" + signature = "rusEFI 2022.12.10.alphax-4chan.snap_10754" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.alphax-4chan.snap_272" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.alphax-4chan.snap_10754" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:54:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:39:57 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 4f93d43fbc..25dd96eb82 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.alphax-8chan.snap_60438" + signature = "rusEFI 2022.12.10.alphax-8chan.snap_50948" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.alphax-8chan.snap_60438" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.alphax-8chan.snap_50948" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:54:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:39:58 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 731734e20f..bb15c129bc 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.atlas.snap_14264" + signature = "rusEFI 2022.12.10.atlas.snap_7338" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.atlas.snap_14264" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.atlas.snap_7338" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:28 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 1cebd759b3..a5debfa670 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.core8.snap_37734" + signature = "rusEFI 2022.12.10.core8.snap_47220" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.core8.snap_37734" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.core8.snap_47220" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:16 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 9eae89ec91..4f30243a76 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.cypress.snap_49823" + signature = "rusEFI 2022.12.10.cypress.snap_59789" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.cypress.snap_49823" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.cypress.snap_59789" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; 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 Dec 10 03:54:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Dec 10 12:39:54 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index a59fd274ea..c98ceab058 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.f407-discovery.snap_49823" + signature = "rusEFI 2022.12.10.f407-discovery.snap_59789" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.f407-discovery.snap_49823" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.f407-discovery.snap_59789" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:26 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 9789bf6704..81b3e95683 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.f429-discovery.snap_49823" + signature = "rusEFI 2022.12.10.f429-discovery.snap_59789" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.f429-discovery.snap_49823" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.f429-discovery.snap_59789" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:27 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 7846e0ad7d..7aea28464d 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 2022.12.10.frankenso_na6.snap_15963" + signature = "rusEFI 2022.12.10.frankenso_na6.snap_5449" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.frankenso_na6.snap_15963" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.frankenso_na6.snap_5449" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:19 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 88bf1f1f62..041b76168e 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.harley81.snap_33888" + signature = "rusEFI 2022.12.10.harley81.snap_44914" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.harley81.snap_33888" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.harley81.snap_44914" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:54:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:39:59 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 7b3c017457..5f8be2a0bb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.hellen-gm-e67.snap_41371" + signature = "rusEFI 2022.12.10.hellen-gm-e67.snap_35465" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.hellen-gm-e67.snap_41371" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.hellen-gm-e67.snap_35465" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:10 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 285cf3eccf..a43e6968d1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.hellen-nb1.snap_62291" + signature = "rusEFI 2022.12.10.hellen-nb1.snap_55361" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.hellen-nb1.snap_62291" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.hellen-nb1.snap_55361" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:09 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index a2d557aba6..c2ac5a5aac 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.hellen121nissan.snap_16141" + signature = "rusEFI 2022.12.10.hellen121nissan.snap_5151" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.hellen121nissan.snap_16141" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.hellen121nissan.snap_5151" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:03 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 1e90958a77..dbf85c9b47 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.hellen121vag.snap_21890" + signature = "rusEFI 2022.12.10.hellen121vag.snap_32400" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.hellen121vag.snap_21890" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.hellen121vag.snap_32400" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:02 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 71040d7324..df569d86ed 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.hellen128.snap_49060" + signature = "rusEFI 2022.12.10.hellen128.snap_38070" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.hellen128.snap_49060" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.hellen128.snap_38070" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:01 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 3c3db44202..df91d49e13 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.hellen154hyundai.snap_63612" + signature = "rusEFI 2022.12.10.hellen154hyundai.snap_54126" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.hellen154hyundai.snap_63612" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.hellen154hyundai.snap_54126" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:04 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index a118d9a709..c7bae0b8a4 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 2022.12.10.hellen72.snap_52244" + signature = "rusEFI 2022.12.10.hellen72.snap_59142" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.hellen72.snap_52244" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.hellen72.snap_59142" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:07 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 633ca1da15..717988040c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.hellen81.snap_6805" + signature = "rusEFI 2022.12.10.hellen81.snap_12679" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.hellen81.snap_6805" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.hellen81.snap_12679" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:08 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index f69230784a..77a669389d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.hellen88bmw.snap_53587" + signature = "rusEFI 2022.12.10.hellen88bmw.snap_64065" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.hellen88bmw.snap_53587" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.hellen88bmw.snap_64065" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:06 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index aa96ba72ad..f26785cb32 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.hellenNA6.snap_29608" + signature = "rusEFI 2022.12.10.hellenNA6.snap_22714" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.hellenNA6.snap_29608" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.hellenNA6.snap_22714" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:12 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 81efaf4f07..47f0744ef4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.hellenNA8_96.snap_29559" + signature = "rusEFI 2022.12.10.hellenNA8_96.snap_22629" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.hellenNA8_96.snap_29559" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.hellenNA8_96.snap_22629" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:13 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 1aa7a7f85e..5ab26ba5ce 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.kin.snap_24659" + signature = "rusEFI 2022.12.10.kin.snap_19265" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.kin.snap_24659" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.kin.snap_19265" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Dec 10 03:54:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Dec 10 12:39:53 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 31c846b794..5a50d1b865 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 2022.12.10.mre_f4.snap_42399" + signature = "rusEFI 2022.12.10.mre_f4.snap_36493" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.mre_f4.snap_42399" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.mre_f4.snap_36493" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:15 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 96be83ab72..4a1f5f481a 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 2022.12.10.mre_f7.snap_42399" + signature = "rusEFI 2022.12.10.mre_f7.snap_36493" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.mre_f7.snap_42399" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.mre_f7.snap_36493" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:14 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index a0e0f32b31..28f9ba3422 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 2022.12.10.prometheus_405.snap_7033" + signature = "rusEFI 2022.12.10.prometheus_405.snap_12395" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.prometheus_405.snap_7033" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.prometheus_405.snap_12395" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:21 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 8551515fe8..06df8e8c92 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 2022.12.10.prometheus_469.snap_7033" + signature = "rusEFI 2022.12.10.prometheus_469.snap_12395" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.prometheus_469.snap_7033" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.prometheus_469.snap_12395" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:20 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 726cdbfe0b..de16bd59f6 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 2022.12.10.proteus_f4.snap_1513" + signature = "rusEFI 2022.12.10.proteus_f4.snap_12027" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.proteus_f4.snap_1513" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.proteus_f4.snap_12027" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:24 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 7c2e689a47..2d4a2f20da 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 2022.12.10.proteus_f7.snap_1513" + signature = "rusEFI 2022.12.10.proteus_f7.snap_12027" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.proteus_f7.snap_1513" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.proteus_f7.snap_12027" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:22 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 6bce24fd8b..c6cb55b02b 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.proteus_h7.snap_1513" + signature = "rusEFI 2022.12.10.proteus_h7.snap_12027" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.proteus_h7.snap_1513" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.proteus_h7.snap_12027" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:25 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index bab8e0e08c..e36262fa52 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 2022.12.10.subaru_eg33_f7.snap_6981" + signature = "rusEFI 2022.12.10.subaru_eg33_f7.snap_12375" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.subaru_eg33_f7.snap_6981" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.subaru_eg33_f7.snap_12375" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sat Dec 10 03:54:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sat Dec 10 12:39:55 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 182244bba3..91b876101c 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.10.tdg-pdm8.snap_3275" + signature = "rusEFI 2022.12.10.tdg-pdm8.snap_10201" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.10.tdg-pdm8.snap_3275" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.10.tdg-pdm8.snap_10201" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:29 UTC 2022 pageSize = 22800 page = 1 @@ -2089,7 +2089,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 loggerDef = compositeLogger, "Trigger Logger", composite startCommand = "l\x01" stopCommand = "l\x02" - dataReadCommand = "L" + dataReadCommand = "l\x03" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } continuousRead = true @@ -2109,6 +2109,21 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ; it seems that TS also needs to know the diff.size of a tooth calcField = toothTime, "ToothTime", "ms", { time - pastValue(time, 1) } + loggerDef = triggerScope, "Trigger Oscilloscope", csv + startCommand = "l\x04" + stopCommand = "l\x05" + dataReadCommand = "l\x06" + dataReadTimeout = 1000 + dataReadyCondition = { triggerScopeReady } + continuousRead = true + + recordDef = 0, 0, 4 + recordField = lowBits1, "low", 0, 8, 1, "" , hidden + recordField = highBits1, "high", 8, 8, 1, "" , hidden + calcField = channel1, "Channel 1", "v", { 6.6 / 4096 * ( lowBits1 * 256 + highBits1 ) } + recordField = lowBits2, "low2", 16, 8, 1, "" , hidden + recordField = highBits2, "high2", 24, 8, 1, "" , hidden + calcField = channel2, "Channel 2", "v", { 6.6 / 4096 * ( lowBits2 * 256 + highBits2 ) } [VeAnalyze] @@ -2156,7 +2171,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 sd_present = bits, U32, 0, [0:0] sd_logging_internal = bits, U32, 0, [1:1] -unusedb4 = bits, U32, 0, [2:2] +triggerScopeReady = bits, U32, 0, [2:2] unusedb5 = bits, U32, 0, [3:3] isFanOn = bits, U32, 0, [4:4] isO2HeaterOn = bits, U32, 0, [5:5] @@ -4197,6 +4212,7 @@ gaugeCategory = GPPWM Outputs entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" +entry = triggerScopeReady, "triggerScopeReady", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java index 0a92bf747d..f35b00d6f6 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sun Dec 04 18:18:32 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Dec 10 12:39:52 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -355,6 +355,7 @@ public class AcControl { public static final char TS_COMMAND_F = 'F'; public static final int TS_COMPOSITE_DISABLE = 2; public static final int TS_COMPOSITE_ENABLE = 1; + public static final int TS_COMPOSITE_READ = 3; public static final char TS_CRC_CHECK_COMMAND = 'k'; public static final char TS_EXECUTE = 'E'; public static final int TS_FILE_VERSION = 20210312; @@ -362,7 +363,6 @@ public class AcControl { public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; public static final char TS_GET_CONFIG_ERROR = 'e'; public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_LOGGER_GET_BUFFER = 'L'; public static final char TS_GET_OUTPUTS_SIZE = '4'; public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; @@ -388,6 +388,9 @@ public class AcControl { public static final char TS_SET_LOGGER_SWITCH = 'l'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; + public static final int TS_TRIGGER_SCOPE_DISABLE = 5; + public static final int TS_TRIGGER_SCOPE_ENABLE = 4; + public static final int TS_TRIGGER_SCOPE_READ = 6; public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; public static final int VEHICLE_INFO_SIZE = 32; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java index f9e34ee6bd..94cc236e6a 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Sun Dec 04 18:18:32 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Sat Dec 10 12:39:52 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -355,6 +355,7 @@ public class BoostControl { public static final char TS_COMMAND_F = 'F'; public static final int TS_COMPOSITE_DISABLE = 2; public static final int TS_COMPOSITE_ENABLE = 1; + public static final int TS_COMPOSITE_READ = 3; public static final char TS_CRC_CHECK_COMMAND = 'k'; public static final char TS_EXECUTE = 'E'; public static final int TS_FILE_VERSION = 20210312; @@ -362,7 +363,6 @@ public class BoostControl { public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; public static final char TS_GET_CONFIG_ERROR = 'e'; public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_LOGGER_GET_BUFFER = 'L'; public static final char TS_GET_OUTPUTS_SIZE = '4'; public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; @@ -388,6 +388,9 @@ public class BoostControl { public static final char TS_SET_LOGGER_SWITCH = 'l'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; + public static final int TS_TRIGGER_SCOPE_DISABLE = 5; + public static final int TS_TRIGGER_SCOPE_ENABLE = 4; + public static final int TS_TRIGGER_SCOPE_READ = 6; public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; public static final int VEHICLE_INFO_SIZE = 32; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index 5fd6f52710..b420c1e805 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sun Dec 04 18:18:32 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sat Dec 10 12:39:52 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -355,6 +355,7 @@ public class EngineState { public static final char TS_COMMAND_F = 'F'; public static final int TS_COMPOSITE_DISABLE = 2; public static final int TS_COMPOSITE_ENABLE = 1; + public static final int TS_COMPOSITE_READ = 3; public static final char TS_CRC_CHECK_COMMAND = 'k'; public static final char TS_EXECUTE = 'E'; public static final int TS_FILE_VERSION = 20210312; @@ -362,7 +363,6 @@ public class EngineState { public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; public static final char TS_GET_CONFIG_ERROR = 'e'; public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_LOGGER_GET_BUFFER = 'L'; public static final char TS_GET_OUTPUTS_SIZE = '4'; public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; @@ -388,6 +388,9 @@ public class EngineState { public static final char TS_SET_LOGGER_SWITCH = 'l'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; + public static final int TS_TRIGGER_SCOPE_DISABLE = 5; + public static final int TS_TRIGGER_SCOPE_ENABLE = 4; + public static final int TS_TRIGGER_SCOPE_READ = 6; public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; public static final int VEHICLE_INFO_SIZE = 32; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index a1b7e362bc..358dbf6f8c 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 03:55:29 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 10 12:40:33 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1151,6 +1151,7 @@ public class Fields { public static final char TS_COMMAND_F = 'F'; public static final int TS_COMPOSITE_DISABLE = 2; public static final int TS_COMPOSITE_ENABLE = 1; + public static final int TS_COMPOSITE_READ = 3; public static final char TS_CRC_CHECK_COMMAND = 'k'; public static final char TS_EXECUTE = 'E'; public static final int TS_FILE_VERSION = 20210312; @@ -1158,7 +1159,6 @@ public class Fields { public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; public static final char TS_GET_CONFIG_ERROR = 'e'; public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_LOGGER_GET_BUFFER = 'L'; public static final char TS_GET_OUTPUTS_SIZE = '4'; public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; @@ -1182,10 +1182,13 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.12.10.all.snap_49823"; + public static final String TS_SIGNATURE = "rusEFI 2022.12.10.all.snap_59789"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TS_TOTAL_OUTPUT_SIZE = 1276; + public static final int TS_TRIGGER_SCOPE_DISABLE = 5; + public static final int TS_TRIGGER_SCOPE_ENABLE = 4; + public static final int TS_TRIGGER_SCOPE_READ = 6; public static final int TsCalMode_EtbKd = 5; public static final int TsCalMode_EtbKi = 4; public static final int TsCalMode_EtbKp = 3; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java index 4736a8cdd1..7b4097052c 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sun Dec 04 18:18:32 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Dec 10 12:39:52 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -355,6 +355,7 @@ public class FuelComputer { public static final char TS_COMMAND_F = 'F'; public static final int TS_COMPOSITE_DISABLE = 2; public static final int TS_COMPOSITE_ENABLE = 1; + public static final int TS_COMPOSITE_READ = 3; public static final char TS_CRC_CHECK_COMMAND = 'k'; public static final char TS_EXECUTE = 'E'; public static final int TS_FILE_VERSION = 20210312; @@ -362,7 +363,6 @@ public class FuelComputer { public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; public static final char TS_GET_CONFIG_ERROR = 'e'; public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_LOGGER_GET_BUFFER = 'L'; public static final char TS_GET_OUTPUTS_SIZE = '4'; public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; @@ -388,6 +388,9 @@ public class FuelComputer { public static final char TS_SET_LOGGER_SWITCH = 'l'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; + public static final int TS_TRIGGER_SCOPE_DISABLE = 5; + public static final int TS_TRIGGER_SCOPE_ENABLE = 4; + public static final int TS_TRIGGER_SCOPE_READ = 6; public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; public static final int VEHICLE_INFO_SIZE = 32; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index 52b6e000d0..e7574dee8d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Sun Dec 04 18:18:32 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Sat Dec 10 12:39:52 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -355,6 +355,7 @@ public class TriggerState { public static final char TS_COMMAND_F = 'F'; public static final int TS_COMPOSITE_DISABLE = 2; public static final int TS_COMPOSITE_ENABLE = 1; + public static final int TS_COMPOSITE_READ = 3; public static final char TS_CRC_CHECK_COMMAND = 'k'; public static final char TS_EXECUTE = 'E'; public static final int TS_FILE_VERSION = 20210312; @@ -362,7 +363,6 @@ public class TriggerState { public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; public static final char TS_GET_CONFIG_ERROR = 'e'; public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_LOGGER_GET_BUFFER = 'L'; public static final char TS_GET_OUTPUTS_SIZE = '4'; public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; @@ -388,6 +388,9 @@ public class TriggerState { public static final char TS_SET_LOGGER_SWITCH = 'l'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; + public static final int TS_TRIGGER_SCOPE_DISABLE = 5; + public static final int TS_TRIGGER_SCOPE_ENABLE = 4; + public static final int TS_TRIGGER_SCOPE_READ = 6; public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; public static final int VEHICLE_INFO_SIZE = 32; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java index 9f80b0c2db..fab21f34c5 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Sun Dec 04 18:18:32 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Sat Dec 10 12:39:52 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -355,6 +355,7 @@ public class TriggerStatePrimary { public static final char TS_COMMAND_F = 'F'; public static final int TS_COMPOSITE_DISABLE = 2; public static final int TS_COMPOSITE_ENABLE = 1; + public static final int TS_COMPOSITE_READ = 3; public static final char TS_CRC_CHECK_COMMAND = 'k'; public static final char TS_EXECUTE = 'E'; public static final int TS_FILE_VERSION = 20210312; @@ -362,7 +363,6 @@ public class TriggerStatePrimary { public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; public static final char TS_GET_CONFIG_ERROR = 'e'; public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_LOGGER_GET_BUFFER = 'L'; public static final char TS_GET_OUTPUTS_SIZE = '4'; public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; @@ -388,6 +388,9 @@ public class TriggerStatePrimary { public static final char TS_SET_LOGGER_SWITCH = 'l'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; + public static final int TS_TRIGGER_SCOPE_DISABLE = 5; + public static final int TS_TRIGGER_SCOPE_ENABLE = 4; + public static final int TS_TRIGGER_SCOPE_READ = 6; public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; public static final int VEHICLE_INFO_SIZE = 32; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index e787902549..42e3b21918 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Dec 04 18:18:31 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Dec 10 12:39:51 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -355,6 +355,7 @@ public class TsOutputs { public static final char TS_COMMAND_F = 'F'; public static final int TS_COMPOSITE_DISABLE = 2; public static final int TS_COMPOSITE_ENABLE = 1; + public static final int TS_COMPOSITE_READ = 3; public static final char TS_CRC_CHECK_COMMAND = 'k'; public static final char TS_EXECUTE = 'E'; public static final int TS_FILE_VERSION = 20210312; @@ -362,7 +363,6 @@ public class TsOutputs { public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; public static final char TS_GET_CONFIG_ERROR = 'e'; public static final char TS_GET_FIRMWARE_VERSION = 'V'; - public static final char TS_GET_LOGGER_GET_BUFFER = 'L'; public static final char TS_GET_OUTPUTS_SIZE = '4'; public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; public static final char TS_GET_SCATTERED_GET_COMMAND = '9'; @@ -388,6 +388,9 @@ public class TsOutputs { public static final char TS_SET_LOGGER_SWITCH = 'l'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; + public static final int TS_TRIGGER_SCOPE_DISABLE = 5; + public static final int TS_TRIGGER_SCOPE_ENABLE = 4; + public static final int TS_TRIGGER_SCOPE_READ = 6; public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int VE_BLEND_COUNT = 4; public static final int VEHICLE_INFO_SIZE = 32; @@ -397,6 +400,7 @@ public class TsOutputs { public static final int WWAE_TABLE_SIZE = 8; public static final Field SD_PRESENT = Field.create("SD_PRESENT", 0, FieldType.BIT, 0).setBaseOffset(0); public static final Field SD_LOGGING_INTERNAL = Field.create("SD_LOGGING_INTERNAL", 0, FieldType.BIT, 1).setBaseOffset(0); + public static final Field TRIGGERSCOPEREADY = Field.create("TRIGGERSCOPEREADY", 0, FieldType.BIT, 2).setBaseOffset(0); public static final Field ISFANON = Field.create("ISFANON", 0, FieldType.BIT, 4).setBaseOffset(0); public static final Field ISO2HEATERON = Field.create("ISO2HEATERON", 0, FieldType.BIT, 5).setBaseOffset(0); public static final Field CHECKENGINE = Field.create("CHECKENGINE", 0, FieldType.BIT, 6).setBaseOffset(0); @@ -859,6 +863,7 @@ public class TsOutputs { public static final Field[] VALUES = { SD_PRESENT, SD_LOGGING_INTERNAL, + TRIGGERSCOPEREADY, ISFANON, ISO2HEATERON, CHECKENGINE,