From b72bc5b8348001c0e6fd5f4ad1a81c446ed7446a Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Mon, 13 Feb 2023 23:04:13 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 6 ++--- .../controllers/algo/rusefi_generated.h | 6 ++--- .../controllers/algo/rusefi_generated.h | 6 ++--- .../console/binary/generated/data_logs.ini | 2 ++ .../binary/generated/fancy_content.ini | 8 +++++++ .../console/binary/generated/fancy_menu.ini | 1 + firmware/console/binary/generated/gauges.ini | 1 + .../binary/generated/live_data_fragments.h | 1 + .../binary/generated/output_channels.ini | 3 +++ .../console/binary/generated/sensors.java | 1 + .../generated/total_live_data_generated.h | 2 +- .../console/binary_log/log_fields_generated.h | 1 + .../controllers/generated/rusefi_generated.h | 6 ++--- .../controllers/generated/signature_48way.h | 4 ++-- .../generated/signature_alphax-2chan.h | 4 ++-- .../generated/signature_alphax-4chan.h | 4 ++-- .../generated/signature_alphax-8chan.h | 4 ++-- .../controllers/generated/signature_atlas.h | 4 ++-- .../controllers/generated/signature_core8.h | 4 ++-- .../controllers/generated/signature_cypress.h | 4 ++-- .../generated/signature_f407-discovery.h | 4 ++-- .../generated/signature_f429-discovery.h | 4 ++-- .../generated/signature_frankenso_na6.h | 4 ++-- .../generated/signature_harley81.h | 4 ++-- .../generated/signature_hellen-gm-e67.h | 4 ++-- .../generated/signature_hellen-honda-k.h | 4 ++-- .../generated/signature_hellen-nb1.h | 4 ++-- .../generated/signature_hellen121nissan.h | 4 ++-- .../generated/signature_hellen121vag.h | 4 ++-- .../generated/signature_hellen128.h | 4 ++-- .../generated/signature_hellen154hyundai.h | 4 ++-- .../generated/signature_hellen72.h | 4 ++-- .../generated/signature_hellen81.h | 4 ++-- .../generated/signature_hellen88bmw.h | 4 ++-- .../generated/signature_hellenNA6.h | 4 ++-- .../generated/signature_hellenNA8_96.h | 4 ++-- .../controllers/generated/signature_kin.h | 4 ++-- .../controllers/generated/signature_m74_9.h | 4 ++-- .../controllers/generated/signature_mre_f4.h | 4 ++-- .../controllers/generated/signature_mre_f7.h | 4 ++-- .../generated/signature_prometheus_405.h | 4 ++-- .../generated/signature_prometheus_469.h | 4 ++-- .../generated/signature_proteus_f4.h | 4 ++-- .../generated/signature_proteus_f7.h | 4 ++-- .../generated/signature_proteus_h7.h | 4 ++-- .../controllers/generated/signature_s105.h | 4 ++-- .../generated/signature_subaru_eg33_f7.h | 4 ++-- .../generated/signature_tdg-pdm8.h | 4 ++-- .../lua/generated/output_lookup_generated.cpp | 4 ++++ firmware/tunerstudio/generated/rusefi.ini | 23 +++++++++++++++---- .../tunerstudio/generated/rusefi_48way.ini | 23 +++++++++++++++---- .../generated/rusefi_alphax-2chan.ini | 23 +++++++++++++++---- .../generated/rusefi_alphax-4chan.ini | 23 +++++++++++++++---- .../generated/rusefi_alphax-8chan.ini | 23 +++++++++++++++---- .../tunerstudio/generated/rusefi_atlas.ini | 23 +++++++++++++++---- .../tunerstudio/generated/rusefi_core8.ini | 23 +++++++++++++++---- .../tunerstudio/generated/rusefi_cypress.ini | 23 +++++++++++++++---- .../generated/rusefi_f407-discovery.ini | 23 +++++++++++++++---- .../generated/rusefi_f429-discovery.ini | 23 +++++++++++++++---- .../generated/rusefi_frankenso_na6.ini | 23 +++++++++++++++---- .../tunerstudio/generated/rusefi_harley81.ini | 23 +++++++++++++++---- .../generated/rusefi_hellen-gm-e67.ini | 23 +++++++++++++++---- .../generated/rusefi_hellen-honda-k.ini | 23 +++++++++++++++---- .../generated/rusefi_hellen-nb1.ini | 23 +++++++++++++++---- .../generated/rusefi_hellen121nissan.ini | 23 +++++++++++++++---- .../generated/rusefi_hellen121vag.ini | 23 +++++++++++++++---- .../generated/rusefi_hellen128mercedes.ini | 23 +++++++++++++++---- .../generated/rusefi_hellen154hyundai.ini | 23 +++++++++++++++---- .../tunerstudio/generated/rusefi_hellen72.ini | 23 +++++++++++++++---- .../tunerstudio/generated/rusefi_hellen81.ini | 23 +++++++++++++++---- .../generated/rusefi_hellen88bmw.ini | 23 +++++++++++++++---- .../generated/rusefi_hellenNA6.ini | 23 +++++++++++++++---- .../generated/rusefi_hellenNA8_96.ini | 23 +++++++++++++++---- firmware/tunerstudio/generated/rusefi_kin.ini | 23 +++++++++++++++---- .../tunerstudio/generated/rusefi_m74_9.ini | 23 +++++++++++++++---- .../tunerstudio/generated/rusefi_mre_f4.ini | 23 +++++++++++++++---- .../tunerstudio/generated/rusefi_mre_f7.ini | 23 +++++++++++++++---- .../generated/rusefi_prometheus_405.ini | 23 +++++++++++++++---- .../generated/rusefi_prometheus_469.ini | 23 +++++++++++++++---- .../generated/rusefi_proteus_f4.ini | 23 +++++++++++++++---- .../generated/rusefi_proteus_f7.ini | 23 +++++++++++++++---- .../generated/rusefi_proteus_h7.ini | 23 +++++++++++++++---- .../tunerstudio/generated/rusefi_s105.ini | 23 +++++++++++++++---- .../generated/rusefi_subaru_eg33_f7.ini | 23 +++++++++++++++---- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 23 +++++++++++++++---- .../com/rusefi/enums/auto_generated_enums.cpp | 4 +++- .../java/com/rusefi/enums/live_data_e.java | 1 + .../com/rusefi/config/generated/DcMotors.java | 6 ++--- .../com/rusefi/config/generated/Fields.java | 7 +++--- 89 files changed, 800 insertions(+), 234 deletions(-) diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index 67140440ad..21036b4a8e 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1049,7 +1049,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3585644816 +#define SIGNATURE_HASH 278637567 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1325,12 +1325,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.02.13.cypress.3585644816" +#define TS_SIGNATURE "rusEFI master.2023.02.13.cypress.278637567" #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 1316 +#define TS_TOTAL_OUTPUT_SIZE 1324 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index fc81c33672..2e32ba82b0 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1049,7 +1049,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3178183644 +#define SIGNATURE_HASH 2018249011 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1325,12 +1325,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.02.13.kin.3178183644" +#define TS_SIGNATURE "rusEFI master.2023.02.13.kin.2018249011" #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 1316 +#define TS_TOTAL_OUTPUT_SIZE 1324 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index db053c112c..bb1eb499d5 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 @@ -999,7 +999,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2791689149 +#define SIGNATURE_HASH 1665595730 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1276,12 +1276,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.02.13.subaru_eg33_f7.2791689149" +#define TS_SIGNATURE "rusEFI master.2023.02.13.subaru_eg33_f7.1665595730" #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 1316 +#define TS_TOTAL_OUTPUT_SIZE 1324 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 305a4ff363..3871fec603 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -532,3 +532,5 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 5b1e5b871d..db8102ae02 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -360,3 +360,11 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + diff --git a/firmware/console/binary/generated/fancy_menu.ini b/firmware/console/binary/generated/fancy_menu.ini index e590539da5..57c124fa92 100644 --- a/firmware/console/binary/generated/fancy_menu.ini +++ b/firmware/console/binary/generated/fancy_menu.ini @@ -19,3 +19,4 @@ subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index f9e0630927..4c7311f327 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -27,3 +27,4 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 diff --git a/firmware/console/binary/generated/live_data_fragments.h b/firmware/console/binary/generated/live_data_fragments.h index f7c9846d9e..0ea326aae1 100644 --- a/firmware/console/binary/generated/live_data_fragments.h +++ b/firmware/console/binary/generated/live_data_fragments.h @@ -28,3 +28,4 @@ decl_frag{}, // etb1 // decl_frag{}, // etb2 decl_frag{}, // wb1 // decl_frag{}, // wb2 +decl_frag{}, diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 3dd7efa9a2..89b4ec32ce 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -718,3 +718,6 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 95afe4b2bb..7192bf64f2 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -512,3 +512,4 @@ tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1308, 1.0, 500.0, nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1310, 0.001, 0.0, 1.0, "V"), esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1312, 1.0, -1.0, -1.0, ""), alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1314, 1.0, -20.0, 100.0, "units"), +dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1316, 1.0, 0.0, 10.0, "per"), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index b004768d53..c8a5b611ab 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 1316 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1324 \ 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 5891d0b559..e76947b4e9 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -325,4 +325,5 @@ static constexpr LogField fields[] = { {engine->triggerCentral.currentEngineDecodedPhase, "Engine Phase", "deg", 0}, {engine->triggerCentral.triggerToothAngleError, "triggerToothAngleError", "deg", 2}, {engine->triggerCentral.triggerIgnoredToothCount, "triggerIgnoredToothCount", "", 0}, + {engine->dc_motors.dcOutput0, "DC: output0", "per", 2, "ETB more"}, }; diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index f001021466..d26510a90e 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1049,7 +1049,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3187115958 +#define SIGNATURE_HASH 2027205977 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1325,12 +1325,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.02.13.f407-discovery.3187115958" +#define TS_SIGNATURE "rusEFI master.2023.02.13.f407-discovery.2027205977" #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 1316 +#define TS_TOTAL_OUTPUT_SIZE 1324 #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 c4ba7d5db4..9f302e7eea 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2063407728 -#define TS_SIGNATURE "rusEFI master.2023.02.13.48way.2063407728" +#define SIGNATURE_HASH 3219007647 +#define TS_SIGNATURE "rusEFI master.2023.02.13.48way.3219007647" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 4dae4538a7..286dcfa5ad 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2307424419 -#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-2chan.2307424419" +#define SIGNATURE_HASH 1286320716 +#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-2chan.1286320716" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 63784d2eb6..0506028319 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 718351509 -#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-4chan.718351509" +#define SIGNATURE_HASH 4025622138 +#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-4chan.4025622138" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index ac233851d0..df6fc79e86 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2143602228 -#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-8chan.2143602228" +#define SIGNATURE_HASH 3135763675 +#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-8chan.3135763675" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index eced29fc2c..778ac4e00a 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3379719223 -#define TS_SIGNATURE "rusEFI master.2023.02.13.atlas.3379719223" +#define SIGNATURE_HASH 206659288 +#define TS_SIGNATURE "rusEFI master.2023.02.13.atlas.206659288" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 06e5e9fe6e..7f63ac7e90 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 100704124 -#define TS_SIGNATURE "rusEFI master.2023.02.13.core8.100704124" +#define SIGNATURE_HASH 3273895315 +#define TS_SIGNATURE "rusEFI master.2023.02.13.core8.3273895315" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index dccff86760..4d72a65d77 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 3585644816 -#define TS_SIGNATURE "rusEFI master.2023.02.13.cypress.3585644816" +#define SIGNATURE_HASH 278637567 +#define TS_SIGNATURE "rusEFI master.2023.02.13.cypress.278637567" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index facf01d7f8..f7d5989628 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3187115958 -#define TS_SIGNATURE "rusEFI master.2023.02.13.f407-discovery.3187115958" +#define SIGNATURE_HASH 2027205977 +#define TS_SIGNATURE "rusEFI master.2023.02.13.f407-discovery.2027205977" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 64f8a6abfa..e2b0ac8b1f 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3585644816 -#define TS_SIGNATURE "rusEFI master.2023.02.13.f429-discovery.3585644816" +#define SIGNATURE_HASH 278637567 +#define TS_SIGNATURE "rusEFI master.2023.02.13.f429-discovery.278637567" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 7a13b99dbb..1216298456 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4159338970 -#define TS_SIGNATURE "rusEFI master.2023.02.13.frankenso_na6.4159338970" +#define SIGNATURE_HASH 852052789 +#define TS_SIGNATURE "rusEFI master.2023.02.13.frankenso_na6.852052789" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 891d2c3c3c..4cd7d843fb 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4071697496 -#define TS_SIGNATURE "rusEFI master.2023.02.13.harley81.4071697496" +#define SIGNATURE_HASH 932322999 +#define TS_SIGNATURE "rusEFI master.2023.02.13.harley81.932322999" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 841d709022..6b1a41bf16 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2864767895 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-gm-e67.2864767895" +#define SIGNATURE_HASH 1877201272 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-gm-e67.1877201272" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 5fa4171fd2..3b01c6cd56 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 256383394 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-honda-k.256383394" +#define SIGNATURE_HASH 3396021069 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-honda-k.3396021069" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 99e4d5c1ff..d3062e3b52 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1063192977 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-nb1.1063192977" +#define SIGNATURE_HASH 4202445694 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-nb1.4202445694" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 32a0814382..94ae0f4920 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1801395085 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen121nissan.1801395085" +#define SIGNATURE_HASH 2927372642 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen121nissan.2927372642" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 4224f6159d..393b047ff9 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1511841872 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen121vag.1511841872" +#define SIGNATURE_HASH 2671760063 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen121vag.2671760063" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index c94e698b5a..b66bf7ecbc 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1938783083 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen128.1938783083" +#define SIGNATURE_HASH 3064744324 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen128.3064744324" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 55631d39c1..f2f2fcd20e 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 664940441 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen154hyundai.664940441" +#define SIGNATURE_HASH 3800112502 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen154hyundai.3800112502" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index efc1cf672b..9497e4f6c6 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1184804805 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen72.1184804805" +#define SIGNATURE_HASH 2210241834 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen72.2210241834" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 449bfc5262..0fb69f8e35 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2474080845 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen81.2474080845" +#define SIGNATURE_HASH 1448364194 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen81.1448364194" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 3c313ffc97..25b38420b1 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3344809921 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen88bmw.3344809921" +#define SIGNATURE_HASH 41848110 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen88bmw.41848110" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 12b7c1d165..19180bb8d3 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3155829448 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellenNA6.3155829448" +#define SIGNATURE_HASH 2033782823 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellenNA6.2033782823" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index f3488abe4d..f07ccc53f4 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3570115063 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellenNA8_96.3570115063" +#define SIGNATURE_HASH 300454680 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellenNA8_96.300454680" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index ba6f0d0553..17cd9792db 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 3178183644 -#define TS_SIGNATURE "rusEFI master.2023.02.13.kin.3178183644" +#define SIGNATURE_HASH 2018249011 +#define TS_SIGNATURE "rusEFI master.2023.02.13.kin.2018249011" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 8ed080d5b9..77940efe51 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 171328555 -#define TS_SIGNATURE "rusEFI master.2023.02.13.m74_9.171328555" +#define SIGNATURE_HASH 3474290372 +#define TS_SIGNATURE "rusEFI master.2023.02.13.m74_9.3474290372" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 0ec201a672..435c638b85 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1896003811 -#define TS_SIGNATURE "rusEFI master.2023.02.13.mre_f4.1896003811" +#define SIGNATURE_HASH 3022096908 +#define TS_SIGNATURE "rusEFI master.2023.02.13.mre_f4.3022096908" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index f49bf9f207..4bbfc91c61 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1896003811 -#define TS_SIGNATURE "rusEFI master.2023.02.13.mre_f7.1896003811" +#define SIGNATURE_HASH 3022096908 +#define TS_SIGNATURE "rusEFI master.2023.02.13.mre_f7.3022096908" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 78fc04cbdc..bc07a6bb1b 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2236760310 -#define TS_SIGNATURE "rusEFI master.2023.02.13.prometheus_405.2236760310" +#define SIGNATURE_HASH 1081176601 +#define TS_SIGNATURE "rusEFI master.2023.02.13.prometheus_405.1081176601" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 0f88e0b921..9f5e3c95aa 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2236760310 -#define TS_SIGNATURE "rusEFI master.2023.02.13.prometheus_469.2236760310" +#define SIGNATURE_HASH 1081176601 +#define TS_SIGNATURE "rusEFI master.2023.02.13.prometheus_469.1081176601" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index addb8d0c91..15bbeb978b 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4219404519 -#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_f4.4219404519" +#define SIGNATURE_HASH 1046229512 +#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_f4.1046229512" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index b266fbcb6d..9ec5af0264 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4219404519 -#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_f7.4219404519" +#define SIGNATURE_HASH 1046229512 +#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_f7.1046229512" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 557a27b746..bc65d22b53 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4219404519 -#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_h7.4219404519" +#define SIGNATURE_HASH 1046229512 +#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_h7.1046229512" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index a8bff2eafe..ca4ec17f9b 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1816641342 -#define TS_SIGNATURE "rusEFI master.2023.02.13.s105.1816641342" +#define SIGNATURE_HASH 2841939409 +#define TS_SIGNATURE "rusEFI master.2023.02.13.s105.2841939409" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 3b59726289..e0863c7856 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2791689149 -#define TS_SIGNATURE "rusEFI master.2023.02.13.subaru_eg33_f7.2791689149" +#define SIGNATURE_HASH 1665595730 +#define TS_SIGNATURE "rusEFI master.2023.02.13.subaru_eg33_f7.1665595730" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index dbfc7a0b51..bf3125d918 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1595323698 -#define TS_SIGNATURE "rusEFI master.2023.02.13.tdg-pdm8.1595323698" +#define SIGNATURE_HASH 2587199453 +#define TS_SIGNATURE "rusEFI master.2023.02.13.tdg-pdm8.2587199453" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index a64522fcfb..329a31b1b1 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -669,6 +669,10 @@ float getOutputValueByName(const char *name) { return engine->triggerCentral.triggerToothAngleError; case 989545496: return engine->triggerCentral.triggerIgnoredToothCount; + case 1242329357: + return engine->dc_motors.dcOutput0; + case 1691876092: + return engine->dc_motors.isEnabled0; } return EFI_ERROR_CODE; } diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index a1c07084ba..4ce7f74f7e 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.f407-discovery.3187115958" + signature = "rusEFI master.2023.02.13.f407-discovery.2027205977" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.f407-discovery.3187115958" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.f407-discovery.2027205977" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:57 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:04:09 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5207,6 +5213,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5745,6 +5752,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 8f377bc276..9f2f60aa9a 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.48way.2063407728" + signature = "rusEFI master.2023.02.13.48way.3219007647" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.48way.2063407728" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.48way.3219007647" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:41 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:54 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5205,6 +5211,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5743,6 +5750,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 7f95ed71a9..ad91fd071d 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.alphax-2chan.2307424419" + signature = "rusEFI master.2023.02.13.alphax-2chan.1286320716" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.alphax-2chan.2307424419" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.alphax-2chan.1286320716" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:17 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:30 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5201,6 +5207,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5739,6 +5746,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 5622d74875..383f4a80d6 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.alphax-4chan.718351509" + signature = "rusEFI master.2023.02.13.alphax-4chan.4025622138" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.alphax-4chan.718351509" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.alphax-4chan.4025622138" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:18 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:31 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index cf4e7d7990..8fdd2e4266 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.alphax-8chan.2143602228" + signature = "rusEFI master.2023.02.13.alphax-8chan.3135763675" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.alphax-8chan.2143602228" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.alphax-8chan.3135763675" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:20 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:33 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 8fb28316ff..246815b132 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.atlas.3379719223" + signature = "rusEFI master.2023.02.13.atlas.206659288" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.atlas.3379719223" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.atlas.206659288" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:55 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:04:07 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5207,6 +5213,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5745,6 +5752,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index c940e2845d..e40c08d4bb 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.core8.100704124" + signature = "rusEFI master.2023.02.13.core8.3273895315" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.core8.100704124" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.core8.3273895315" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:40 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:53 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5205,6 +5211,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5743,6 +5750,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index eae3ae1ecb..4bfb71b6d7 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.cypress.3585644816" + signature = "rusEFI master.2023.02.13.cypress.278637567" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.cypress.3585644816" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.cypress.278637567" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 13 22:24:15 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 13 23:03:28 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5207,6 +5213,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5745,6 +5752,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 381296be47..60c188ae6d 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.f407-discovery.3187115958" + signature = "rusEFI master.2023.02.13.f407-discovery.2027205977" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.f407-discovery.3187115958" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.f407-discovery.2027205977" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:52 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:04:05 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5207,6 +5213,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5745,6 +5752,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 0a6afccda0..879d92dc19 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.f429-discovery.3585644816" + signature = "rusEFI master.2023.02.13.f429-discovery.278637567" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.f429-discovery.3585644816" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.f429-discovery.278637567" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:54 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:04:06 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5207,6 +5213,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5745,6 +5752,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 7aef534e72..dc63382283 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.frankenso_na6.4159338970" + signature = "rusEFI master.2023.02.13.frankenso_na6.852052789" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.frankenso_na6.4159338970" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.frankenso_na6.852052789" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:45 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:57 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5207,6 +5213,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5745,6 +5752,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 616dc0a9fd..70f3ba1675 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.harley81.4071697496" + signature = "rusEFI master.2023.02.13.harley81.932322999" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.harley81.4071697496" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.harley81.932322999" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:21 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:34 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 9328e7bd29..2ef77820cf 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.hellen-gm-e67.2864767895" + signature = "rusEFI master.2023.02.13.hellen-gm-e67.1877201272" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen-gm-e67.2864767895" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen-gm-e67.1877201272" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:34 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:46 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index a60ee4dba1..2cabef1d0e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.hellen-honda-k.256383394" + signature = "rusEFI master.2023.02.13.hellen-honda-k.3396021069" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen-honda-k.256383394" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen-honda-k.3396021069" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:26 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:39 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index aef5dcc3cb..21a574f9d2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.hellen-nb1.1063192977" + signature = "rusEFI master.2023.02.13.hellen-nb1.4202445694" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen-nb1.1063192977" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen-nb1.4202445694" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:32 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:45 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 332fa1a6e2..254e52fec1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.hellen121nissan.1801395085" + signature = "rusEFI master.2023.02.13.hellen121nissan.2927372642" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen121nissan.1801395085" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen121nissan.2927372642" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:25 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:37 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index b154ce57ce..f42dae8941 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.hellen121vag.1511841872" + signature = "rusEFI master.2023.02.13.hellen121vag.2671760063" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen121vag.1511841872" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen121vag.2671760063" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:23 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:36 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 311015cd99..fb6932c7e0 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.hellen128.1938783083" + signature = "rusEFI master.2023.02.13.hellen128.3064744324" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen128.1938783083" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen128.3064744324" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:22 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:35 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 9f1dfbe1a4..f99c1cf3db 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.hellen154hyundai.664940441" + signature = "rusEFI master.2023.02.13.hellen154hyundai.3800112502" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen154hyundai.664940441" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen154hyundai.3800112502" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:27 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:40 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 90deb8ad80..c08f665804 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.hellen72.1184804805" + signature = "rusEFI master.2023.02.13.hellen72.2210241834" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen72.1184804805" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen72.2210241834" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:30 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:43 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 43de95f9a9..bd69a2f36f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.hellen81.2474080845" + signature = "rusEFI master.2023.02.13.hellen81.1448364194" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen81.2474080845" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen81.1448364194" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:31 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:44 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5202,6 +5208,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5740,6 +5747,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 9dfca70041..3bbe9766a1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.hellen88bmw.3344809921" + signature = "rusEFI master.2023.02.13.hellen88bmw.41848110" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen88bmw.3344809921" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen88bmw.41848110" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:29 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:41 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 0f198c4fb4..40f4144ad5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.hellenNA6.3155829448" + signature = "rusEFI master.2023.02.13.hellenNA6.2033782823" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellenNA6.3155829448" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellenNA6.2033782823" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:35 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:47 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index d1040e1bfe..4628d136c9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.hellenNA8_96.3570115063" + signature = "rusEFI master.2023.02.13.hellenNA8_96.300454680" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellenNA8_96.3570115063" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellenNA8_96.300454680" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:36 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:49 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index dd59890f7b..2b0c7d368d 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.kin.3178183644" + signature = "rusEFI master.2023.02.13.kin.2018249011" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.kin.3178183644" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.kin.2018249011" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 13 22:24:14 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 13 23:03:27 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5207,6 +5213,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5745,6 +5752,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index eb89f0e57e..43f7b48c18 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.m74_9.171328555" + signature = "rusEFI master.2023.02.13.m74_9.3474290372" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.m74_9.171328555" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.m74_9.3474290372" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:43 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:55 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index c9d35eef72..85e8fe7d9e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.mre_f4.1896003811" + signature = "rusEFI master.2023.02.13.mre_f4.3022096908" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.mre_f4.1896003811" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.mre_f4.3022096908" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:39 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:51 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5205,6 +5211,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5743,6 +5750,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 70763426fb..66906e84c9 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.mre_f7.1896003811" + signature = "rusEFI master.2023.02.13.mre_f7.3022096908" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.mre_f7.1896003811" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.mre_f7.3022096908" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:38 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:50 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5205,6 +5211,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5743,6 +5750,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index a347a049c9..c7dc4a4798 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.prometheus_405.2236760310" + signature = "rusEFI master.2023.02.13.prometheus_405.1081176601" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.prometheus_405.2236760310" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.prometheus_405.1081176601" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:48 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:04:00 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5201,6 +5207,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5739,6 +5746,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 927943360e..3a6e931fd4 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.prometheus_469.2236760310" + signature = "rusEFI master.2023.02.13.prometheus_469.1081176601" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.prometheus_469.2236760310" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.prometheus_469.1081176601" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:46 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:59 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5201,6 +5207,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5739,6 +5746,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index d0a3f8d023..99c9ab2f6a 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.proteus_f4.4219404519" + signature = "rusEFI master.2023.02.13.proteus_f4.1046229512" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.proteus_f4.4219404519" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.proteus_f4.1046229512" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:50 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:04:02 UTC 2023 pageSize = 26432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 26422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5200,6 +5206,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5739,6 +5746,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 6147fa2a45..1c2a62f8cf 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.proteus_f7.4219404519" + signature = "rusEFI master.2023.02.13.proteus_f7.1046229512" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.proteus_f7.4219404519" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.proteus_f7.1046229512" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:49 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:04:01 UTC 2023 pageSize = 26432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 26422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5200,6 +5206,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5739,6 +5746,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index d3165fa31c..ef2fac36e0 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.proteus_h7.4219404519" + signature = "rusEFI master.2023.02.13.proteus_h7.1046229512" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.proteus_h7.4219404519" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.proteus_h7.1046229512" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:51 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:04:03 UTC 2023 pageSize = 26432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 26422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5200,6 +5206,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5739,6 +5746,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index e6fd3808e3..d75b485a9c 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.s105.1816641342" + signature = "rusEFI master.2023.02.13.s105.2841939409" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.s105.1816641342" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.s105.2841939409" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:44 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:56 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5204,6 +5210,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5742,6 +5749,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index fbc93c1a3e..477ffefe06 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.subaru_eg33_f7.2791689149" + signature = "rusEFI master.2023.02.13.subaru_eg33_f7.1665595730" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.subaru_eg33_f7.2791689149" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.subaru_eg33_f7.1665595730" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:16 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Feb 13 23:03:29 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5203,6 +5209,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5741,6 +5748,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 22c870f587..c53bdebcf6 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.tdg-pdm8.1595323698" + signature = "rusEFI master.2023.02.13.tdg-pdm8.2587199453" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.tdg-pdm8.1595323698" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.tdg-pdm8.2587199453" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:56 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:04:08 UTC 2023 pageSize = 22432 page = 1 @@ -2207,7 +2207,7 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1316 + ochBlockSize = 1324 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2938,6 +2938,9 @@ tempC = scalar, U16, 1308, "C", 1, 0 nernstVoltage = scalar, U16, 1310, "V", 0.001, 0 esr = scalar, U16, 1312, "", 1, 0 ; total TS size = 1316 +dcOutput0 = scalar, F32, 1316, "per", 1,0 +isEnabled0 = bits, U32, 1320, [0:0] +; total TS size = 1324 time = { timeNow } @@ -3958,6 +3961,7 @@ etbDutyRateOfChangeGauge = etbDutyRateOfChange,"ETB duty rate of change", "per", etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounterGauge = etbTpsErrorCounter,"ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounterGauge = etbPpsErrorCounter,"ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4873,6 +4877,8 @@ entry = pumpDuty, "pumpDuty", int, "%d" entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" +entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0, "isEnabled0", int, "%d" [Menu] @@ -5207,6 +5213,7 @@ menuDialog = main subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttleDialog, "electronic_throttle" subMenu = wideband_stateDialog, "wideband_state" + subMenu = dc_motorsDialog, "dc_motors" @@ -5745,6 +5752,14 @@ dialog = wideband_stateDialog, "wideband_state" graphLine = nernstVoltage graphLine = esr +indicatorPanel = dc_motorsIndicatorPanel, 2 + indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" + +dialog = dc_motorsDialog, "dc_motors" + panel = dc_motorsIndicatorPanel + liveGraph = dc_motors_1_Graph, "Graph", South + graphLine = dcOutput0 + dialog = scriptTable1TblSettings, "", yAxis 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 540f447919..d42ae623d6 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 @@ -1,6 +1,6 @@ #include "global.h" #include "live_data_ids.h" -// was generated automatically by rusEFI tool from live_data_ids.h // by enum2string.jar tool on Sun Jan 15 13:37:00 UTC 2023 +// was generated automatically by rusEFI tool from live_data_ids.h // by enum2string.jar tool on Mon Feb 13 23:03:26 UTC 2023 // see also gen_config_and_enums.bat @@ -13,6 +13,8 @@ case LDS_antilag_system_state: return "LDS_antilag_system_state"; case LDS_boost_control: return "LDS_boost_control"; +case LDS_dc_motors: + return "LDS_dc_motors"; case LDS_electronic_throttle: return "LDS_electronic_throttle"; case LDS_engine_state: 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 395ccf09d1..b102c5a4be 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 @@ -27,4 +27,5 @@ public enum live_data_e { LDS_idle_state, LDS_electronic_throttle, LDS_wideband_state, + LDS_dc_motors, } diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java index 2004bed6f9..0b626479a7 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/dc_motors.txt Mon Feb 13 17:54:48 EST 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/dc_motors.txt Mon Feb 13 23:03:26 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -404,8 +404,8 @@ public class DcMotors { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(812); - public static final Field ISENABLED0 = Field.create("ISENABLED0", 4, FieldType.BIT, 0).setBaseOffset(812); + public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1316); + public static final Field ISENABLED0 = Field.create("ISENABLED0", 4, FieldType.BIT, 0).setBaseOffset(1316); public static final Field[] VALUES = { DCOUTPUT0, ISENABLED0, 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 918aa6b15c..2a60171f55 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 22:24:59 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 23:04:11 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -997,6 +997,7 @@ public class Fields { public static final int sensor_chart_e_SC_RPM_ACCEL = 3; public static final int sensor_chart_e_SC_TRIGGER = 1; public static final int SENT_INPUT_COUNT = 1; + public static final int SIGNATURE_HASH = 2027205977; public static final int specs_s_size = 12; public static final int spi_device_e_SPI_DEVICE_1 = 1; public static final int spi_device_e_SPI_DEVICE_2 = 2; @@ -1206,10 +1207,10 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2023.02.13.f407-discovery.3187115958"; + public static final String TS_SIGNATURE = "rusEFI master.2023.02.13.f407-discovery.2027205977"; 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 = 1316; + public static final int TS_TOTAL_OUTPUT_SIZE = 1324; 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;