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 b6bd40c35a..bb42365e13 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 @@ -977,7 +977,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3909078605 +#define SIGNATURE_HASH 2171188142 #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 #define spi_device_e_SPI_DEVICE_2 2 @@ -1242,12 +1242,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.subaru_eg33_f7.3909078605" +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.subaru_eg33_f7.2171188142" #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 1372 +#define TS_TOTAL_OUTPUT_SIZE 1380 #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/live_data_fragments.h b/firmware/console/binary/generated/live_data_fragments.h index c3c4ca825d..aa997460da 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{}, 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 d0463bdd72..1e76f51aca 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -28,6 +28,7 @@ LDS_dc_motors, LDS_sent_state, LDS_throttle_model, LDS_vvt, +LDS_lambda_monitor, } live_data_e; #define OUTPUT_CHANNELS_BASE_ADDRESS 0 #define FUEL_COMPUTER_BASE_ADDRESS 820 @@ -55,3 +56,4 @@ LDS_vvt, #define SENT_STATE_BASE_ADDRESS 1348 #define THROTTLE_MODEL_BASE_ADDRESS 1356 #define VVT_BASE_ADDRESS 1368 +#define LAMBDA_MONITOR_BASE_ADDRESS 1372 diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index 98957ba755..3747a2b505 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 1372 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1380 \ 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 db87fda845..96548e59fd 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -347,4 +347,5 @@ static constexpr LogField fields[] = { {engine->dc_motors.isEnabled0_int, "DC: en0", "per", 2}, {___engine.module()->vvtTarget, "vvtTarget", "deg", 1}, {___engine.module()->vvtOutput, "vvtOutput", "%", 1}, + {___engine.lambdaMonitor.lambdaTimeSinceGood, "lambdaTimeSinceGood", "sec", 2}, }; diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 6bec530a9e..418ae66239 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1027,7 +1027,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 838214711 +#define SIGNATURE_HASH 1482709460 #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 #define spi_device_e_SPI_DEVICE_2 2 @@ -1291,12 +1291,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.f407-discovery.838214711" +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.f407-discovery.1482709460" #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 1372 +#define TS_TOTAL_OUTPUT_SIZE 1380 #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 84e6b45fcd..1325639aab 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 688803960 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.48way.688803960" +#define SIGNATURE_HASH 1083714971 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.48way.1083714971" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index e9200027a7..992602b2dd 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1217126149 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.alphax-2chan.1217126149" +#define SIGNATURE_HASH 555590374 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.alphax-2chan.555590374" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index b776e802b1..74ed98e7f1 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 3259227492 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.alphax-4chan.3259227492" +#define SIGNATURE_HASH 2882904199 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.alphax-4chan.2882904199" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 29112bd941..ae0392d784 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 3136871325 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.alphax-8chan.3136871325" +#define SIGNATURE_HASH 3547244158 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.alphax-8chan.3547244158" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 498b6b4c1f..50c810aa69 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1897803237 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.atlas.1897803237" +#define SIGNATURE_HASH 411586566 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.atlas.411586566" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index d94f4408ec..87f38c9bb3 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1442043252 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.core8.1442043252" +#define SIGNATURE_HASH 1013295255 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.core8.1013295255" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 48063c3cdf..c1b8d9afe1 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 838214711 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.f407-discovery.838214711" +#define SIGNATURE_HASH 1482709460 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.f407-discovery.1482709460" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 7672fc42a6..9a58888443 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1842665666 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.f429-discovery.1842665666" +#define SIGNATURE_HASH 71476513 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.f429-discovery.71476513" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 1b3711bd0e..7d6e1752b3 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1334196232 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.frankenso_na6.1334196232" +#define SIGNATURE_HASH 638600683 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.frankenso_na6.638600683" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index d9e634fd46..c92a6071eb 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 3829522616 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.harley81.3829522616" +#define SIGNATURE_HASH 2379717979 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.harley81.2379717979" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index e514a0d522..1a9c2107d1 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 79558161 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen-gm-e67.79558161" +#define SIGNATURE_HASH 1831570418 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen-gm-e67.1831570418" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index e11feb40e8..ba5b491fe8 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2670475344 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen-honda-k.2670475344" +#define SIGNATURE_HASH 4139402675 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen-honda-k.4139402675" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index baa684120e..da780b707c 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2599668094 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen-nb1.2599668094" +#define SIGNATURE_HASH 4083528861 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen-nb1.4083528861" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 8a063d20ad..85af5c889f 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 3928515892 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen121nissan.3928515892" +#define SIGNATURE_HASH 2210273495 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen121nissan.2210273495" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 5d8fd493c3..12f8e19a3a 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1177250535 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen121vag.1177250535" +#define SIGNATURE_HASH 800921348 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen121vag.800921348" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index c8602514b3..21b8ad1667 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 3980835173 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen128.3980835173" +#define SIGNATURE_HASH 2228274310 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen128.2228274310" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 565cf525a1..75cd485b4b 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2041682308 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen154hyundai.2041682308" +#define SIGNATURE_HASH 271049831 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen154hyundai.271049831" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index a7306eda7f..83f1383ca0 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2623553909 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen72.2623553909" +#define SIGNATURE_HASH 4126555286 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen72.4126555286" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index a4a4277ad4..a61e186fb9 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 820657143 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen81.820657143" +#define SIGNATURE_HASH 1501316628 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen81.1501316628" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 2f3709c7df..db7a9ebd77 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 919743684 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen88bmw.919743684" +#define SIGNATURE_HASH 1598312743 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellen88bmw.1598312743" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 36aff344c8..6ae0bb0926 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2120522053 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellenNA6.2120522053" +#define SIGNATURE_HASH 401794214 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellenNA6.401794214" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index aa18fd8607..29e98217f7 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 3267423989 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellenNA8_96.3267423989" +#define SIGNATURE_HASH 2874577686 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.hellenNA8_96.2874577686" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 5d6351a50b..450ff9e337 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2321202554 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.mre_f4.2321202554" +#define SIGNATURE_HASH 3821846681 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.mre_f4.3821846681" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 2375e1597e..69aa69710c 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2321202554 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.mre_f7.2321202554" +#define SIGNATURE_HASH 3821846681 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.mre_f7.3821846681" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 2c5177b47b..3f5aff9bcb 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1564480850 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.prometheus_405.1564480850" +#define SIGNATURE_HASH 886466737 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.prometheus_405.886466737" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 34c4ed8221..f52ea9e3bf 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1564480850 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.prometheus_469.1564480850" +#define SIGNATURE_HASH 886466737 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.prometheus_469.886466737" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index ceb401c0cc..3ed2e8ee7a 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 239754703 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.proteus_f4.239754703" +#define SIGNATURE_HASH 1742479404 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.proteus_f4.1742479404" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 6b126ed96e..124c830cf6 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 239754703 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.proteus_f7.239754703" +#define SIGNATURE_HASH 1742479404 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.proteus_f7.1742479404" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index ea2ba43f6c..909b736667 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 239754703 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.proteus_h7.239754703" +#define SIGNATURE_HASH 1742479404 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.proteus_h7.1742479404" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index faeca6d61e..4e0e149d98 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 3909078605 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.subaru_eg33_f7.3909078605" +#define SIGNATURE_HASH 2171188142 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.subaru_eg33_f7.2171188142" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index d7c10ae74e..665001f6ab 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 3883594976 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.tdg-pdm8.3883594976" +#define SIGNATURE_HASH 2397866243 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.07.26.tdg-pdm8.2397866243" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index c986d92588..1269c0e75e 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -664,6 +664,12 @@ float getOutputValueByName(const char *name) { return ___engine.module()->vvtTarget; case 1990697206: return ___engine.module()->vvtOutput; + case 350535927: + return ___engine.lambdaMonitor.lambdaCurrentlyGood; + case 1849938842: + return ___engine.lambdaMonitor.lambdaMonitorCut; + 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..334524a9ed --- /dev/null +++ b/firmware/controllers/math/lambda_monitor_generated.h @@ -0,0 +1,75 @@ +#pragma once +#include "rusefi_types.h" +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; + // offset 6 + uint8_t alignmentFill_at_6[2]; +}; +static_assert(sizeof(lambda_monitor_s) == 8); + diff --git a/firmware/tunerstudio/generated/fome.ini b/firmware/tunerstudio/generated/fome.ini index d114626693..678572948b 100644 --- a/firmware/tunerstudio/generated/fome.ini +++ b/firmware/tunerstudio/generated/fome.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.f407-discovery.838214711" + signature = "rusEFI (FOME) master.2023.07.26.f407-discovery.1482709460" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.f407-discovery.838214711" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.f407-discovery.1482709460" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5225,6 +5232,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5767,6 +5775,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/fome_48way.ini b/firmware/tunerstudio/generated/fome_48way.ini index 1151b609af..f350e2f5e0 100644 --- a/firmware/tunerstudio/generated/fome_48way.ini +++ b/firmware/tunerstudio/generated/fome_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.48way.688803960" + signature = "rusEFI (FOME) master.2023.07.26.48way.1083714971" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.48way.688803960" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.48way.1083714971" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5225,6 +5232,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5767,6 +5775,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/fome_alphax-2chan.ini b/firmware/tunerstudio/generated/fome_alphax-2chan.ini index 3ff7fce872..e8217b32a3 100644 --- a/firmware/tunerstudio/generated/fome_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.alphax-2chan.1217126149" + signature = "rusEFI (FOME) master.2023.07.26.alphax-2chan.555590374" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.alphax-2chan.1217126149" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.alphax-2chan.555590374" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5221,6 +5228,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5763,6 +5771,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/fome_alphax-4chan.ini b/firmware/tunerstudio/generated/fome_alphax-4chan.ini index 3512c1a907..40f008f120 100644 --- a/firmware/tunerstudio/generated/fome_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.alphax-4chan.3259227492" + signature = "rusEFI (FOME) master.2023.07.26.alphax-4chan.2882904199" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.alphax-4chan.3259227492" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.alphax-4chan.2882904199" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_alphax-8chan.ini b/firmware/tunerstudio/generated/fome_alphax-8chan.ini index ba412c7102..baadaf8f17 100644 --- a/firmware/tunerstudio/generated/fome_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-8chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.alphax-8chan.3136871325" + signature = "rusEFI (FOME) master.2023.07.26.alphax-8chan.3547244158" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.alphax-8chan.3136871325" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.alphax-8chan.3547244158" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_atlas.ini b/firmware/tunerstudio/generated/fome_atlas.ini index a2c6558350..a09ae49c7b 100644 --- a/firmware/tunerstudio/generated/fome_atlas.ini +++ b/firmware/tunerstudio/generated/fome_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.atlas.1897803237" + signature = "rusEFI (FOME) master.2023.07.26.atlas.411586566" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.atlas.1897803237" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.atlas.411586566" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5223,6 +5230,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5765,6 +5773,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/fome_core8.ini b/firmware/tunerstudio/generated/fome_core8.ini index d33ff7ce59..1d8594fc84 100644 --- a/firmware/tunerstudio/generated/fome_core8.ini +++ b/firmware/tunerstudio/generated/fome_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.core8.1442043252" + signature = "rusEFI (FOME) master.2023.07.26.core8.1013295255" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.core8.1442043252" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.core8.1013295255" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5225,6 +5232,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5767,6 +5775,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/fome_f407-discovery.ini b/firmware/tunerstudio/generated/fome_f407-discovery.ini index d114626693..678572948b 100644 --- a/firmware/tunerstudio/generated/fome_f407-discovery.ini +++ b/firmware/tunerstudio/generated/fome_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.f407-discovery.838214711" + signature = "rusEFI (FOME) master.2023.07.26.f407-discovery.1482709460" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.f407-discovery.838214711" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.f407-discovery.1482709460" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5225,6 +5232,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5767,6 +5775,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/fome_f429-discovery.ini b/firmware/tunerstudio/generated/fome_f429-discovery.ini index 612ef6a8b1..cf379141b1 100644 --- a/firmware/tunerstudio/generated/fome_f429-discovery.ini +++ b/firmware/tunerstudio/generated/fome_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.f429-discovery.1842665666" + signature = "rusEFI (FOME) master.2023.07.26.f429-discovery.71476513" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.f429-discovery.1842665666" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.f429-discovery.71476513" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5223,6 +5230,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5765,6 +5773,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/fome_frankenso_na6.ini b/firmware/tunerstudio/generated/fome_frankenso_na6.ini index 6396beefb0..47680d4260 100644 --- a/firmware/tunerstudio/generated/fome_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/fome_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.frankenso_na6.1334196232" + signature = "rusEFI (FOME) master.2023.07.26.frankenso_na6.638600683" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.frankenso_na6.1334196232" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.frankenso_na6.638600683" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5223,6 +5230,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5765,6 +5773,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/fome_harley81.ini b/firmware/tunerstudio/generated/fome_harley81.ini index e897c11ce7..246088bfe7 100644 --- a/firmware/tunerstudio/generated/fome_harley81.ini +++ b/firmware/tunerstudio/generated/fome_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.harley81.3829522616" + signature = "rusEFI (FOME) master.2023.07.26.harley81.2379717979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.harley81.3829522616" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.harley81.2379717979" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_hellen-gm-e67.ini b/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini index 9a34941a7e..3cf0758da8 100644 --- a/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.hellen-gm-e67.79558161" + signature = "rusEFI (FOME) master.2023.07.26.hellen-gm-e67.1831570418" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.hellen-gm-e67.79558161" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.hellen-gm-e67.1831570418" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_hellen-honda-k.ini b/firmware/tunerstudio/generated/fome_hellen-honda-k.ini index 2f4052c107..bb274cf1d3 100644 --- a/firmware/tunerstudio/generated/fome_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/fome_hellen-honda-k.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.hellen-honda-k.2670475344" + signature = "rusEFI (FOME) master.2023.07.26.hellen-honda-k.4139402675" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.hellen-honda-k.2670475344" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.hellen-honda-k.4139402675" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_hellen-nb1.ini b/firmware/tunerstudio/generated/fome_hellen-nb1.ini index 6becd804bf..59755d5a8d 100644 --- a/firmware/tunerstudio/generated/fome_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/fome_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.hellen-nb1.2599668094" + signature = "rusEFI (FOME) master.2023.07.26.hellen-nb1.4083528861" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.hellen-nb1.2599668094" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.hellen-nb1.4083528861" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_hellen121nissan.ini b/firmware/tunerstudio/generated/fome_hellen121nissan.ini index bef1021355..93647c3dac 100644 --- a/firmware/tunerstudio/generated/fome_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/fome_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.hellen121nissan.3928515892" + signature = "rusEFI (FOME) master.2023.07.26.hellen121nissan.2210273495" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.hellen121nissan.3928515892" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.hellen121nissan.2210273495" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_hellen121vag.ini b/firmware/tunerstudio/generated/fome_hellen121vag.ini index 6ae163333c..1e02c5af0c 100644 --- a/firmware/tunerstudio/generated/fome_hellen121vag.ini +++ b/firmware/tunerstudio/generated/fome_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.hellen121vag.1177250535" + signature = "rusEFI (FOME) master.2023.07.26.hellen121vag.800921348" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.hellen121vag.1177250535" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.hellen121vag.800921348" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_hellen128mercedes.ini b/firmware/tunerstudio/generated/fome_hellen128mercedes.ini index ee3a9d732d..bc021e5806 100644 --- a/firmware/tunerstudio/generated/fome_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/fome_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.hellen128.3980835173" + signature = "rusEFI (FOME) master.2023.07.26.hellen128.2228274310" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.hellen128.3980835173" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.hellen128.2228274310" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_hellen154hyundai.ini b/firmware/tunerstudio/generated/fome_hellen154hyundai.ini index 1f48bd01ba..2c8e4a16f6 100644 --- a/firmware/tunerstudio/generated/fome_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/fome_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.hellen154hyundai.2041682308" + signature = "rusEFI (FOME) master.2023.07.26.hellen154hyundai.271049831" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.hellen154hyundai.2041682308" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.hellen154hyundai.271049831" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_hellen72.ini b/firmware/tunerstudio/generated/fome_hellen72.ini index 83684198ad..1f232e55b0 100644 --- a/firmware/tunerstudio/generated/fome_hellen72.ini +++ b/firmware/tunerstudio/generated/fome_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.hellen72.2623553909" + signature = "rusEFI (FOME) master.2023.07.26.hellen72.4126555286" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.hellen72.2623553909" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.hellen72.4126555286" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_hellen81.ini b/firmware/tunerstudio/generated/fome_hellen81.ini index ada654642b..501de3d117 100644 --- a/firmware/tunerstudio/generated/fome_hellen81.ini +++ b/firmware/tunerstudio/generated/fome_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.hellen81.820657143" + signature = "rusEFI (FOME) master.2023.07.26.hellen81.1501316628" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.hellen81.820657143" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.hellen81.1501316628" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5222,6 +5229,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5764,6 +5772,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/fome_hellen88bmw.ini b/firmware/tunerstudio/generated/fome_hellen88bmw.ini index 9fe15b8795..59ba9fbc16 100644 --- a/firmware/tunerstudio/generated/fome_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/fome_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.hellen88bmw.919743684" + signature = "rusEFI (FOME) master.2023.07.26.hellen88bmw.1598312743" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.hellen88bmw.919743684" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.hellen88bmw.1598312743" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_hellenNA6.ini b/firmware/tunerstudio/generated/fome_hellenNA6.ini index edbc057b23..7b43975e4e 100644 --- a/firmware/tunerstudio/generated/fome_hellenNA6.ini +++ b/firmware/tunerstudio/generated/fome_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.hellenNA6.2120522053" + signature = "rusEFI (FOME) master.2023.07.26.hellenNA6.401794214" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.hellenNA6.2120522053" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.hellenNA6.401794214" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_hellenNA8_96.ini b/firmware/tunerstudio/generated/fome_hellenNA8_96.ini index 62ae19d85e..cb013d601d 100644 --- a/firmware/tunerstudio/generated/fome_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/fome_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.hellenNA8_96.3267423989" + signature = "rusEFI (FOME) master.2023.07.26.hellenNA8_96.2874577686" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.hellenNA8_96.3267423989" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.hellenNA8_96.2874577686" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5224,6 +5231,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5766,6 +5774,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/fome_mre_f4.ini b/firmware/tunerstudio/generated/fome_mre_f4.ini index e8c5d86711..01660bf383 100644 --- a/firmware/tunerstudio/generated/fome_mre_f4.ini +++ b/firmware/tunerstudio/generated/fome_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.mre_f4.2321202554" + signature = "rusEFI (FOME) master.2023.07.26.mre_f4.3821846681" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.mre_f4.2321202554" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.mre_f4.3821846681" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4881,6 +4885,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5226,6 +5233,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5768,6 +5776,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/fome_mre_f7.ini b/firmware/tunerstudio/generated/fome_mre_f7.ini index 515ba2ae60..4bcd652f7f 100644 --- a/firmware/tunerstudio/generated/fome_mre_f7.ini +++ b/firmware/tunerstudio/generated/fome_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.mre_f7.2321202554" + signature = "rusEFI (FOME) master.2023.07.26.mre_f7.3821846681" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.mre_f7.2321202554" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.mre_f7.3821846681" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4881,6 +4885,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5226,6 +5233,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5768,6 +5776,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/fome_prometheus_405.ini b/firmware/tunerstudio/generated/fome_prometheus_405.ini index 5823ff8cee..b93a5bc4c8 100644 --- a/firmware/tunerstudio/generated/fome_prometheus_405.ini +++ b/firmware/tunerstudio/generated/fome_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.prometheus_405.1564480850" + signature = "rusEFI (FOME) master.2023.07.26.prometheus_405.886466737" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.prometheus_405.1564480850" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.prometheus_405.886466737" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5218,6 +5225,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5760,6 +5768,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/fome_prometheus_469.ini b/firmware/tunerstudio/generated/fome_prometheus_469.ini index eeeb576a83..789d477ac5 100644 --- a/firmware/tunerstudio/generated/fome_prometheus_469.ini +++ b/firmware/tunerstudio/generated/fome_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.prometheus_469.1564480850" + signature = "rusEFI (FOME) master.2023.07.26.prometheus_469.886466737" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.prometheus_469.1564480850" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.prometheus_469.886466737" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5218,6 +5225,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5760,6 +5768,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/fome_proteus_f4.ini b/firmware/tunerstudio/generated/fome_proteus_f4.ini index 44f1a2f693..bf09cdb499 100644 --- a/firmware/tunerstudio/generated/fome_proteus_f4.ini +++ b/firmware/tunerstudio/generated/fome_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.proteus_f4.239754703" + signature = "rusEFI (FOME) master.2023.07.26.proteus_f4.1742479404" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.proteus_f4.239754703" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.proteus_f4.1742479404" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 26812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5220,6 +5227,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5763,6 +5771,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/fome_proteus_f7.ini b/firmware/tunerstudio/generated/fome_proteus_f7.ini index 405309ffbf..348c2f37ed 100644 --- a/firmware/tunerstudio/generated/fome_proteus_f7.ini +++ b/firmware/tunerstudio/generated/fome_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.proteus_f7.239754703" + signature = "rusEFI (FOME) master.2023.07.26.proteus_f7.1742479404" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.proteus_f7.239754703" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.proteus_f7.1742479404" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 26812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5220,6 +5227,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5763,6 +5771,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/fome_proteus_h7.ini b/firmware/tunerstudio/generated/fome_proteus_h7.ini index 21a43cbb42..261b91005e 100644 --- a/firmware/tunerstudio/generated/fome_proteus_h7.ini +++ b/firmware/tunerstudio/generated/fome_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.proteus_h7.239754703" + signature = "rusEFI (FOME) master.2023.07.26.proteus_h7.1742479404" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.proteus_h7.239754703" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.proteus_h7.1742479404" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 26812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5220,6 +5227,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5763,6 +5771,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/fome_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/fome_subaru_eg33_f7.ini index 2fb79d0a70..e3400c21b1 100644 --- a/firmware/tunerstudio/generated/fome_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/fome_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.subaru_eg33_f7.3909078605" + signature = "rusEFI (FOME) master.2023.07.26.subaru_eg33_f7.2171188142" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.subaru_eg33_f7.3909078605" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.subaru_eg33_f7.2171188142" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5222,6 +5229,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5764,6 +5772,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/fome_tdg-pdm8.ini b/firmware/tunerstudio/generated/fome_tdg-pdm8.ini index 93a0956385..a1ad278071 100644 --- a/firmware/tunerstudio/generated/fome_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/fome_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.07.26.tdg-pdm8.3883594976" + signature = "rusEFI (FOME) master.2023.07.26.tdg-pdm8.2397866243" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.07.26.tdg-pdm8.3883594976" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.07.26.tdg-pdm8.2397866243" ; 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 @@ -2117,7 +2117,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1372 + ochBlockSize = 1380 ; ; see TunerStudioOutputChannels struct @@ -2870,6 +2870,10 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 time = { timeNow } @@ -4880,6 +4884,9 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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] @@ -5223,6 +5230,7 @@ menuDialog = main subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" @@ -5765,6 +5773,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/temp/data_logs.ini b/firmware/tunerstudio/generated/temp/data_logs.ini index d4a4112697..84f84bd603 100644 --- a/firmware/tunerstudio/generated/temp/data_logs.ini +++ b/firmware/tunerstudio/generated/temp/data_logs.ini @@ -561,3 +561,6 @@ entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3 entry = throttleEstimatedFlow, "Air: Throttle flow estimate", 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/tunerstudio/generated/temp/fancy_content.ini b/firmware/tunerstudio/generated/temp/fancy_content.ini index 679c6e3792..a27359d886 100644 --- a/firmware/tunerstudio/generated/temp/fancy_content.ini +++ b/firmware/tunerstudio/generated/temp/fancy_content.ini @@ -378,3 +378,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/tunerstudio/generated/temp/fancy_menu.ini b/firmware/tunerstudio/generated/temp/fancy_menu.ini index 41b3807e10..993dc18011 100644 --- a/firmware/tunerstudio/generated/temp/fancy_menu.ini +++ b/firmware/tunerstudio/generated/temp/fancy_menu.ini @@ -23,3 +23,4 @@ subMenu = sent_stateDialog, "sent_state" subMenu = throttle_modelDialog, "throttle_model" subMenu = vvtDialog, "vvt" + subMenu = lambda_monitorDialog, "lambda_monitor" diff --git a/firmware/tunerstudio/generated/temp/output_channels.ini b/firmware/tunerstudio/generated/temp/output_channels.ini index 7ecbfe486c..a66b1a28a3 100644 --- a/firmware/tunerstudio/generated/temp/output_channels.ini +++ b/firmware/tunerstudio/generated/temp/output_channels.ini @@ -745,3 +745,7 @@ throttleEstimatedFlow = scalar, F32, 1364, "g/s", 1, 0 vvtTarget = scalar, U16, 1368, "deg", 0.1, 0 vvtOutput = scalar, U08, 1370, "%", 0.5, 0 ; total TS size = 1372 +lambdaCurrentlyGood = bits, U32, 1372, [0:0] +lambdaMonitorCut = bits, U32, 1372, [1:1] +lambdaTimeSinceGood = scalar, U16, 1376, "sec", 0.01, 0 +; total TS size = 1380 diff --git a/java_console/io/src/main/java/com/rusefi/enums/auto_generated_enums.cpp b/java_console/io/src/main/java/com/rusefi/enums/auto_generated_enums.cpp index 74acac1ebb..2d99ac94c7 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/auto_generated_enums.cpp +++ b/java_console/io/src/main/java/com/rusefi/enums/auto_generated_enums.cpp @@ -30,6 +30,8 @@ case LDS_injector_model: return "LDS_injector_model"; case LDS_knock_controller: return "LDS_knock_controller"; +case LDS_lambda_monitor: + return "LDS_lambda_monitor"; case LDS_launch_control_state: return "LDS_launch_control_state"; case LDS_main_relay: 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 064fe377cf..44841892be 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_sent_state, LDS_throttle_model, 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 2f3ca83ab6..17d20030d7 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 @@ -975,7 +975,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 = 838214711; + public static final int SIGNATURE_HASH = 1482709460; public static final int spi_device_e_SPI_DEVICE_1 = 1; public static final int spi_device_e_SPI_DEVICE_2 = 2; public static final int spi_device_e_SPI_DEVICE_3 = 3; @@ -1177,10 +1177,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 (FOME) master.2023.07.26.f407-discovery.838214711"; + public static final String TS_SIGNATURE = "rusEFI (FOME) master.2023.07.26.f407-discovery.1482709460"; 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 = 1372; + public static final int TS_TOTAL_OUTPUT_SIZE = 1380; 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..aec458eba4 --- /dev/null +++ b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java @@ -0,0 +1,16 @@ +package com.rusefi.config.generated; + +import com.rusefi.config.*; + +public class LambdaMonitor { + public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1372); + public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1372); + public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1372); + public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1372); + public static final Field[] VALUES = { + LAMBDACURRENTLYGOOD, + LAMBDAMONITORCUT, + LAMBDATIMESINCEGOOD, + ALIGNMENTFILL_AT_6, + }; +}