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 96c740098e..8896d2f689 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1084,7 +1084,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2781474276 +#define SIGNATURE_HASH 2349525659 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #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 @@ -1375,12 +1375,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.07.26.cypress.2781474276" +#define TS_SIGNATURE "rusEFI master.2023.07.26.cypress.2349525659" #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 1392 +#define TS_TOTAL_OUTPUT_SIZE 1400 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 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 7e47a4ca2c..b4879cc9ed 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1084,7 +1084,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3441315624 +#define SIGNATURE_HASH 3839707223 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #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 @@ -1375,12 +1375,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.07.26.kin.3441315624" +#define TS_SIGNATURE "rusEFI master.2023.07.26.kin.3839707223" #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 1392 +#define TS_TOTAL_OUTPUT_SIZE 1400 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 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 0bf04070c3..77c341a0af 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 @@ -1031,7 +1031,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2722376435 +#define SIGNATURE_HASH 2340892044 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #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 @@ -1322,12 +1322,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.07.26.subaru_eg33_f7.2722376435" +#define TS_SIGNATURE "rusEFI master.2023.07.26.subaru_eg33_f7.2340892044" #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 1392 +#define TS_TOTAL_OUTPUT_SIZE 1400 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index a9b277cdb7..1548585445 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -577,3 +577,6 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 0314bb1d59..b159c29321 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -390,3 +390,12 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + diff --git a/firmware/console/binary/generated/fancy_menu.ini b/firmware/console/binary/generated/fancy_menu.ini index 41fe6be91e..307603d198 100644 --- a/firmware/console/binary/generated/fancy_menu.ini +++ b/firmware/console/binary/generated/fancy_menu.ini @@ -23,3 +23,4 @@ subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" diff --git a/firmware/console/binary/generated/live_data_fragments.h b/firmware/console/binary/generated/live_data_fragments.h index de2a82bcac..fdac78d336 100644 --- a/firmware/console/binary/generated/live_data_fragments.h +++ b/firmware/console/binary/generated/live_data_fragments.h @@ -32,3 +32,4 @@ decl_frag{}, // wb1 decl_frag{}, decl_frag{}, decl_frag{}, +decl_frag{}, diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index 0a7a9b2c07..ba92f8ff88 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -28,6 +28,7 @@ LDS_wideband_state, LDS_dc_motors, LDS_sent_state, LDS_vvt, +LDS_lambda_monitor, } live_data_e; #define OUTPUT_CHANNELS_BASE_ADDRESS 0 #define FUEL_COMPUTER_BASE_ADDRESS 824 @@ -55,3 +56,4 @@ LDS_vvt, #define DC_MOTORS_BASE_ADDRESS 1368 #define SENT_STATE_BASE_ADDRESS 1380 #define VVT_BASE_ADDRESS 1388 +#define LAMBDA_MONITOR_BASE_ADDRESS 1392 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index e250dc7dff..9980e9fe55 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -763,3 +763,7 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 2b729566ca..5252015d21 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -549,3 +549,5 @@ errorRate("ETB: SENT error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1 vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1388, 0.1, -90.0, 90.0, "deg"), vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1390, 0.5, 100.0, 1.0, "%"), alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1391, 1.0, -20.0, 100.0, "units"), +lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1396, 0.01, 0.0, 1.0, "sec"), +alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1398, 1.0, -20.0, 100.0, "units"), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index a7a0810a63..7e021143fb 100644 --- a/firmware/console/binary/generated/total_live_data_generated.h +++ b/firmware/console/binary/generated/total_live_data_generated.h @@ -1,2 +1,2 @@ // generated by gen_live_documentation.sh / LiveDataProcessor.java -#define TS_TOTAL_OUTPUT_SIZE 1392 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1400 \ No newline at end of file diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index ecd9758bca..5554290837 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -417,4 +417,5 @@ static constexpr LogField fields[] = { #endif {engine->dc_motors.dcOutput0, "DC: output0", "per", 2, "ETB more"}, {engine->dc_motors.isEnabled0_int, "DC: en0", "per", 2, "ETB more"}, + {___engine.lambdaMonitor.lambdaTimeSinceGood, "lambdaTimeSinceGood", "sec", 2}, }; diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 3f5313cabf..ff60bfd97d 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1084,7 +1084,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 114393055 +#define SIGNATURE_HASH 789739680 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #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 @@ -1375,12 +1375,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.07.26.f407-discovery.114393055" +#define TS_SIGNATURE "rusEFI master.2023.07.26.f407-discovery.789739680" #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 1392 +#define TS_TOTAL_OUTPUT_SIZE 1400 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 712108927a..1e20f93a5e 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3776144734 -#define TS_SIGNATURE "rusEFI master.2023.07.26.48way.3776144734" +#define SIGNATURE_HASH 3369099809 +#define TS_SIGNATURE "rusEFI master.2023.07.26.48way.3369099809" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 92cfa17a66..131e0d60d0 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3713565153 -#define TS_SIGNATURE "rusEFI master.2023.07.26.alphax-2chan.3713565153" +#define SIGNATURE_HASH 4103833246 +#define TS_SIGNATURE "rusEFI master.2023.07.26.alphax-2chan.4103833246" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index b22da2a634..ade718a516 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4131477132 -#define TS_SIGNATURE "rusEFI master.2023.07.26.alphax-4chan.4131477132" +#define SIGNATURE_HASH 3749859827 +#define TS_SIGNATURE "rusEFI master.2023.07.26.alphax-4chan.3749859827" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 04b43f21c4..e46c4686dd 100644 --- a/firmware/controllers/generated/signature_alphax-4chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-4chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4131477132 -#define TS_SIGNATURE "rusEFI master.2023.07.26.alphax-4chan_f7.4131477132" +#define SIGNATURE_HASH 3749859827 +#define TS_SIGNATURE "rusEFI master.2023.07.26.alphax-4chan_f7.3749859827" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index e9f08ed480..ca8b90fd86 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1135830957 -#define TS_SIGNATURE "rusEFI master.2023.07.26.alphax-8chan.1135830957" +#define SIGNATURE_HASH 1785749714 +#define TS_SIGNATURE "rusEFI master.2023.07.26.alphax-8chan.1785749714" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index 3c18c64a4b..3c56469402 100644 --- a/firmware/controllers/generated/signature_alphax-8chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-8chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1135830957 -#define TS_SIGNATURE "rusEFI master.2023.07.26.alphax-8chan_f7.1135830957" +#define SIGNATURE_HASH 1785749714 +#define TS_SIGNATURE "rusEFI master.2023.07.26.alphax-8chan_f7.1785749714" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index c7ecf45437..1f1725441b 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3103987907 -#define TS_SIGNATURE "rusEFI master.2023.07.26.atlas.3103987907" +#define SIGNATURE_HASH 2428510140 +#define TS_SIGNATURE "rusEFI master.2023.07.26.atlas.2428510140" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 29543253c2..752a6a0c1a 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2649677906 -#define TS_SIGNATURE "rusEFI master.2023.07.26.core8.2649677906" +#define SIGNATURE_HASH 3022907181 +#define TS_SIGNATURE "rusEFI master.2023.07.26.core8.3022907181" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index fecd01eda5..eeaa2971b9 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 config_definition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 2781474276 -#define TS_SIGNATURE "rusEFI master.2023.07.26.cypress.2781474276" +#define SIGNATURE_HASH 2349525659 +#define TS_SIGNATURE "rusEFI master.2023.07.26.cypress.2349525659" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index b1bb8b876d..574be1a6d4 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 114393055 -#define TS_SIGNATURE "rusEFI master.2023.07.26.f407-discovery.114393055" +#define SIGNATURE_HASH 789739680 +#define TS_SIGNATURE "rusEFI master.2023.07.26.f407-discovery.789739680" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 3c9d54081a..ea4edb9c95 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2781474276 -#define TS_SIGNATURE "rusEFI master.2023.07.26.f429-discovery.2781474276" +#define SIGNATURE_HASH 2349525659 +#define TS_SIGNATURE "rusEFI master.2023.07.26.f429-discovery.2349525659" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index b8e7dd2700..6fd168bef5 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2275085614 -#define TS_SIGNATURE "rusEFI master.2023.07.26.frankenso_na6.2275085614" +#define SIGNATURE_HASH 2925005393 +#define TS_SIGNATURE "rusEFI master.2023.07.26.frankenso_na6.2925005393" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 5627cd6255..141a5ddd98 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1711300030 -#define TS_SIGNATURE "rusEFI master.2023.07.26.harley81.1711300030" +#define SIGNATURE_HASH 1338202817 +#define TS_SIGNATURE "rusEFI master.2023.07.26.harley81.1338202817" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 48c15f3149..8b0c1693fb 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 356211476 -#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen-gm-e67.356211476" +#define SIGNATURE_HASH 1022909547 +#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen-gm-e67.1022909547" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index d11eb31d70..e268602ace 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1501418102 -#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen-honda-k.1501418102" +#define SIGNATURE_HASH 1891554569 +#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen-honda-k.1891554569" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 0df65ca6ba..ab50de475c 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2555376514 -#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen-nb1.2555376514" +#define SIGNATURE_HASH 2978804989 +#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen-nb1.2978804989" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index b39a22701d..3697f09843 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 732766576 -#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen121nissan.732766576" +#define SIGNATURE_HASH 40773135 +#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen121nissan.40773135" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 578d87ab09..a457cbd5f8 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 834138663 -#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen121vag.834138663" +#define SIGNATURE_HASH 410318168 +#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen121vag.410318168" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index f28c8dfb38..ef395ffe85 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1780181646 -#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen128.1780181646" +#define SIGNATURE_HASH 1138257393 +#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen128.1138257393" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 578e2f2579..0d04736272 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3430938504 -#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen154hyundai.3430938504" +#define SIGNATURE_HASH 3854364919 +#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen154hyundai.3854364919" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index d4fcba1daa..fd95eb19fd 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3381521353 -#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen72.3381521353" +#define SIGNATURE_HASH 3763268790 +#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen72.3763268790" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 70e389becb..9e2adff233 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1385785609 -#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen81.1385785609" +#define SIGNATURE_HASH 2069524086 +#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen81.2069524086" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index b3173dd350..4d8f064c7f 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 897119869 -#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen88bmw.897119869" +#define SIGNATURE_HASH 482078978 +#define TS_SIGNATURE "rusEFI master.2023.07.26.hellen88bmw.482078978" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 38de524179..4eab6a3425 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1321497024 -#define TS_SIGNATURE "rusEFI master.2023.07.26.hellenNA6.1321497024" +#define SIGNATURE_HASH 1728542399 +#define TS_SIGNATURE "rusEFI master.2023.07.26.hellenNA6.1728542399" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 3eca0a95b0..19a7eff7b3 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4162839245 -#define TS_SIGNATURE "rusEFI master.2023.07.26.hellenNA8_96.4162839245" +#define SIGNATURE_HASH 3520914866 +#define TS_SIGNATURE "rusEFI master.2023.07.26.hellenNA8_96.3520914866" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index e0c9039d1a..c4490acf66 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 config_definition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 3441315624 -#define TS_SIGNATURE "rusEFI master.2023.07.26.kin.3441315624" +#define SIGNATURE_HASH 3839707223 +#define TS_SIGNATURE "rusEFI master.2023.07.26.kin.3839707223" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 0e85417dfc..d5dc6edd19 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3220369898 -#define TS_SIGNATURE "rusEFI master.2023.07.26.m74_9.3220369898" +#define SIGNATURE_HASH 2519856789 +#define TS_SIGNATURE "rusEFI master.2023.07.26.m74_9.2519856789" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 312706d7cc..883a5102d9 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2604502883 -#define TS_SIGNATURE "rusEFI master.2023.07.26.mre_f4.2604502883" +#define SIGNATURE_HASH 3003025436 +#define TS_SIGNATURE "rusEFI master.2023.07.26.mre_f4.3003025436" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index f4ba6600e3..7e9dc273d2 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2604502883 -#define TS_SIGNATURE "rusEFI master.2023.07.26.mre_f7.2604502883" +#define SIGNATURE_HASH 3003025436 +#define TS_SIGNATURE "rusEFI master.2023.07.26.mre_f7.3003025436" diff --git a/firmware/controllers/generated/signature_nucleo_f429.h b/firmware/controllers/generated/signature_nucleo_f429.h index 4e69641862..6751164e95 100644 --- a/firmware/controllers/generated/signature_nucleo_f429.h +++ b/firmware/controllers/generated/signature_nucleo_f429.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2781474276 -#define TS_SIGNATURE "rusEFI master.2023.07.26.nucleo_f429.2781474276" +#define SIGNATURE_HASH 2349525659 +#define TS_SIGNATURE "rusEFI master.2023.07.26.nucleo_f429.2349525659" diff --git a/firmware/controllers/generated/signature_nucleo_f767.h b/firmware/controllers/generated/signature_nucleo_f767.h index b3d704a7fb..0f32dd7d9c 100644 --- a/firmware/controllers/generated/signature_nucleo_f767.h +++ b/firmware/controllers/generated/signature_nucleo_f767.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2781474276 -#define TS_SIGNATURE "rusEFI master.2023.07.26.nucleo_f767.2781474276" +#define SIGNATURE_HASH 2349525659 +#define TS_SIGNATURE "rusEFI master.2023.07.26.nucleo_f767.2349525659" diff --git a/firmware/controllers/generated/signature_nucleo_h743.h b/firmware/controllers/generated/signature_nucleo_h743.h index 2a096a5097..5fe338ca17 100644 --- a/firmware/controllers/generated/signature_nucleo_h743.h +++ b/firmware/controllers/generated/signature_nucleo_h743.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2781474276 -#define TS_SIGNATURE "rusEFI master.2023.07.26.nucleo_h743.2781474276" +#define SIGNATURE_HASH 2349525659 +#define TS_SIGNATURE "rusEFI master.2023.07.26.nucleo_h743.2349525659" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index b01ba8398e..3b9b4397b6 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2505908340 -#define TS_SIGNATURE "rusEFI master.2023.07.26.prometheus_405.2505908340" +#define SIGNATURE_HASH 3164481291 +#define TS_SIGNATURE "rusEFI master.2023.07.26.prometheus_405.3164481291" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index f4d6a4ba3f..b4f975a400 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2505908340 -#define TS_SIGNATURE "rusEFI master.2023.07.26.prometheus_469.2505908340" +#define SIGNATURE_HASH 3164481291 +#define TS_SIGNATURE "rusEFI master.2023.07.26.prometheus_469.3164481291" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 892bd4a428..b2017c169c 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2664436136 -#define TS_SIGNATURE "rusEFI master.2023.07.26.proteus_f4.2664436136" +#define SIGNATURE_HASH 3071481559 +#define TS_SIGNATURE "rusEFI master.2023.07.26.proteus_f4.3071481559" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index ef421cf2b1..c237fa9520 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2664436136 -#define TS_SIGNATURE "rusEFI master.2023.07.26.proteus_f7.2664436136" +#define SIGNATURE_HASH 3071481559 +#define TS_SIGNATURE "rusEFI master.2023.07.26.proteus_f7.3071481559" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index eb775bca7e..5b95989340 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2664436136 -#define TS_SIGNATURE "rusEFI master.2023.07.26.proteus_h7.2664436136" +#define SIGNATURE_HASH 3071481559 +#define TS_SIGNATURE "rusEFI master.2023.07.26.proteus_h7.3071481559" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 4ccf53a295..b86be1150f 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3247573176 -#define TS_SIGNATURE "rusEFI master.2023.07.26.s105.3247573176" +#define SIGNATURE_HASH 3897626567 +#define TS_SIGNATURE "rusEFI master.2023.07.26.s105.3897626567" diff --git a/firmware/controllers/generated/signature_small-can.h b/firmware/controllers/generated/signature_small-can.h index ff742a3a09..3d629ce62a 100644 --- a/firmware/controllers/generated/signature_small-can.h +++ b/firmware/controllers/generated/signature_small-can.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1331200448 -#define TS_SIGNATURE "rusEFI master.2023.07.26.small-can.1331200448" +#define SIGNATURE_HASH 1721468607 +#define TS_SIGNATURE "rusEFI master.2023.07.26.small-can.1721468607" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 6ac0c92e73..2106c8c7c6 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 config_definition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2722376435 -#define TS_SIGNATURE "rusEFI master.2023.07.26.subaru_eg33_f7.2722376435" +#define SIGNATURE_HASH 2340892044 +#define TS_SIGNATURE "rusEFI master.2023.07.26.subaru_eg33_f7.2340892044" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index dd750477b0..87e6bfcb73 100644 --- a/firmware/controllers/generated/signature_t-b-g.h +++ b/firmware/controllers/generated/signature_t-b-g.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2781474276 -#define TS_SIGNATURE "rusEFI master.2023.07.26.t-b-g.2781474276" +#define SIGNATURE_HASH 2349525659 +#define TS_SIGNATURE "rusEFI master.2023.07.26.t-b-g.2349525659" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 0c4823d332..d74abf6da0 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 795328966 -#define TS_SIGNATURE "rusEFI master.2023.07.26.tdg-pdm8.795328966" +#define SIGNATURE_HASH 111462073 +#define TS_SIGNATURE "rusEFI master.2023.07.26.tdg-pdm8.111462073" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 3a3530c5d9..67d3e0e056 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -1080,6 +1080,15 @@ float getOutputValueByName(const char *name) { // isEnabled0 case 1691876092: return engine->dc_motors.isEnabled0; +// lambdaCurrentlyGood + case 350535927: + return ___engine.lambdaMonitor.lambdaCurrentlyGood; +// lambdaMonitorCut + case 1849938842: + return ___engine.lambdaMonitor.lambdaMonitorCut; +// lambdaTimeSinceGood + case 481450608: + return ___engine.lambdaMonitor.lambdaTimeSinceGood; } return EFI_ERROR_CODE; } diff --git a/firmware/controllers/math/lambda_monitor_generated.h b/firmware/controllers/math/lambda_monitor_generated.h new file mode 100644 index 0000000000..962532ee95 --- /dev/null +++ b/firmware/controllers/math/lambda_monitor_generated.h @@ -0,0 +1,119 @@ +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/math/lambda_monitor.txt Wed Jul 26 13:01:56 UTC 2023 +// by class com.rusefi.output.CHeaderConsumer +// begin +#pragma once +#include "rusefi_types.h" +// start of lambda_monitor_s +struct lambda_monitor_s { + /** + offset 0 bit 0 */ + bool lambdaCurrentlyGood : 1 {}; + /** + offset 0 bit 1 */ + bool lambdaMonitorCut : 1 {}; + /** + offset 0 bit 2 */ + bool unusedBit_2_2 : 1 {}; + /** + offset 0 bit 3 */ + bool unusedBit_2_3 : 1 {}; + /** + offset 0 bit 4 */ + bool unusedBit_2_4 : 1 {}; + /** + offset 0 bit 5 */ + bool unusedBit_2_5 : 1 {}; + /** + offset 0 bit 6 */ + bool unusedBit_2_6 : 1 {}; + /** + offset 0 bit 7 */ + bool unusedBit_2_7 : 1 {}; + /** + offset 0 bit 8 */ + bool unusedBit_2_8 : 1 {}; + /** + offset 0 bit 9 */ + bool unusedBit_2_9 : 1 {}; + /** + offset 0 bit 10 */ + bool unusedBit_2_10 : 1 {}; + /** + offset 0 bit 11 */ + bool unusedBit_2_11 : 1 {}; + /** + offset 0 bit 12 */ + bool unusedBit_2_12 : 1 {}; + /** + offset 0 bit 13 */ + bool unusedBit_2_13 : 1 {}; + /** + offset 0 bit 14 */ + bool unusedBit_2_14 : 1 {}; + /** + offset 0 bit 15 */ + bool unusedBit_2_15 : 1 {}; + /** + offset 0 bit 16 */ + bool unusedBit_2_16 : 1 {}; + /** + offset 0 bit 17 */ + bool unusedBit_2_17 : 1 {}; + /** + offset 0 bit 18 */ + bool unusedBit_2_18 : 1 {}; + /** + offset 0 bit 19 */ + bool unusedBit_2_19 : 1 {}; + /** + offset 0 bit 20 */ + bool unusedBit_2_20 : 1 {}; + /** + offset 0 bit 21 */ + bool unusedBit_2_21 : 1 {}; + /** + offset 0 bit 22 */ + bool unusedBit_2_22 : 1 {}; + /** + offset 0 bit 23 */ + bool unusedBit_2_23 : 1 {}; + /** + offset 0 bit 24 */ + bool unusedBit_2_24 : 1 {}; + /** + offset 0 bit 25 */ + bool unusedBit_2_25 : 1 {}; + /** + offset 0 bit 26 */ + bool unusedBit_2_26 : 1 {}; + /** + offset 0 bit 27 */ + bool unusedBit_2_27 : 1 {}; + /** + offset 0 bit 28 */ + bool unusedBit_2_28 : 1 {}; + /** + offset 0 bit 29 */ + bool unusedBit_2_29 : 1 {}; + /** + offset 0 bit 30 */ + bool unusedBit_2_30 : 1 {}; + /** + offset 0 bit 31 */ + bool unusedBit_2_31 : 1 {}; + /** + sec + * offset 4 + */ + scaled_channel lambdaTimeSinceGood = (uint16_t)0; + /** + * need 4 byte alignment + units + * offset 6 + */ + uint8_t alignmentFill_at_6[2]; +}; +static_assert(sizeof(lambda_monitor_s) == 8); + +// end +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/math/lambda_monitor.txt Wed Jul 26 13:01:56 UTC 2023 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index dddae6c58a..1d45dd4a77 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.f407-discovery.114393055" + signature = "rusEFI master.2023.07.26.f407-discovery.789739680" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.f407-discovery.114393055" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.f407-discovery.789739680" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:57:07 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:38 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5520,6 +5527,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6075,6 +6083,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 9fcad0bbe6..28c3b6c67f 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.48way.3776144734" + signature = "rusEFI master.2023.07.26.48way.3369099809" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.48way.3776144734" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.48way.3369099809" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Battery Reference Input (A0)","TPS Reference Input (A1)","CLT Reference Input (A2)","IAT Reference Input (A3)","O2 Reference Input (A4)","INVALID","INVALID","INVALID","MAP Pressure Reference Input (B0)","BARO Pressure Reference Input (B1)","INVALID","INVALID","INVALID","INVALID","Fuel Pressure Reference Input (C4)","Oil Pressure Reference Input (C5)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:24 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:58 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5520,6 +5527,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6075,6 +6083,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 740672010b..1366244cba 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.alphax-2chan.3713565153" + signature = "rusEFI master.2023.07.26.alphax-2chan.4103833246" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.alphax-2chan.3713565153" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.alphax-2chan.4103833246" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","INVALID","B5 - TPS","A2 Battery Sense","C7 - CAM Hall/Digital","INVALID","INVALID","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:31 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:06 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5516,6 +5523,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6071,6 +6079,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 6feade60ef..d491120862 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.alphax-4chan.4131477132" + signature = "rusEFI master.2023.07.26.alphax-4chan.3749859827" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.alphax-4chan.4131477132" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.alphax-4chan.3749859827" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","INVALID","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","X5 - AIN4","INVALID","INVALID","INVALID","INVALID","D5 - PPS rev G" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:33 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:08 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 5f509f845d..10aae4e11d 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.alphax-4chan_f7.4131477132" + signature = "rusEFI master.2023.07.26.alphax-4chan_f7.3749859827" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.alphax-4chan_f7.4131477132" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.alphax-4chan_f7.3749859827" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","INVALID","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","X5 - AIN4","INVALID","INVALID","INVALID","INVALID","D5 - PPS rev G" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:35 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:11 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index ba176a9013..0675c3bc0a 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.alphax-8chan.1135830957" + signature = "rusEFI master.2023.07.26.alphax-8chan.1785749714" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.alphax-8chan.1135830957" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.alphax-8chan.1785749714" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","17A - PPS","23C - TPS","Battery Sense","INVALID","15D - AN5","24C - TPS2","14A - Analog 1","22A - Analog 22","On-board MAP","16A - CLT","15A - IAT","31C - PPS2","33A - AN3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","16D - AN6","INVALID","INVALID","INVALID","INVALID","7C - AT4","INVALID","6C - AT3","14D - AN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:38 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:13 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index 12339c3c54..5bf10d7442 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.alphax-8chan_f7.1135830957" + signature = "rusEFI master.2023.07.26.alphax-8chan_f7.1785749714" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.alphax-8chan_f7.1135830957" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.alphax-8chan_f7.1785749714" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","17A - PPS","23C - TPS","Battery Sense","INVALID","15D - AN5","24C - TPS2","14A - Analog 1","22A - Analog 22","On-board MAP","16A - CLT","15A - IAT","31C - PPS2","33A - AN3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","16D - AN6","INVALID","INVALID","INVALID","INVALID","7C - AT4","INVALID","6C - AT3","14D - AN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:40 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:15 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index d0ba70c499..a1302bc183 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.atlas.3103987907" + signature = "rusEFI master.2023.07.26.atlas.2428510140" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.atlas.3103987907" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.atlas.2428510140" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:57 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:30 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index c09f9c8a6d..212b25b5c3 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.core8.2649677906" + signature = "rusEFI master.2023.07.26.core8.3022907181" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.core8.2649677906" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.core8.3022907181" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","On-board Battery Sense (A0)","Analog Inputs 1 (A1)","Analog Inputs 2 (A2)","Analog Inputs 3 (A3)","Analog Inputs 4 (A4)","On-board MAP (A5)","Analog Inputs 6 (A6)","Analog Inputs 7 (A7)","On-board BARO (B0)","Analog Inputs 9 (B1)","Analog Inputs 10 (C0)","Primary On-board O2 (C1)","Secondary On-board O2 (C2)","Analog Inputs 13 (C3)","Analog Inputs 14 (C4)","Analog Inputs 15 (C5)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:22 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:56 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5520,6 +5527,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6075,6 +6083,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 66060e5e9d..ab620ded54 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.cypress.2781474276" + signature = "rusEFI master.2023.07.26.cypress.2349525659" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.cypress.2781474276" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.cypress.2349525659" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:27 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:02 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 398bb00bdf..1f6232b551 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.f407-discovery.114393055" + signature = "rusEFI master.2023.07.26.f407-discovery.789739680" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.f407-discovery.114393055" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.f407-discovery.789739680" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:57:02 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:34 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5520,6 +5527,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6075,6 +6083,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index b61fb5dd74..cc794055ba 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.f429-discovery.2781474276" + signature = "rusEFI master.2023.07.26.f429-discovery.2349525659" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.f429-discovery.2781474276" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.f429-discovery.2349525659" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:48 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:21 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index d9192879d1..cbb8500e65 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.frankenso_na6.2275085614" + signature = "rusEFI master.2023.07.26.frankenso_na6.2925005393" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.frankenso_na6.2275085614" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.frankenso_na6.2925005393" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:34 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:07 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 7bbeac35ca..8bd7bcb8d2 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.harley81.1711300030" + signature = "rusEFI master.2023.07.26.harley81.1338202817" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.harley81.1711300030" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.harley81.1338202817" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","27 - TPS 2","INVALID","41 - PPS 1","52 - TPS 1","5 Battery Sense","INVALID","INVALID","42 - PPS 2","INVALID","53 - MAP","55 Engine Temperature","49 CLT","72 IAT","32 Oil Pressure","34 Kickstand Position Sensor" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:43 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:18 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5519,6 +5526,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6074,6 +6082,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 3cf05342f1..abeff0b761 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.hellen-gm-e67.356211476" + signature = "rusEFI master.2023.07.26.hellen-gm-e67.1022909547" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.hellen-gm-e67.356211476" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.hellen-gm-e67.1022909547" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","C2-60 - Oil Pressure","C3-58 - Baro","C1-47 - PPS1","C2-64 - TPS1","C1-19 Battery Sense","C1-45 Secondary Fuel Level","C3-57 - A/C Pressure","C2-66 - TPS2","C1-44 Primary Fuel Level","C2-65 - Trans Fluids","C3-59 - MAP","C3-55 - CLT","C3-56 - IAT","C1-49 - PPS2","C1-46 Vac Sense" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:07 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:41 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5519,6 +5526,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6074,6 +6082,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 542dca7e07..a5359b9a26 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.hellen-honda-k.1501418102" + signature = "rusEFI master.2023.07.26.hellen-honda-k.1891554569" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.hellen-honda-k.1501418102" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.hellen-honda-k.1891554569" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","A15 TPS","E9 Ignition Key Voltage","INVALID","INVALID","INVALID","INVALID","A19 - MAP","INVALID","B8 - CLT","B17 IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:53 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:27 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index a1489dc70b..fe19c7ceb3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.hellen-nb1.2555376514" + signature = "rusEFI master.2023.07.26.hellen-nb1.2978804989" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.hellen-nb1.2555376514" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.hellen-nb1.2978804989" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","1G - Steering/RES2","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:05 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:39 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5519,6 +5526,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6074,6 +6082,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 12348d1124..e429929340 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.hellen121nissan.732766576" + signature = "rusEFI master.2023.07.26.hellen121nissan.40773135" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.hellen121nissan.732766576" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.hellen121nissan.40773135" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","51 - MAF","INVALID","Aux P68","106 - PPS 1","50 - TPS 1","109 Ignition Key Voltage","INVALID","INVALID","69 - TPS 2","INVALID","Aux P66","Aux P67","73 - CLT","34 - IAT","98 - PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:50 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:25 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 72c6931aff..535c755b51 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.hellen121vag.834138663" + signature = "rusEFI master.2023.07.26.hellen121vag.410318168" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.hellen121vag.834138663" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.hellen121vag.410318168" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:48 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:23 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5519,6 +5526,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6074,6 +6082,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 65502de46a..4b469288b8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.hellen128.1780181646" + signature = "rusEFI master.2023.07.26.hellen128.1138257393" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.hellen128.1780181646" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.hellen128.1138257393" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","P36_IN_O2S","P32_IN_O2S2","P40_IN_MAP3","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2","P41_IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:45 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:20 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5519,6 +5526,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6074,6 +6082,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index ea1420458d..01bc4d126e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.hellen154hyundai.3430938504" + signature = "rusEFI master.2023.07.26.hellen154hyundai.3854364919" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.hellen154hyundai.3430938504" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.hellen154hyundai.3854364919" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","K21 Ambient Temperature","K58 Oil Temp","A/C pressure","PPS 1","TPS 1","K2 Ignition Key Voltage","X10 AIN2","INVALID","TPS 2","X11 AIN1","Map Sensor K31","K10 Sensor","CLT","IAT","PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:55 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:30 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index c0fa5c8aaa..d2efdd1acb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.hellen72.3381521353" + signature = "rusEFI master.2023.07.26.hellen72.3763268790" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.hellen72.3381521353" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.hellen72.3763268790" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","5N - TPS2","3L - IGN_7 / AFR","intMAP (A15)","5P - PPS1","4V - TPS (A17)","4S/4T - Alternator voltage","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","3Y - CRANK (A24)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","5M - PPS2 OR TEMPERATURE SENSOR","4AE - EGR/MAP4 (A22)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:00 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:34 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5519,6 +5526,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6074,6 +6082,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index e8d29b4818..097d0ab185 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.hellen81.1385785609" + signature = "rusEFI master.2023.07.26.hellen81.2069524086" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.hellen81.1385785609" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.hellen81.2069524086" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - IN_O2S","55 - IN_O2S2","41 - IN_MAP3","78 - IN_PPS","16 - IN_TPS","13 - IN_VIGN","79 - IN_CAM","77 - IN_AUX4","74 - IN_AUX1","15 - IN_CRANK (A24)","37 - IN_MAP1","38 - IN_MAP2","39 - IN_CLT","40 - IN_IAT","75 - IN_AUX2","76 - IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:03 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:37 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5517,6 +5524,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6072,6 +6080,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 41c945fb70..96e63e662a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.hellen88bmw.897119869" + signature = "rusEFI master.2023.07.26.hellen88bmw.482078978" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.hellen88bmw.897119869" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.hellen88bmw.482078978" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","VIN5","VIN6","INVALID","PPS1","73 - TPS","56 - Battery Sense","17 - CAM","Aux BARO","Aux TPS2","16 - CRANK","41 - MAF","Aux MAP","78 - CLT","77 - IAT","Aux PPS2","Aux TPS3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:58 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:32 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5519,6 +5526,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6074,6 +6082,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 169f554922..c4f9ab07bc 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.hellenNA6.1321497024" + signature = "rusEFI master.2023.07.26.hellenNA6.1728542399" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.hellenNA6.1321497024" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.hellenNA6.1728542399" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","4I - PPS1","TPS Input","1B - Battery Sense","INVALID","4G - PPS2 OR TEMPERATURE SENSOR","4H - TPS2","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:10 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:44 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5519,6 +5526,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6074,6 +6082,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index fa0aeb487f..13eb8deeba 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.hellenNA8_96.4162839245" + signature = "rusEFI master.2023.07.26.hellenNA8_96.3520914866" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.hellenNA8_96.4162839245" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.hellenNA8_96.3520914866" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","PPS1","2F - TPS","3B - Battery Sense","3G - CAM","3S - EGR BOOST IN","2A - Pressure Input","3F - CRANK","2B - MAF","INVALID","2G - Coolant","2B - IAT","4C - IN TEMP/PPS2","1K - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:12 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:46 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5519,6 +5526,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6074,6 +6082,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index d883469464..ef9c29f22f 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.kin.3441315624" + signature = "rusEFI master.2023.07.26.kin.3839707223" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.kin.3441315624" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.kin.3839707223" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:26 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:01 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 103e1dc07a..4eb594c013 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.m74_9.3220369898" + signature = "rusEFI master.2023.07.26.m74_9.2519856789" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.m74_9.3220369898" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.m74_9.2519856789" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:27 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:00 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5519,6 +5526,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6074,6 +6082,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index bc6ef051a1..1a1a4bb1ae 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.mre_f4.2604502883" + signature = "rusEFI master.2023.07.26.mre_f4.3003025436" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.mre_f4.2604502883" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.mre_f4.3003025436" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:19 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:53 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5168,6 +5172,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5521,6 +5528,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6076,6 +6084,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 5f50375aaf..0f43eb88f2 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.mre_f7.2604502883" + signature = "rusEFI master.2023.07.26.mre_f7.3003025436" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.mre_f7.2604502883" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.mre_f7.3003025436" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:17 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:51 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5168,6 +5172,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5521,6 +5528,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6076,6 +6084,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini index b6165509f6..572943fd69 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.nucleo_f429.2781474276" + signature = "rusEFI master.2023.07.26.nucleo_f429.2349525659" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.nucleo_f429.2781474276" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.nucleo_f429.2349525659" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:50 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:23 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini index decf6061e5..717ab7de4a 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.nucleo_f767.2781474276" + signature = "rusEFI master.2023.07.26.nucleo_f767.2349525659" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.nucleo_f767.2781474276" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.nucleo_f767.2349525659" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:53 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:25 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini index 6936383895..feabf4d3aa 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.nucleo_h743.2781474276" + signature = "rusEFI master.2023.07.26.nucleo_h743.2349525659" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.nucleo_h743.2781474276" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.nucleo_h743.2349525659" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:55 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:27 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index d092e2f687..6ee834ba22 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.prometheus_405.2505908340" + signature = "rusEFI master.2023.07.26.prometheus_405.3164481291" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.prometheus_405.2505908340" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.prometheus_405.3164481291" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:38 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:11 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5513,6 +5520,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6068,6 +6076,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 18d32c210d..e441f7b19a 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.prometheus_469.2505908340" + signature = "rusEFI master.2023.07.26.prometheus_469.3164481291" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.prometheus_469.2505908340" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.prometheus_469.3164481291" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:36 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:09 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5513,6 +5520,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6068,6 +6076,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 25fb633001..ca0a5540ee 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.proteus_f4.2664436136" + signature = "rusEFI master.2023.07.26.proteus_f4.3071481559" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.proteus_f4.2664436136" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.proteus_f4.3071481559" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:43 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:16 UTC 2023 pageSize = 27468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5515,6 +5522,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6084,6 +6092,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 8f5b09000e..75aa1c67d4 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.proteus_f7.2664436136" + signature = "rusEFI master.2023.07.26.proteus_f7.3071481559" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.proteus_f7.2664436136" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.proteus_f7.3071481559" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:41 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:14 UTC 2023 pageSize = 27468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5515,6 +5522,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6084,6 +6092,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 6ff84d85fa..11808c33a6 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.proteus_h7.2664436136" + signature = "rusEFI master.2023.07.26.proteus_h7.3071481559" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.proteus_h7.2664436136" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.proteus_h7.3071481559" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:46 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:18 UTC 2023 pageSize = 27468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5515,6 +5522,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6084,6 +6092,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index c5e397205e..37084a9631 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.s105.3247573176" + signature = "rusEFI master.2023.07.26.s105.3897626567" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.s105.3247573176" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.s105.3897626567" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","56 - MAP","16 - TPS","19 - Knock","39 - CLT","INVALID","opt 55 - AFR 2","opt 21 - AC Press","18 - AFR 1","13 - Ignition switch in (15)","44 - +12 sense (MR)","INVALID","na 37 - MAF","INVALID","INVALID","40 - IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:29 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:02 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5519,6 +5526,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6074,6 +6082,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_small-can.ini b/firmware/tunerstudio/generated/rusefi_small-can.ini index 08e8608e1f..1dc618e74e 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.small-can.1331200448" + signature = "rusEFI master.2023.07.26.small-can.1721468607" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.small-can.1331200448" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.small-can.1721468607" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - Analog input","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","INVALID","INVALID","INVALID","B2 - Analog input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:14 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:49 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5517,6 +5524,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6072,6 +6080,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 338639a128..7e5e9a161b 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.subaru_eg33_f7.2722376435" + signature = "rusEFI master.2023.07.26.subaru_eg33_f7.2340892044" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.subaru_eg33_f7.2722376435" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.subaru_eg33_f7.2340892044" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","AUX0_18 - MAP Ain","INVALID","INVALID","B05 - MAF Ain","INVALID","AUX0_19 - IAT Ain","A02 - VBat","INVALID","A06 - Oxyg 2 Ain","A04 - EGR t Ain","INVALID","A18 - AUX0 Ain","B02 - TPS Ain","INVALID","A03 - Coolant t Ain","A06 - Oxyg 1 Ain" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:55:28 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:02:03 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 450064f177..767f094e93 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.t-b-g.2781474276" + signature = "rusEFI master.2023.07.26.t-b-g.2349525659" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.t-b-g.2781474276" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.t-b-g.2349525659" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:56:31 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:05 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 1753840be5..a1d2e8703d 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.07.26.tdg-pdm8.795328966" + signature = "rusEFI master.2023.07.26.tdg-pdm8.111462073" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.07.26.tdg-pdm8.795328966" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.07.26.tdg-pdm8.111462073" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","Battery Sense","INVALID","INVALID","INVALID","Sense 7","Sense 8","Sense 1","Sense 2","Sense 3","Sense 4","Sense 5","Sense 6" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:57:00 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:32 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3049,6 +3049,10 @@ errorRate = scalar, F32, 1384, "ratio", 1,0 vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5167,6 +5171,9 @@ entry = value1, "ETB: SENT value1", int, "%d" entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" +entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" +entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" +entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" [Menu] @@ -5518,6 +5525,7 @@ menuDialog = main subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -6073,6 +6081,15 @@ dialog = vvtDialog, "vvt" graphLine = vvtTarget graphLine = vvtOutput +indicatorPanel = lambda_monitorIndicatorPanel, 2 + indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" + indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" + +dialog = lambda_monitorDialog, "lambda_monitor" + panel = lambda_monitorIndicatorPanel + liveGraph = lambda_monitor_1_Graph, "Graph", South + graphLine = lambdaTimeSinceGood + dialog = scriptTable1TblSettings, "", yAxis diff --git a/java_console/io/src/main/java/com/rusefi/enums/StateDictionaryFactory.java b/java_console/io/src/main/java/com/rusefi/enums/StateDictionaryFactory.java index ace24679bb..8c1a38c621 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/StateDictionaryFactory.java +++ b/java_console/io/src/main/java/com/rusefi/enums/StateDictionaryFactory.java @@ -1,5 +1,5 @@ package com.rusefi.enums; -//was generated automatically by rusEFI tool config_definition_base.jar based on StateDictionaryGenerator integration/LiveData.yaml on Mon Jul 03 16:38:04 UTC 2023n +//was generated automatically by rusEFI tool config_definition_base.jar based on StateDictionaryGenerator integration/LiveData.yaml on Wed Jul 26 13:01:56 UTC 2023n import com.rusefi.config.generated.*; import com.rusefi.ldmp.StateDictionary; @@ -31,5 +31,6 @@ public class StateDictionaryFactory { stateDictionary.register(live_data_e.LDS_dc_motors, DcMotors.VALUES, "dc_motors"); stateDictionary.register(live_data_e.LDS_sent_state, SentState.VALUES, "sent"); stateDictionary.register(live_data_e.LDS_vvt, VvtState.VALUES, "vvt"); + stateDictionary.register(live_data_e.LDS_lambda_monitor, LambdaMonitor.VALUES, "lambda_monitor"); } } \ No newline at end of file diff --git a/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java b/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java index dd9f7fc696..394f01c609 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java +++ b/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java @@ -31,4 +31,5 @@ public enum live_data_e { LDS_dc_motors, LDS_sent_state, LDS_vvt, + LDS_lambda_monitor, } 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 d85cf61bf4..223f448302 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 config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 11:57:07 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jul 26 13:03:38 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1023,7 +1023,7 @@ public class Fields { public static final int SentEtbType_FORD_TYPE_1 = 2; public static final int SentEtbType_GM_TYPE_1 = 1; public static final int SentEtbType_NONE = 0; - public static final int SIGNATURE_HASH = 114393055; + public static final int SIGNATURE_HASH = 789739680; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final int spi_device_e_SPI_DEVICE_1 = 1; public static final int spi_device_e_SPI_DEVICE_2 = 2; @@ -1247,10 +1247,10 @@ 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 master.2023.07.26.f407-discovery.114393055"; + public static final String TS_SIGNATURE = "rusEFI master.2023.07.26.f407-discovery.789739680"; 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 = 1392; + public static final int TS_TOTAL_OUTPUT_SIZE = 1400; public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; public static final int TS_TRIGGER_SCOPE_DISABLE = 5; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java new file mode 100644 index 0000000000..1d7846921c --- /dev/null +++ b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java @@ -0,0 +1,19 @@ +package com.rusefi.config.generated; + +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/math/lambda_monitor.txt Wed Jul 26 13:01:56 UTC 2023 + +// by class com.rusefi.output.FileJavaFieldsConsumer +import com.rusefi.config.*; + +public class LambdaMonitor { + public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1392); + public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1392); + public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1392); + public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1392); + public static final Field[] VALUES = { + LAMBDACURRENTLYGOOD, + LAMBDAMONITORCUT, + LAMBDATIMESINCEGOOD, + ALIGNMENTFILL_AT_6, + }; +}