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 92ad433015..2117f14c64 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1027,7 +1027,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_43501 +#define SIGNATURE_HASH snap_2229 #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 @@ -1301,12 +1301,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.12.01.cypress.snap_43501" +#define TS_SIGNATURE "rusEFI 2022.12.01.cypress.snap_2229" #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 1272 +#define TS_TOTAL_OUTPUT_SIZE 1276 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 7d4e365551..23e7ba9500 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1027,7 +1027,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_2849 +#define SIGNATURE_HASH snap_43641 #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 @@ -1301,12 +1301,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.12.01.kin.snap_2849" +#define TS_SIGNATURE "rusEFI 2022.12.01.kin.snap_43641" #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 1272 +#define TS_TOTAL_OUTPUT_SIZE 1276 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index fd5d10dc02..50259bd4ef 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -993,7 +993,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH snap_28727 +#define SIGNATURE_HASH snap_53615 #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 @@ -1268,12 +1268,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.12.01.subaru_eg33_f7.snap_28727" +#define TS_SIGNATURE "rusEFI 2022.12.01.subaru_eg33_f7.snap_53615" #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 1272 +#define TS_TOTAL_OUTPUT_SIZE 1276 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 4c2c45d4dc..3f8f45e921 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -493,7 +493,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index b9bd6eaff5..895a46f82f 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -316,7 +316,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index ce981a4b91..e0086934e0 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -44,4 +44,4 @@ LDS_wideband_state, #define IDLE_STATE_BASE_ADDRESS 1160 #define IGNITION_STATE_BASE_ADDRESS 1200 #define ELECTRONIC_THROTTLE_BASE_ADDRESS 1216 -#define WIDEBAND_STATE_BASE_ADDRESS 1260 +#define WIDEBAND_STATE_BASE_ADDRESS 1264 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 43aa85f01d..9d275f67af 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -679,13 +679,14 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index f24a4dd60c..a1189ec8d3 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -484,14 +484,15 @@ etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1240, 1.0, -10000.0, 10000.0, "%"), etbDutyRateOfChange("etbDutyRateOfChange", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1248, 1.0, -1.0, -1.0, ""), etbDutyAverage("etbDutyAverage", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1252, 1.0, -1.0, -1.0, ""), -etbInputErrorCounter("ETB inputs error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1256, 1.0, -1.0, -1.0, ""), -etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1258, 1.0, -1.0, -1.0, ""), -alignmentFill_at_43("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1259, 1.0, -20.0, 100.0, "units"), -faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1260, 1.0, -1.0, -1.0, ""), -heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1261, 1.0, 0.0, 100.0, "%"), -pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1262, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1263, 1.0, -20.0, 100.0, "units"), -tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1264, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1266, 0.001, 0.0, 1.0, "V"), -esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1268, 1.0, -1.0, -1.0, ""), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1270, 1.0, -20.0, 100.0, "units"), +etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1256, 1.0, -1.0, -1.0, ""), +etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1258, 1.0, -1.0, -1.0, ""), +etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1260, 1.0, -1.0, -1.0, ""), +alignmentFill_at_45("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1261, 1.0, -20.0, 100.0, "units"), +faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1264, 1.0, -1.0, -1.0, ""), +heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1265, 1.0, 0.0, 100.0, "%"), +pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1266, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1267, 1.0, -20.0, 100.0, "units"), +tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1268, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1270, 0.001, 0.0, 1.0, "V"), +esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1272, 1.0, -1.0, -1.0, ""), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1274, 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 25a1456397..0662ead96a 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 1272 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1276 \ No newline at end of file diff --git a/firmware/controllers/actuators/electronic_throttle_generated.h b/firmware/controllers/actuators/electronic_throttle_generated.h index 55494a1e2d..33f9623a8e 100644 --- a/firmware/controllers/actuators/electronic_throttle_generated.h +++ b/firmware/controllers/actuators/electronic_throttle_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Wed Nov 30 03:24:57 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Thu Dec 01 03:34:59 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -143,22 +143,27 @@ struct electronic_throttle_s { */ float etbDutyAverage = (float)0; /** - * "ETB inputs error counter" + * "ETB TPS error counter" * offset 40 */ - uint16_t etbInputErrorCounter = (uint16_t)0; + uint16_t etbTpsErrorCounter = (uint16_t)0; /** + * "ETB pedal error counter" * offset 42 */ + uint16_t etbPpsErrorCounter = (uint16_t)0; + /** + * offset 44 + */ int8_t etbErrorCode = (int8_t)0; /** * need 4 byte alignment units - * offset 43 + * offset 45 */ - uint8_t alignmentFill_at_43[1]; + uint8_t alignmentFill_at_45[3]; }; -static_assert(sizeof(electronic_throttle_s) == 44); +static_assert(sizeof(electronic_throttle_s) == 48); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Wed Nov 30 03:24:57 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Thu Dec 01 03:34:59 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 39f7bf3824..7f5e899b21 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1027,7 +1027,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_43501 +#define SIGNATURE_HASH snap_2229 #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 @@ -1301,12 +1301,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.12.01.all.snap_43501" +#define TS_SIGNATURE "rusEFI 2022.12.01.all.snap_2229" #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 1272 +#define TS_TOTAL_OUTPUT_SIZE 1276 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 98c3a80da9..abcd6defbb 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_41378 -#define TS_SIGNATURE "rusEFI 2022.12.01.48way.snap_41378" +#define SIGNATURE_HASH snap_250 +#define TS_SIGNATURE "rusEFI 2022.12.01.48way.snap_250" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 372e38ac57..d3d29ec933 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_43501 -#define TS_SIGNATURE "rusEFI 2022.12.01.all.snap_43501" +#define SIGNATURE_HASH snap_2229 +#define TS_SIGNATURE "rusEFI 2022.12.01.all.snap_2229" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 91f8d0e0c7..50ad976401 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_13441 -#define TS_SIGNATURE "rusEFI 2022.12.01.alphax-2chan.snap_13441" +#define SIGNATURE_HASH snap_38361 +#define TS_SIGNATURE "rusEFI 2022.12.01.alphax-2chan.snap_38361" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 31885c9a51..c103e7e823 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_27234 -#define TS_SIGNATURE "rusEFI 2022.12.01.alphax-4chan.snap_27234" +#define SIGNATURE_HASH snap_52026 +#define TS_SIGNATURE "rusEFI 2022.12.01.alphax-4chan.snap_52026" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 48b91691a3..a7f7260700 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_23754 -#define TS_SIGNATURE "rusEFI 2022.12.01.atlas.snap_23754" +#define SIGNATURE_HASH snap_64914 +#define TS_SIGNATURE "rusEFI 2022.12.01.atlas.snap_64914" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 967387fc4f..635c0a9d0c 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_63508 -#define TS_SIGNATURE "rusEFI 2022.12.01.core8.snap_63508" +#define SIGNATURE_HASH snap_22860 +#define TS_SIGNATURE "rusEFI 2022.12.01.core8.snap_22860" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index f72812f6f2..eb02448011 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH snap_43501 -#define TS_SIGNATURE "rusEFI 2022.12.01.cypress.snap_43501" +#define SIGNATURE_HASH snap_2229 +#define TS_SIGNATURE "rusEFI 2022.12.01.cypress.snap_2229" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index e881b39249..6d825ad0e6 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_43501 -#define TS_SIGNATURE "rusEFI 2022.12.01.f407-discovery.snap_43501" +#define SIGNATURE_HASH snap_2229 +#define TS_SIGNATURE "rusEFI 2022.12.01.f407-discovery.snap_2229" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index b0ecad2bc3..06a7806525 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_43501 -#define TS_SIGNATURE "rusEFI 2022.12.01.f429-discovery.snap_43501" +#define SIGNATURE_HASH snap_2229 +#define TS_SIGNATURE "rusEFI 2022.12.01.f429-discovery.snap_2229" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 17b5097b74..33dd7e78b6 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_21801 -#define TS_SIGNATURE "rusEFI 2022.12.01.frankenso_na6.snap_21801" +#define SIGNATURE_HASH snap_62577 +#define TS_SIGNATURE "rusEFI 2022.12.01.frankenso_na6.snap_62577" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index a92c28f3c5..7e65410d7b 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_61202 -#define TS_SIGNATURE "rusEFI 2022.12.01.harley81.snap_61202" +#define SIGNATURE_HASH snap_20042 +#define TS_SIGNATURE "rusEFI 2022.12.01.harley81.snap_20042" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 6852f90a31..c264e97261 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_51945 -#define TS_SIGNATURE "rusEFI 2022.12.01.hellen-gm-e67.snap_51945" +#define SIGNATURE_HASH snap_27569 +#define TS_SIGNATURE "rusEFI 2022.12.01.hellen-gm-e67.snap_27569" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 123162a3ca..232d65aeea 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_38945 -#define TS_SIGNATURE "rusEFI 2022.12.01.hellen-nb1.snap_38945" +#define SIGNATURE_HASH snap_14713 +#define TS_SIGNATURE "rusEFI 2022.12.01.hellen-nb1.snap_14713" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 60e2d645b1..63be1dadd5 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_42129 -#define TS_SIGNATURE "rusEFI 2022.12.01.hellen121nissan.snap_42129" +#define SIGNATURE_HASH snap_1481 +#define TS_SIGNATURE "rusEFI 2022.12.01.hellen121nissan.snap_1481" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 87fec29e04..359d787905 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_16112 -#define TS_SIGNATURE "rusEFI 2022.12.01.hellen121vag.snap_16112" +#define SIGNATURE_HASH snap_40872 +#define TS_SIGNATURE "rusEFI 2022.12.01.hellen121vag.snap_40872" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 0ba2abb614..9ebd0480c1 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_54486 -#define TS_SIGNATURE "rusEFI 2022.12.01.hellen128.snap_54486" +#define SIGNATURE_HASH snap_30094 +#define TS_SIGNATURE "rusEFI 2022.12.01.hellen128.snap_30094" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 2bac7809f9..853b76323b 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_37646 -#define TS_SIGNATURE "rusEFI 2022.12.01.hellen154hyundai.snap_37646" +#define SIGNATURE_HASH snap_12886 +#define TS_SIGNATURE "rusEFI 2022.12.01.hellen154hyundai.snap_12886" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 9a20e4f3c0..2967f731c5 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_42854 -#define TS_SIGNATURE "rusEFI 2022.12.01.hellen72.snap_42854" +#define SIGNATURE_HASH snap_1598 +#define TS_SIGNATURE "rusEFI 2022.12.01.hellen72.snap_1598" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 9333cbfed4..b1765a7cc9 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_29159 -#define TS_SIGNATURE "rusEFI 2022.12.01.hellen81.snap_29159" +#define SIGNATURE_HASH snap_53439 +#define TS_SIGNATURE "rusEFI 2022.12.01.hellen81.snap_53439" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 21c23400d6..833d572faf 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_47649 -#define TS_SIGNATURE "rusEFI 2022.12.01.hellen88bmw.snap_47649" +#define SIGNATURE_HASH snap_7033 +#define TS_SIGNATURE "rusEFI 2022.12.01.hellen88bmw.snap_7033" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 3a571517f6..b0fe7833c1 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_6362 -#define TS_SIGNATURE "rusEFI 2022.12.01.hellenNA6.snap_6362" +#define SIGNATURE_HASH snap_47490 +#define TS_SIGNATURE "rusEFI 2022.12.01.hellenNA6.snap_47490" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 8b82a5c72c..692177bae6 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_6149 -#define TS_SIGNATURE "rusEFI 2022.12.01.hellenNA8_96.snap_6149" +#define SIGNATURE_HASH snap_47453 +#define TS_SIGNATURE "rusEFI 2022.12.01.hellenNA8_96.snap_47453" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index b781c50165..1d6ca3b7da 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH snap_2849 -#define TS_SIGNATURE "rusEFI 2022.12.01.kin.snap_2849" +#define SIGNATURE_HASH snap_43641 +#define TS_SIGNATURE "rusEFI 2022.12.01.kin.snap_43641" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 67bff1079c..4a21561025 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_52973 -#define TS_SIGNATURE "rusEFI 2022.12.01.mre_f4.snap_52973" +#define SIGNATURE_HASH snap_28597 +#define TS_SIGNATURE "rusEFI 2022.12.01.mre_f4.snap_28597" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 7fd68c8c03..eec617374a 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_52973 -#define TS_SIGNATURE "rusEFI 2022.12.01.mre_f7.snap_52973" +#define SIGNATURE_HASH snap_28597 +#define TS_SIGNATURE "rusEFI 2022.12.01.mre_f7.snap_28597" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 74ae64bd92..af2a910dc5 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_28683 -#define TS_SIGNATURE "rusEFI 2022.12.01.prometheus_405.snap_28683" +#define SIGNATURE_HASH snap_53587 +#define TS_SIGNATURE "rusEFI 2022.12.01.prometheus_405.snap_53587" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 56783a319d..ffb2fffe5b 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_28683 -#define TS_SIGNATURE "rusEFI 2022.12.01.prometheus_469.snap_28683" +#define SIGNATURE_HASH snap_53587 +#define TS_SIGNATURE "rusEFI 2022.12.01.prometheus_469.snap_53587" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index f8ee7a1261..e8e95516e0 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_28315 -#define TS_SIGNATURE "rusEFI 2022.12.01.proteus_f4.snap_28315" +#define SIGNATURE_HASH snap_53187 +#define TS_SIGNATURE "rusEFI 2022.12.01.proteus_f4.snap_53187" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index c035a24561..492a5e3e40 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_28315 -#define TS_SIGNATURE "rusEFI 2022.12.01.proteus_f7.snap_28315" +#define SIGNATURE_HASH snap_53187 +#define TS_SIGNATURE "rusEFI 2022.12.01.proteus_f7.snap_53187" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 33ada8d792..594b486a52 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_28315 -#define TS_SIGNATURE "rusEFI 2022.12.01.proteus_h7.snap_28315" +#define SIGNATURE_HASH snap_53187 +#define TS_SIGNATURE "rusEFI 2022.12.01.proteus_h7.snap_53187" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 6f3e48ddde..09f66f8d7f 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_28727 -#define TS_SIGNATURE "rusEFI 2022.12.01.subaru_eg33_f7.snap_28727" +#define SIGNATURE_HASH snap_53615 +#define TS_SIGNATURE "rusEFI 2022.12.01.subaru_eg33_f7.snap_53615" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 8ca0b07381..8c4fb4554d 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_26553 -#define TS_SIGNATURE "rusEFI 2022.12.01.tdg-pdm8.snap_26553" +#define SIGNATURE_HASH snap_50913 +#define TS_SIGNATURE "rusEFI 2022.12.01.tdg-pdm8.snap_50913" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index d01c547b97..173e697dab 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.all.snap_43501" + signature = "rusEFI 2022.12.01.all.snap_2229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.all.snap_43501" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.all.snap_2229" ; 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 Thu Dec 01 02:58:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:36 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5508,7 +5510,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7447,7 +7450,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 0182ae2e65..ca9d80dc30 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.48way.snap_41378" + signature = "rusEFI 2022.12.01.48way.snap_250" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.48way.snap_41378" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.48way.snap_250" ; 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 Thu Dec 01 02:58:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:23 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5506,7 +5508,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7442,7 +7445,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 0f99236d68..a5cd302b1f 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.alphax-2chan.snap_13441" + signature = "rusEFI 2022.12.01.alphax-2chan.snap_38361" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.alphax-2chan.snap_13441" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.alphax-2chan.snap_38361" ; 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 Thu Dec 01 02:58:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:02 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5502,7 +5504,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7421,7 +7424,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 847e070f80..e129f37781 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.alphax-4chan.snap_27234" + signature = "rusEFI 2022.12.01.alphax-4chan.snap_52026" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.alphax-4chan.snap_27234" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.alphax-4chan.snap_52026" ; 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 Thu Dec 01 02:58:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:04 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5505,7 +5507,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7425,7 +7428,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 5060bf750b..e989530a05 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.atlas.snap_23754" + signature = "rusEFI 2022.12.01.atlas.snap_64914" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.atlas.snap_23754" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.atlas.snap_64914" ; 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 Thu Dec 01 02:58:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:33 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5508,7 +5510,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7439,7 +7442,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 84f86eb929..e9bf862505 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.core8.snap_63508" + signature = "rusEFI 2022.12.01.core8.snap_22860" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.core8.snap_63508" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.core8.snap_22860" ; 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 Thu Dec 01 02:58:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:22 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5506,7 +5508,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7442,7 +7445,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 00632b7684..32cf49474e 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.cypress.snap_43501" + signature = "rusEFI 2022.12.01.cypress.snap_2229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.cypress.snap_43501" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.cypress.snap_2229" ; 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 Thu Dec 01 02:58:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Dec 01 03:35:00 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5508,7 +5510,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7447,7 +7450,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index fce3d5d5f5..d2ddbac0f1 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.f407-discovery.snap_43501" + signature = "rusEFI 2022.12.01.f407-discovery.snap_2229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.f407-discovery.snap_43501" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.f407-discovery.snap_2229" ; 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 Thu Dec 01 02:58:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:31 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5508,7 +5510,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7447,7 +7450,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 05b7f78d77..f99b0b77ca 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.f429-discovery.snap_43501" + signature = "rusEFI 2022.12.01.f429-discovery.snap_2229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.f429-discovery.snap_43501" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.f429-discovery.snap_2229" ; 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 Thu Dec 01 02:58:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:32 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5508,7 +5510,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7447,7 +7450,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index accd80bdfd..f9bc6d6128 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.frankenso_na6.snap_21801" + signature = "rusEFI 2022.12.01.frankenso_na6.snap_62577" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.frankenso_na6.snap_21801" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.frankenso_na6.snap_62577" ; 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 Thu Dec 01 02:58:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:24 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5508,7 +5510,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7447,7 +7450,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 26776140a6..a3466a5905 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.harley81.snap_61202" + signature = "rusEFI 2022.12.01.harley81.snap_20042" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.harley81.snap_61202" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.harley81.snap_20042" ; 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 Thu Dec 01 02:58:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:05 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5505,7 +5507,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7422,7 +7425,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 48af176e1c..3661773dec 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.hellen-gm-e67.snap_51945" + signature = "rusEFI 2022.12.01.hellen-gm-e67.snap_27569" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.hellen-gm-e67.snap_51945" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.hellen-gm-e67.snap_27569" ; 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 Thu Dec 01 02:58:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:16 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5505,7 +5507,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7423,7 +7426,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 51eda1c56c..573eb9177d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.hellen-nb1.snap_38945" + signature = "rusEFI 2022.12.01.hellen-nb1.snap_14713" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.hellen-nb1.snap_38945" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.hellen-nb1.snap_14713" ; 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 Thu Dec 01 02:58:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:15 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5505,7 +5507,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7423,7 +7426,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 580e715c8e..b1fc5a8476 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.hellen121nissan.snap_42129" + signature = "rusEFI 2022.12.01.hellen121nissan.snap_1481" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.hellen121nissan.snap_42129" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.hellen121nissan.snap_1481" ; 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 Thu Dec 01 02:58:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:09 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5505,7 +5507,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7419,7 +7422,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 04457b40d3..89a047fe37 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.hellen121vag.snap_16112" + signature = "rusEFI 2022.12.01.hellen121vag.snap_40872" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.hellen121vag.snap_16112" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.hellen121vag.snap_40872" ; 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 Thu Dec 01 02:58:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:07 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5505,7 +5507,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7422,7 +7425,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 2cae29ffdf..d2f8cd4754 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.hellen128.snap_54486" + signature = "rusEFI 2022.12.01.hellen128.snap_30094" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.hellen128.snap_54486" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.hellen128.snap_30094" ; 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 Thu Dec 01 02:58:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:06 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5505,7 +5507,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7419,7 +7422,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 5c24b74233..f523ded2b4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.hellen154hyundai.snap_37646" + signature = "rusEFI 2022.12.01.hellen154hyundai.snap_12886" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.hellen154hyundai.snap_37646" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.hellen154hyundai.snap_12886" ; 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 Thu Dec 01 02:58:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:10 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5505,7 +5507,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7419,7 +7422,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 2d1b2e4866..5ee3ecd7af 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.hellen72.snap_42854" + signature = "rusEFI 2022.12.01.hellen72.snap_1598" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.hellen72.snap_42854" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.hellen72.snap_1598" ; 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 Thu Dec 01 02:58:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:12 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5505,7 +5507,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7423,7 +7426,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 82f6d4620a..813f86404e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.hellen81.snap_29159" + signature = "rusEFI 2022.12.01.hellen81.snap_53439" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.hellen81.snap_29159" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.hellen81.snap_53439" ; 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 Thu Dec 01 02:58:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:13 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5503,7 +5505,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7420,7 +7423,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index ae106f0b04..e9b5917c1b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.hellen88bmw.snap_47649" + signature = "rusEFI 2022.12.01.hellen88bmw.snap_7033" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.hellen88bmw.snap_47649" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.hellen88bmw.snap_7033" ; 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 Thu Dec 01 02:58:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:11 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5505,7 +5507,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7418,7 +7421,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index fa9c18ee5f..ed2ca66784 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.hellenNA6.snap_6362" + signature = "rusEFI 2022.12.01.hellenNA6.snap_47490" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.hellenNA6.snap_6362" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.hellenNA6.snap_47490" ; 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 Thu Dec 01 02:58:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:17 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5505,7 +5507,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7423,7 +7426,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 7118444555..7c9deca825 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.hellenNA8_96.snap_6149" + signature = "rusEFI 2022.12.01.hellenNA8_96.snap_47453" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.hellenNA8_96.snap_6149" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.hellenNA8_96.snap_47453" ; 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 Thu Dec 01 02:58:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:18 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5505,7 +5507,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7423,7 +7426,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index f60ddbf81f..0351512760 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.kin.snap_2849" + signature = "rusEFI 2022.12.01.kin.snap_43641" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.kin.snap_2849" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.kin.snap_43641" ; 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 Thu Dec 01 02:58:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Dec 01 03:34:59 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5508,7 +5510,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7448,7 +7451,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 4cffd79c0b..a9bc3d3748 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.mre_f4.snap_52973" + signature = "rusEFI 2022.12.01.mre_f4.snap_28597" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.mre_f4.snap_52973" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.mre_f4.snap_28597" ; 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 Thu Dec 01 02:58:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:20 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5506,7 +5508,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7421,7 +7424,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index bdcaa40a72..74e895a352 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.mre_f7.snap_52973" + signature = "rusEFI 2022.12.01.mre_f7.snap_28597" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.mre_f7.snap_52973" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.mre_f7.snap_28597" ; 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 Thu Dec 01 02:58:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:19 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5506,7 +5508,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7421,7 +7424,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 43004d219c..1347b7a45e 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.prometheus_405.snap_28683" + signature = "rusEFI 2022.12.01.prometheus_405.snap_53587" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.prometheus_405.snap_28683" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.prometheus_405.snap_53587" ; 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 Thu Dec 01 02:58:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:26 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5502,7 +5504,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7441,7 +7444,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 8c3042f87c..f5d3c5d971 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.prometheus_469.snap_28683" + signature = "rusEFI 2022.12.01.prometheus_469.snap_53587" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.prometheus_469.snap_28683" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.prometheus_469.snap_53587" ; 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 Thu Dec 01 02:58:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:25 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5502,7 +5504,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7441,7 +7444,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index d80b300fc9..366c769b4b 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.proteus_f4.snap_28315" + signature = "rusEFI 2022.12.01.proteus_f4.snap_53187" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.proteus_f4.snap_28315" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.proteus_f4.snap_53187" ; 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 Thu Dec 01 02:58:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:29 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5502,7 +5504,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7410,7 +7413,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 4d4cd4c273..e1b820d3d5 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.proteus_f7.snap_28315" + signature = "rusEFI 2022.12.01.proteus_f7.snap_53187" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.proteus_f7.snap_28315" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.proteus_f7.snap_53187" ; 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 Thu Dec 01 02:58:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:27 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5502,7 +5504,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7410,7 +7413,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 64884e2f63..2f6c664f19 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.proteus_h7.snap_28315" + signature = "rusEFI 2022.12.01.proteus_h7.snap_53187" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.proteus_h7.snap_28315" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.proteus_h7.snap_53187" ; 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 Thu Dec 01 02:58:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:30 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5502,7 +5504,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7410,7 +7413,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 475a0b08ae..d30e3c2750 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.subaru_eg33_f7.snap_28727" + signature = "rusEFI 2022.12.01.subaru_eg33_f7.snap_53615" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.subaru_eg33_f7.snap_28727" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.subaru_eg33_f7.snap_53615" ; 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 Thu Dec 01 02:58:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:01 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5504,7 +5506,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7436,7 +7439,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 44d5284f90..ba8c9ebc1e 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.01.tdg-pdm8.snap_26553" + signature = "rusEFI 2022.12.01.tdg-pdm8.snap_50913" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.01.tdg-pdm8.snap_26553" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.01.tdg-pdm8.snap_50913" ; 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 Thu Dec 01 02:58:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:35 UTC 2022 pageSize = 22800 page = 1 @@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1272 + ochBlockSize = 1276 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2819,16 +2819,17 @@ etbCurrentAdjustedTarget = scalar, F32, 1240, "%", 1, 0 etbRevLimitActive = bits, U32, 1244, [0:0] etbDutyRateOfChange = scalar, F32, 1248, "", 1, 0 etbDutyAverage = scalar, F32, 1252, "", 1, 0 -etbInputErrorCounter = scalar, U16, 1256, "", 1, 0 -etbErrorCode = scalar, S08, 1258, "", 1, 0 -; total TS size = 1260 -faultCode = scalar, U08, 1260, "", 1, 0 -heaterDuty = scalar, U08, 1261, "%", 1, 0 -pumpDuty = scalar, U08, 1262, "%", 1, 0 -tempC = scalar, U16, 1264, "C", 1, 0 -nernstVoltage = scalar, U16, 1266, "V", 0.001, 0 -esr = scalar, U16, 1268, "", 1, 0 -; total TS size = 1272 +etbTpsErrorCounter = scalar, U16, 1256, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1258, "", 1, 0 +etbErrorCode = scalar, S08, 1260, "", 1, 0 +; total TS size = 1264 +faultCode = scalar, U08, 1264, "", 1, 0 +heaterDuty = scalar, U08, 1265, "%", 1, 0 +pumpDuty = scalar, U08, 1266, "%", 1, 0 +tempC = scalar, U16, 1268, "C", 1, 0 +nernstVoltage = scalar, U16, 1270, "V", 0.001, 0 +esr = scalar, U16, 1272, "", 1, 0 +; total TS size = 1276 time = { timeNow } @@ -2890,7 +2891,7 @@ esr = scalar, U16, 1268, "", 1, 0 fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off" ; TpsState - etbCutCodeList = bits, U08, [0:7], "None", "engine off setting", "TPS error", "PPS error", "Input noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy" + etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "PID noise", "Lua", "Manual", "N/A", "Redundancy", "PPS noise" [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of @@ -4672,7 +4673,8 @@ entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" entry = etbDutyRateOfChange, "etbDutyRateOfChange", float, "%.3f" entry = etbDutyAverage, "etbDutyAverage", float, "%.3f" -entry = etbInputErrorCounter, "ETB inputs error counter", int, "%d" +entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" +entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" entry = etbErrorCode, "etbErrorCode", int, "%d" entry = faultCode, "faultCode", int, "%d" entry = heaterDuty, "heaterDuty", int, "%d" @@ -5508,7 +5510,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" graphLine = etbDutyRateOfChange liveGraph = electronic_throttle_3_Graph, "Graph", South graphLine = etbDutyAverage - graphLine = etbInputErrorCounter + graphLine = etbTpsErrorCounter + graphLine = etbPpsErrorCounter graphLine = etbErrorCode @@ -7447,7 +7450,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "Duty Averaging Length", etbExpAverageLength - field = "Rote of change Averaging Length", etbRocExpAverageLength + field = "Rate of change Averaging Length", etbRocExpAverageLength ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java index 88b8fd04eb..995842e5f1 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.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/electronic_throttle.txt Wed Nov 30 03:24:57 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Thu Dec 01 03:34:59 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -16,9 +16,10 @@ public class ElectronicThrottle { public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 28, FieldType.BIT, 0).setBaseOffset(1216); public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 32, FieldType.FLOAT).setBaseOffset(1216); public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 36, FieldType.FLOAT).setBaseOffset(1216); - public static final Field ETBINPUTERRORCOUNTER = Field.create("ETBINPUTERRORCOUNTER", 40, FieldType.INT16).setScale(1.0).setBaseOffset(1216); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 42, FieldType.INT8).setScale(1.0).setBaseOffset(1216); - public static final Field ALIGNMENTFILL_AT_43 = Field.create("ALIGNMENTFILL_AT_43", 43, FieldType.INT8).setScale(1.0).setBaseOffset(1216); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 40, FieldType.INT16).setScale(1.0).setBaseOffset(1216); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 42, FieldType.INT16).setScale(1.0).setBaseOffset(1216); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 44, FieldType.INT8).setScale(1.0).setBaseOffset(1216); + public static final Field ALIGNMENTFILL_AT_45 = Field.create("ALIGNMENTFILL_AT_45", 45, FieldType.INT8).setScale(1.0).setBaseOffset(1216); public static final Field[] VALUES = { IDLEPOSITION, TRIM, @@ -30,8 +31,9 @@ public class ElectronicThrottle { ETBREVLIMITACTIVE, ETBDUTYRATEOFCHANGE, ETBDUTYAVERAGE, - ETBINPUTERRORCOUNTER, + ETBTPSERRORCOUNTER, + ETBPPSERRORCOUNTER, ETBERRORCODE, - ALIGNMENTFILL_AT_43, + ALIGNMENTFILL_AT_45, }; } 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 038409a14f..db52cdbdb6 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 Thu Dec 01 02:58:50 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Dec 01 03:35:38 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1182,10 +1182,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 2022.12.01.all.snap_43501"; + public static final String TS_SIGNATURE = "rusEFI 2022.12.01.all.snap_2229"; 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 = 1272; + public static final int TS_TOTAL_OUTPUT_SIZE = 1276; public static final int TsCalMode_EtbKd = 5; public static final int TsCalMode_EtbKi = 4; public static final int TsCalMode_EtbKp = 3; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java index 3ca16a7f37..ea370d08b2 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java @@ -1,19 +1,19 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/sensors//wideband_state.txt Tue Nov 29 01:17:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/sensors//wideband_state.txt Thu Dec 01 03:34:59 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WidebandController { - public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1260); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1260); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1260); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1260); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1260); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1260); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1260); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1260); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1264); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1264); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1264); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1264); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1264); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1264); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1264); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1264); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,