From 250d67c287a7e1ebee1949a8374fd68489cc50a0 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Mon, 13 Feb 2023 23:29:49 +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 | 1 + .../binary/generated/fancy_content.ini | 1 + firmware/console/binary/generated/gauges.ini | 1 + .../binary/generated/output_channels.ini | 5 +- .../console/binary/generated/sensors.java | 2 + .../generated/total_live_data_generated.h | 2 +- .../console/binary_log/log_fields_generated.h | 1 + .../actuators/dc_motors_generated.h | 144 ++++++++++-------- .../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 | 2 + firmware/tunerstudio/generated/rusefi.ini | 16 +- .../tunerstudio/generated/rusefi_48way.ini | 16 +- .../generated/rusefi_alphax-2chan.ini | 16 +- .../generated/rusefi_alphax-4chan.ini | 16 +- .../generated/rusefi_alphax-8chan.ini | 16 +- .../tunerstudio/generated/rusefi_atlas.ini | 16 +- .../tunerstudio/generated/rusefi_core8.ini | 16 +- .../tunerstudio/generated/rusefi_cypress.ini | 16 +- .../generated/rusefi_f407-discovery.ini | 16 +- .../generated/rusefi_f429-discovery.ini | 16 +- .../generated/rusefi_frankenso_na6.ini | 16 +- .../tunerstudio/generated/rusefi_harley81.ini | 16 +- .../generated/rusefi_hellen-gm-e67.ini | 16 +- .../generated/rusefi_hellen-honda-k.ini | 16 +- .../generated/rusefi_hellen-nb1.ini | 16 +- .../generated/rusefi_hellen121nissan.ini | 16 +- .../generated/rusefi_hellen121vag.ini | 16 +- .../generated/rusefi_hellen128mercedes.ini | 16 +- .../generated/rusefi_hellen154hyundai.ini | 16 +- .../tunerstudio/generated/rusefi_hellen72.ini | 16 +- .../tunerstudio/generated/rusefi_hellen81.ini | 16 +- .../generated/rusefi_hellen88bmw.ini | 16 +- .../generated/rusefi_hellenNA6.ini | 16 +- .../generated/rusefi_hellenNA8_96.ini | 16 +- firmware/tunerstudio/generated/rusefi_kin.ini | 16 +- .../tunerstudio/generated/rusefi_m74_9.ini | 16 +- .../tunerstudio/generated/rusefi_mre_f4.ini | 16 +- .../tunerstudio/generated/rusefi_mre_f7.ini | 16 +- .../generated/rusefi_prometheus_405.ini | 16 +- .../generated/rusefi_prometheus_469.ini | 16 +- .../generated/rusefi_proteus_f4.ini | 16 +- .../generated/rusefi_proteus_f7.ini | 16 +- .../generated/rusefi_proteus_h7.ini | 16 +- .../tunerstudio/generated/rusefi_s105.ini | 16 +- .../generated/rusefi_subaru_eg33_f7.ini | 16 +- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 16 +- .../com/rusefi/config/generated/DcMotors.java | 8 +- .../com/rusefi/config/generated/Fields.java | 8 +- 86 files changed, 542 insertions(+), 373 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 21036b4a8e..1cd580289f 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 278637567 +#define SIGNATURE_HASH 422438868 #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.278637567" +#define TS_SIGNATURE "rusEFI master.2023.02.13.cypress.422438868" #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 1324 +#define TS_TOTAL_OUTPUT_SIZE 1328 #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 2e32ba82b0..6220dd21f8 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 2018249011 +#define SIGNATURE_HASH 1912227096 #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.2018249011" +#define TS_SIGNATURE "rusEFI master.2023.02.13.kin.1912227096" #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 1324 +#define TS_TOTAL_OUTPUT_SIZE 1328 #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 bb1eb499d5..7235e1ef49 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 1665595730 +#define SIGNATURE_HASH 1794159993 #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.1665595730" +#define TS_SIGNATURE "rusEFI master.2023.02.13.subaru_eg33_f7.1794159993" #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 1324 +#define TS_TOTAL_OUTPUT_SIZE 1328 #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 3871fec603..9a6181a8c0 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -533,4 +533,5 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index db8102ae02..1f34680b4f 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -367,4 +367,5 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 4c7311f327..c4de78332a 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -28,3 +28,4 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 89b4ec32ce..91b97e6a50 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -719,5 +719,6 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 7192bf64f2..63605c9d01 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -513,3 +513,5 @@ nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 13 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"), +isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1320, 1.0, 0.0, 10.0, "per"), +alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1321, 1.0, -20.0, 100.0, "units"), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index c8a5b611ab..f0fe8aceb1 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 1324 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1328 \ 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 e76947b4e9..297af2798e 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -326,4 +326,5 @@ static constexpr LogField fields[] = { {engine->triggerCentral.triggerToothAngleError, "triggerToothAngleError", "deg", 2}, {engine->triggerCentral.triggerIgnoredToothCount, "triggerIgnoredToothCount", "", 0}, {engine->dc_motors.dcOutput0, "DC: output0", "per", 2, "ETB more"}, + {engine->dc_motors.isEnabled0_int, "DC: en0", "per", 2, "ETB more"}, }; diff --git a/firmware/controllers/actuators/dc_motors_generated.h b/firmware/controllers/actuators/dc_motors_generated.h index cb963e5b3b..b99c26a8a5 100644 --- a/firmware/controllers/actuators/dc_motors_generated.h +++ b/firmware/controllers/actuators/dc_motors_generated.h @@ -1,4 +1,4 @@ -// this section 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 section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/dc_motors.txt Mon Feb 13 23:29:03 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -12,103 +12,115 @@ struct dc_motors_s { */ float dcOutput0 = (float)0; /** - offset 4 bit 0 */ + * "DC: en0" + per + * offset 4 + */ + uint8_t isEnabled0_int = (uint8_t)0; + /** + * need 4 byte alignment + units + * offset 5 + */ + uint8_t alignmentFill_at_5[3]; + /** + offset 8 bit 0 */ bool isEnabled0 : 1 {}; /** - offset 4 bit 1 */ - bool unusedBit_2_1 : 1 {}; + offset 8 bit 1 */ + bool unusedBit_4_1 : 1 {}; /** - offset 4 bit 2 */ - bool unusedBit_2_2 : 1 {}; + offset 8 bit 2 */ + bool unusedBit_4_2 : 1 {}; /** - offset 4 bit 3 */ - bool unusedBit_2_3 : 1 {}; + offset 8 bit 3 */ + bool unusedBit_4_3 : 1 {}; /** - offset 4 bit 4 */ - bool unusedBit_2_4 : 1 {}; + offset 8 bit 4 */ + bool unusedBit_4_4 : 1 {}; /** - offset 4 bit 5 */ - bool unusedBit_2_5 : 1 {}; + offset 8 bit 5 */ + bool unusedBit_4_5 : 1 {}; /** - offset 4 bit 6 */ - bool unusedBit_2_6 : 1 {}; + offset 8 bit 6 */ + bool unusedBit_4_6 : 1 {}; /** - offset 4 bit 7 */ - bool unusedBit_2_7 : 1 {}; + offset 8 bit 7 */ + bool unusedBit_4_7 : 1 {}; /** - offset 4 bit 8 */ - bool unusedBit_2_8 : 1 {}; + offset 8 bit 8 */ + bool unusedBit_4_8 : 1 {}; /** - offset 4 bit 9 */ - bool unusedBit_2_9 : 1 {}; + offset 8 bit 9 */ + bool unusedBit_4_9 : 1 {}; /** - offset 4 bit 10 */ - bool unusedBit_2_10 : 1 {}; + offset 8 bit 10 */ + bool unusedBit_4_10 : 1 {}; /** - offset 4 bit 11 */ - bool unusedBit_2_11 : 1 {}; + offset 8 bit 11 */ + bool unusedBit_4_11 : 1 {}; /** - offset 4 bit 12 */ - bool unusedBit_2_12 : 1 {}; + offset 8 bit 12 */ + bool unusedBit_4_12 : 1 {}; /** - offset 4 bit 13 */ - bool unusedBit_2_13 : 1 {}; + offset 8 bit 13 */ + bool unusedBit_4_13 : 1 {}; /** - offset 4 bit 14 */ - bool unusedBit_2_14 : 1 {}; + offset 8 bit 14 */ + bool unusedBit_4_14 : 1 {}; /** - offset 4 bit 15 */ - bool unusedBit_2_15 : 1 {}; + offset 8 bit 15 */ + bool unusedBit_4_15 : 1 {}; /** - offset 4 bit 16 */ - bool unusedBit_2_16 : 1 {}; + offset 8 bit 16 */ + bool unusedBit_4_16 : 1 {}; /** - offset 4 bit 17 */ - bool unusedBit_2_17 : 1 {}; + offset 8 bit 17 */ + bool unusedBit_4_17 : 1 {}; /** - offset 4 bit 18 */ - bool unusedBit_2_18 : 1 {}; + offset 8 bit 18 */ + bool unusedBit_4_18 : 1 {}; /** - offset 4 bit 19 */ - bool unusedBit_2_19 : 1 {}; + offset 8 bit 19 */ + bool unusedBit_4_19 : 1 {}; /** - offset 4 bit 20 */ - bool unusedBit_2_20 : 1 {}; + offset 8 bit 20 */ + bool unusedBit_4_20 : 1 {}; /** - offset 4 bit 21 */ - bool unusedBit_2_21 : 1 {}; + offset 8 bit 21 */ + bool unusedBit_4_21 : 1 {}; /** - offset 4 bit 22 */ - bool unusedBit_2_22 : 1 {}; + offset 8 bit 22 */ + bool unusedBit_4_22 : 1 {}; /** - offset 4 bit 23 */ - bool unusedBit_2_23 : 1 {}; + offset 8 bit 23 */ + bool unusedBit_4_23 : 1 {}; /** - offset 4 bit 24 */ - bool unusedBit_2_24 : 1 {}; + offset 8 bit 24 */ + bool unusedBit_4_24 : 1 {}; /** - offset 4 bit 25 */ - bool unusedBit_2_25 : 1 {}; + offset 8 bit 25 */ + bool unusedBit_4_25 : 1 {}; /** - offset 4 bit 26 */ - bool unusedBit_2_26 : 1 {}; + offset 8 bit 26 */ + bool unusedBit_4_26 : 1 {}; /** - offset 4 bit 27 */ - bool unusedBit_2_27 : 1 {}; + offset 8 bit 27 */ + bool unusedBit_4_27 : 1 {}; /** - offset 4 bit 28 */ - bool unusedBit_2_28 : 1 {}; + offset 8 bit 28 */ + bool unusedBit_4_28 : 1 {}; /** - offset 4 bit 29 */ - bool unusedBit_2_29 : 1 {}; + offset 8 bit 29 */ + bool unusedBit_4_29 : 1 {}; /** - offset 4 bit 30 */ - bool unusedBit_2_30 : 1 {}; + offset 8 bit 30 */ + bool unusedBit_4_30 : 1 {}; /** - offset 4 bit 31 */ - bool unusedBit_2_31 : 1 {}; + offset 8 bit 31 */ + bool unusedBit_4_31 : 1 {}; }; -static_assert(sizeof(dc_motors_s) == 8); +static_assert(sizeof(dc_motors_s) == 12); // end -// this section 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 section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/dc_motors.txt Mon Feb 13 23:29:03 UTC 2023 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index d26510a90e..a3ee374c17 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 2027205977 +#define SIGNATURE_HASH 1902311794 #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.2027205977" +#define TS_SIGNATURE "rusEFI master.2023.02.13.f407-discovery.1902311794" #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 1324 +#define TS_TOTAL_OUTPUT_SIZE 1328 #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 9f302e7eea..2943b3540f 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 3219007647 -#define TS_SIGNATURE "rusEFI master.2023.02.13.48way.3219007647" +#define SIGNATURE_HASH 3060294836 +#define TS_SIGNATURE "rusEFI master.2023.02.13.48way.3060294836" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 286dcfa5ad..1a51e6dd57 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 1286320716 -#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-2chan.1286320716" +#define SIGNATURE_HASH 1159593575 +#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-2chan.1159593575" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 0506028319..3c87336117 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 4025622138 -#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-4chan.4025622138" +#define SIGNATURE_HASH 3863237201 +#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-4chan.3863237201" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index df6fc79e86..6b845ea056 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 3135763675 -#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-8chan.3135763675" +#define SIGNATURE_HASH 3008477424 +#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-8chan.3008477424" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 778ac4e00a..0049255446 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 206659288 -#define TS_SIGNATURE "rusEFI master.2023.02.13.atlas.206659288" +#define SIGNATURE_HASH 99029747 +#define TS_SIGNATURE "rusEFI master.2023.02.13.atlas.99029747" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 7f63ac7e90..354b414d2c 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 3273895315 -#define TS_SIGNATURE "rusEFI master.2023.02.13.core8.3273895315" +#define SIGNATURE_HASH 3398820280 +#define TS_SIGNATURE "rusEFI master.2023.02.13.core8.3398820280" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 4d72a65d77..a9a314f7b8 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 278637567 -#define TS_SIGNATURE "rusEFI master.2023.02.13.cypress.278637567" +#define SIGNATURE_HASH 422438868 +#define TS_SIGNATURE "rusEFI master.2023.02.13.cypress.422438868" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index f7d5989628..69355752d6 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 2027205977 -#define TS_SIGNATURE "rusEFI master.2023.02.13.f407-discovery.2027205977" +#define SIGNATURE_HASH 1902311794 +#define TS_SIGNATURE "rusEFI master.2023.02.13.f407-discovery.1902311794" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index e2b0ac8b1f..c47d1750f9 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 278637567 -#define TS_SIGNATURE "rusEFI master.2023.02.13.f429-discovery.278637567" +#define SIGNATURE_HASH 422438868 +#define TS_SIGNATURE "rusEFI master.2023.02.13.f429-discovery.422438868" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 1216298456..848f20746b 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 852052789 -#define TS_SIGNATURE "rusEFI master.2023.02.13.frankenso_na6.852052789" +#define SIGNATURE_HASH 998180638 +#define TS_SIGNATURE "rusEFI master.2023.02.13.frankenso_na6.998180638" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 4cd7d843fb..38b6501885 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 932322999 -#define TS_SIGNATURE "rusEFI master.2023.02.13.harley81.932322999" +#define SIGNATURE_HASH 1042567836 +#define TS_SIGNATURE "rusEFI master.2023.02.13.harley81.1042567836" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 6b1a41bf16..01883ed929 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 1877201272 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-gm-e67.1877201272" +#define SIGNATURE_HASH 1716886867 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-gm-e67.1716886867" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 3b01c6cd56..a3c41c5a25 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 3396021069 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-honda-k.3396021069" +#define SIGNATURE_HASH 3286067046 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-honda-k.3286067046" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index d3062e3b52..1781b28585 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 4202445694 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-nb1.4202445694" +#define SIGNATURE_HASH 4090132309 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-nb1.4090132309" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 94ae0f4920..a13546c73f 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 2927372642 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen121nissan.2927372642" +#define SIGNATURE_HASH 2815059273 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen121nissan.2815059273" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 393b047ff9..cbf2deba06 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 2671760063 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen121vag.2671760063" +#define SIGNATURE_HASH 2525601428 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen121vag.2525601428" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index b66bf7ecbc..a7b41b8b66 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 3064744324 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen128.3064744324" +#define SIGNATURE_HASH 3206153647 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen128.3206153647" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index f2f2fcd20e..4dcd146b7d 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 3800112502 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen154hyundai.3800112502" +#define SIGNATURE_HASH 3946271069 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen154hyundai.3946271069" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 9497e4f6c6..c909944406 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 2210241834 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen72.2210241834" +#define SIGNATURE_HASH 2316030209 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen72.2316030209" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 0fb69f8e35..8955a2e8fa 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 1448364194 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen81.1448364194" +#define SIGNATURE_HASH 1608647817 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen81.1608647817" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 25b38420b1..e9465735cf 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 41848110 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen88bmw.41848110" +#define SIGNATURE_HASH 197705989 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen88bmw.197705989" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 19180bb8d3..a433364e84 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 2033782823 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellenNA6.2033782823" +#define SIGNATURE_HASH 1888443404 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellenNA6.1888443404" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index f07ccc53f4..83a3154383 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 300454680 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellenNA8_96.300454680" +#define SIGNATURE_HASH 408870707 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellenNA8_96.408870707" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 17cd9792db..fe6b921c49 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 2018249011 -#define TS_SIGNATURE "rusEFI master.2023.02.13.kin.2018249011" +#define SIGNATURE_HASH 1912227096 +#define TS_SIGNATURE "rusEFI master.2023.02.13.kin.1912227096" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 77940efe51..802fd1f52b 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 3474290372 -#define TS_SIGNATURE "rusEFI master.2023.02.13.m74_9.3474290372" +#define SIGNATURE_HASH 3332586223 +#define TS_SIGNATURE "rusEFI master.2023.02.13.m74_9.3332586223" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 435c638b85..163f901014 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 3022096908 -#define TS_SIGNATURE "rusEFI master.2023.02.13.mre_f4.3022096908" +#define SIGNATURE_HASH 3180840487 +#define TS_SIGNATURE "rusEFI master.2023.02.13.mre_f4.3180840487" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 4bbfc91c61..6fb5398680 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 3022096908 -#define TS_SIGNATURE "rusEFI master.2023.02.13.mre_f7.3022096908" +#define SIGNATURE_HASH 3180840487 +#define TS_SIGNATURE "rusEFI master.2023.02.13.mre_f7.3180840487" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index bc07a6bb1b..560a3bb079 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 1081176601 -#define TS_SIGNATURE "rusEFI master.2023.02.13.prometheus_405.1081176601" +#define SIGNATURE_HASH 1237794354 +#define TS_SIGNATURE "rusEFI master.2023.02.13.prometheus_405.1237794354" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 9f5e3c95aa..c52d0cfbd1 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 1081176601 -#define TS_SIGNATURE "rusEFI master.2023.02.13.prometheus_469.1081176601" +#define SIGNATURE_HASH 1237794354 +#define TS_SIGNATURE "rusEFI master.2023.02.13.prometheus_469.1237794354" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 15bbeb978b..802cfb2426 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 1046229512 -#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_f4.1046229512" +#define SIGNATURE_HASH 938114595 +#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_f4.938114595" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 9ec5af0264..08f7e200b9 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 1046229512 -#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_f7.1046229512" +#define SIGNATURE_HASH 938114595 +#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_f7.938114595" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index bc65d22b53..28ee6bd93d 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 1046229512 -#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_h7.1046229512" +#define SIGNATURE_HASH 938114595 +#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_h7.938114595" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index ca4ec17f9b..25a9e54fb9 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 2841939409 -#define TS_SIGNATURE "rusEFI master.2023.02.13.s105.2841939409" +#define SIGNATURE_HASH 2698166778 +#define TS_SIGNATURE "rusEFI master.2023.02.13.s105.2698166778" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index e0863c7856..39732b84e8 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 1665595730 -#define TS_SIGNATURE "rusEFI master.2023.02.13.subaru_eg33_f7.1665595730" +#define SIGNATURE_HASH 1794159993 +#define TS_SIGNATURE "rusEFI master.2023.02.13.subaru_eg33_f7.1794159993" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index bf3125d918..f38f4fe07c 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 2587199453 -#define TS_SIGNATURE "rusEFI master.2023.02.13.tdg-pdm8.2587199453" +#define SIGNATURE_HASH 2474888182 +#define TS_SIGNATURE "rusEFI master.2023.02.13.tdg-pdm8.2474888182" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 329a31b1b1..61ddc45e91 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -671,6 +671,8 @@ float getOutputValueByName(const char *name) { return engine->triggerCentral.triggerIgnoredToothCount; case 1242329357: return engine->dc_motors.dcOutput0; + case -1236599226: + return engine->dc_motors.isEnabled0_int; case 1691876092: return engine->dc_motors.isEnabled0; } diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 4ce7f74f7e..dffa1f0c1e 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.2027205977" + signature = "rusEFI master.2023.02.13.f407-discovery.1902311794" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.f407-discovery.2027205977" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.f407-discovery.1902311794" ; 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 23:04:09 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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5759,6 +5762,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 9f2f60aa9a..25eb151321 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.3219007647" + signature = "rusEFI master.2023.02.13.48way.3060294836" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.48way.3219007647" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.48way.3060294836" ; 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 23:03: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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5757,6 +5760,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index ad91fd071d..2f8fc5520c 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.1286320716" + signature = "rusEFI master.2023.02.13.alphax-2chan.1159593575" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.alphax-2chan.1286320716" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.alphax-2chan.1159593575" ; 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 23:03: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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5753,6 +5756,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 383f4a80d6..c87ff413cf 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.4025622138" + signature = "rusEFI master.2023.02.13.alphax-4chan.3863237201" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.alphax-4chan.4025622138" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.alphax-4chan.3863237201" ; 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 23:03: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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 8fdd2e4266..1c44cf81d2 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.3135763675" + signature = "rusEFI master.2023.02.13.alphax-8chan.3008477424" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.alphax-8chan.3135763675" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.alphax-8chan.3008477424" ; 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 23:03:33 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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 246815b132..ddb545a18d 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.206659288" + signature = "rusEFI master.2023.02.13.atlas.99029747" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.atlas.206659288" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.atlas.99029747" ; 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 23:04:07 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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5759,6 +5762,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index e40c08d4bb..b18debb16f 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.3273895315" + signature = "rusEFI master.2023.02.13.core8.3398820280" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.core8.3273895315" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.core8.3398820280" ; 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 23:03:53 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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5757,6 +5760,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 4bfb71b6d7..6f5983793d 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.278637567" + signature = "rusEFI master.2023.02.13.cypress.422438868" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.cypress.278637567" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.cypress.422438868" ; 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 23:03:28 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:29:04 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5759,6 +5762,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 60c188ae6d..1a5161b057 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.2027205977" + signature = "rusEFI master.2023.02.13.f407-discovery.1902311794" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.f407-discovery.2027205977" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.f407-discovery.1902311794" ; 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 23:04:05 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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5759,6 +5762,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 879d92dc19..247a4b0a0a 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.278637567" + signature = "rusEFI master.2023.02.13.f429-discovery.422438868" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.f429-discovery.278637567" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.f429-discovery.422438868" ; 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 23:04:06 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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5759,6 +5762,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index dc63382283..0f2f0cfccb 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.852052789" + signature = "rusEFI master.2023.02.13.frankenso_na6.998180638" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.frankenso_na6.852052789" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.frankenso_na6.998180638" ; 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 23:03: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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5759,6 +5762,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 70f3ba1675..7e9d00c45b 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.932322999" + signature = "rusEFI master.2023.02.13.harley81.1042567836" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.harley81.932322999" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.harley81.1042567836" ; 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 23:03: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:29:10 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 2ef77820cf..6199b7f4b0 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.1877201272" + signature = "rusEFI master.2023.02.13.hellen-gm-e67.1716886867" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen-gm-e67.1877201272" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen-gm-e67.1716886867" ; 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 23:03: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:29:22 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 2cabef1d0e..5659d36261 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.3396021069" + signature = "rusEFI master.2023.02.13.hellen-honda-k.3286067046" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen-honda-k.3396021069" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen-honda-k.3286067046" ; 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 23:03: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:29:15 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 21a574f9d2..e26c0b05ad 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.4202445694" + signature = "rusEFI master.2023.02.13.hellen-nb1.4090132309" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen-nb1.4202445694" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen-nb1.4090132309" ; 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 23:03: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:29:21 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 254e52fec1..2e24087add 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.2927372642" + signature = "rusEFI master.2023.02.13.hellen121nissan.2815059273" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen121nissan.2927372642" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen121nissan.2815059273" ; 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 23:03:37 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:29:14 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index f42dae8941..0ed6adc224 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.2671760063" + signature = "rusEFI master.2023.02.13.hellen121vag.2525601428" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen121vag.2671760063" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen121vag.2525601428" ; 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 23:03: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:29:13 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index fb6932c7e0..99ee970f78 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.3064744324" + signature = "rusEFI master.2023.02.13.hellen128.3206153647" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen128.3064744324" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen128.3206153647" ; 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 23:03: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:29:11 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index f99c1cf3db..4231182e9d 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.3800112502" + signature = "rusEFI master.2023.02.13.hellen154hyundai.3946271069" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen154hyundai.3800112502" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen154hyundai.3946271069" ; 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 23:03: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:29:16 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index c08f665804..d7588b4ac9 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.2210241834" + signature = "rusEFI master.2023.02.13.hellen72.2316030209" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen72.2210241834" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen72.2316030209" ; 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 23:03: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:29:19 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index bd69a2f36f..d6be82f10d 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.1448364194" + signature = "rusEFI master.2023.02.13.hellen81.1608647817" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen81.1448364194" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen81.1608647817" ; 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 23:03: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:29:20 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5754,6 +5757,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 3bbe9766a1..79b6330d64 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.41848110" + signature = "rusEFI master.2023.02.13.hellen88bmw.197705989" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen88bmw.41848110" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen88bmw.197705989" ; 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 23:03: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:29:18 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 40f4144ad5..27205e5771 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.2033782823" + signature = "rusEFI master.2023.02.13.hellenNA6.1888443404" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellenNA6.2033782823" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellenNA6.1888443404" ; 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 23:03:47 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:29:24 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 4628d136c9..4cba2f8656 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.300454680" + signature = "rusEFI master.2023.02.13.hellenNA8_96.408870707" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellenNA8_96.300454680" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellenNA8_96.408870707" ; 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 23:03: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:29:25 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 2b0c7d368d..17f25956a9 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.2018249011" + signature = "rusEFI master.2023.02.13.kin.1912227096" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.kin.2018249011" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.kin.1912227096" ; 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 23:03:27 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:29:03 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5759,6 +5762,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 43f7b48c18..bf9b50fb69 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.3474290372" + signature = "rusEFI master.2023.02.13.m74_9.3332586223" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.m74_9.3474290372" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.m74_9.3332586223" ; 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 23:03: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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 85e8fe7d9e..8cb474ca0a 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.3022096908" + signature = "rusEFI master.2023.02.13.mre_f4.3180840487" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.mre_f4.3022096908" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.mre_f4.3180840487" ; 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 23:03: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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5757,6 +5760,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 66906e84c9..b31b842f64 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.3022096908" + signature = "rusEFI master.2023.02.13.mre_f7.3180840487" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.mre_f7.3022096908" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.mre_f7.3180840487" ; 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 23:03: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:29:26 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5757,6 +5760,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index c7dc4a4798..d598ad9111 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.1081176601" + signature = "rusEFI master.2023.02.13.prometheus_405.1237794354" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.prometheus_405.1081176601" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.prometheus_405.1237794354" ; 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 23:04:00 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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5753,6 +5756,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 3a6e931fd4..ea0694c5d1 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.1081176601" + signature = "rusEFI master.2023.02.13.prometheus_469.1237794354" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.prometheus_469.1081176601" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.prometheus_469.1237794354" ; 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 23:03:59 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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5753,6 +5756,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 99c9ab2f6a..45d42cfa3e 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.1046229512" + signature = "rusEFI master.2023.02.13.proteus_f4.938114595" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.proteus_f4.1046229512" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.proteus_f4.938114595" ; 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 23:04:02 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:29:38 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5753,6 +5756,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 1c2a62f8cf..ecb453c605 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.1046229512" + signature = "rusEFI master.2023.02.13.proteus_f7.938114595" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.proteus_f7.1046229512" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.proteus_f7.938114595" ; 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 23:04:01 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:29:37 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5753,6 +5756,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index ef2fac36e0..0839fedacf 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.1046229512" + signature = "rusEFI master.2023.02.13.proteus_h7.938114595" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.proteus_h7.1046229512" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.proteus_h7.938114595" ; 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 23:04:03 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:29:39 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5753,6 +5756,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index d75b485a9c..ae8f5888a2 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.2841939409" + signature = "rusEFI master.2023.02.13.s105.2698166778" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.s105.2841939409" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.s105.2698166778" ; 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 23:03: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:29:32 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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5756,6 +5759,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 477ffefe06..91a2b761ba 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.1665595730" + signature = "rusEFI master.2023.02.13.subaru_eg33_f7.1794159993" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.subaru_eg33_f7.1665595730" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.subaru_eg33_f7.1794159993" ; 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 23:03:29 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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5755,6 +5758,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index c53bdebcf6..145449b5e8 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.2587199453" + signature = "rusEFI master.2023.02.13.tdg-pdm8.2474888182" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.tdg-pdm8.2587199453" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.tdg-pdm8.2474888182" ; 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 23:04:08 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:29: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 = 1324 + ochBlockSize = 1328 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2939,8 +2939,9 @@ 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 +isEnabled0_int = scalar, U08, 1320, "per", 1,0 +isEnabled0 = bits, U32, 1324, [0:0] +; total TS size = 1328 time = { timeNow } @@ -3962,6 +3963,7 @@ etbDutyAverageGauge = etbDutyAverage,"ETB average duty", "per", -20.0,50.0, -20. 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 +isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = Trigger @@ -4878,6 +4880,7 @@ entry = tempC, "tempC", int, "%d" entry = nernstVoltage, "nernstVoltage", float, "%.3f" entry = esr, "esr", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" +entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5759,6 +5762,7 @@ dialog = dc_motorsDialog, "dc_motors" panel = dc_motorsIndicatorPanel liveGraph = dc_motors_1_Graph, "Graph", South graphLine = dcOutput0 + graphLine = isEnabled0_int 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 0b626479a7..f41470a61c 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 23:03:26 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/dc_motors.txt Mon Feb 13 23:29:03 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -405,9 +405,13 @@ public class DcMotors { 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(1316); - public static final Field ISENABLED0 = Field.create("ISENABLED0", 4, FieldType.BIT, 0).setBaseOffset(1316); + public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1316); + public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1316); + public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1316); public static final Field[] VALUES = { DCOUTPUT0, + ISENABLED0_INT, + ALIGNMENTFILL_AT_5, 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 2a60171f55..c5729cf68e 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 23:04:11 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:29:47 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -997,7 +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 SIGNATURE_HASH = 1902311794; 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; @@ -1207,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.2027205977"; + public static final String TS_SIGNATURE = "rusEFI master.2023.02.13.f407-discovery.1902311794"; 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 = 1324; + public static final int TS_TOTAL_OUTPUT_SIZE = 1328; 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;