From 20dbb9402f0570bbfd806c4dd1eb487ceadfc058 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Wed, 12 Apr 2023 14:18:49 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 4 +- .../controllers/algo/rusefi_generated.h | 4 +- .../controllers/algo/rusefi_generated.h | 4 +- .../console/binary/generated/data_logs.ini | 1 - .../binary/generated/output_channels.ini | 43 ++++++++------- .../console/binary/generated/sensors.java | 44 ++++++++-------- .../binary/output_channels_generated.h | 51 +++++++++--------- .../console/binary_log/log_fields_generated.h | 1 - .../controllers/generated/rusefi_generated.h | 4 +- .../controllers/generated/signature_48way.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../generated/signature_alphax-8chan.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../controllers/generated/signature_core8.h | 4 +- .../controllers/generated/signature_cypress.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_harley81.h | 4 +- .../generated/signature_hellen-gm-e67.h | 4 +- .../generated/signature_hellen-honda-k.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_m74_9.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../controllers/generated/signature_s105.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- .../lua/generated/output_lookup_generated.cpp | 3 -- firmware/tunerstudio/generated/rusefi.ini | 52 +++++++++---------- .../tunerstudio/generated/rusefi_48way.ini | 52 +++++++++---------- .../generated/rusefi_alphax-2chan.ini | 52 +++++++++---------- .../generated/rusefi_alphax-4chan.ini | 52 +++++++++---------- .../generated/rusefi_alphax-8chan.ini | 52 +++++++++---------- .../tunerstudio/generated/rusefi_atlas.ini | 52 +++++++++---------- .../tunerstudio/generated/rusefi_core8.ini | 52 +++++++++---------- .../tunerstudio/generated/rusefi_cypress.ini | 52 +++++++++---------- .../generated/rusefi_f407-discovery.ini | 52 +++++++++---------- .../generated/rusefi_f429-discovery.ini | 52 +++++++++---------- .../generated/rusefi_frankenso_na6.ini | 52 +++++++++---------- .../tunerstudio/generated/rusefi_harley81.ini | 52 +++++++++---------- .../generated/rusefi_hellen-gm-e67.ini | 52 +++++++++---------- .../generated/rusefi_hellen-honda-k.ini | 52 +++++++++---------- .../generated/rusefi_hellen-nb1.ini | 52 +++++++++---------- .../generated/rusefi_hellen121nissan.ini | 52 +++++++++---------- .../generated/rusefi_hellen121vag.ini | 52 +++++++++---------- .../generated/rusefi_hellen128mercedes.ini | 52 +++++++++---------- .../generated/rusefi_hellen154hyundai.ini | 52 +++++++++---------- .../tunerstudio/generated/rusefi_hellen72.ini | 52 +++++++++---------- .../tunerstudio/generated/rusefi_hellen81.ini | 52 +++++++++---------- .../generated/rusefi_hellen88bmw.ini | 52 +++++++++---------- .../generated/rusefi_hellenNA6.ini | 52 +++++++++---------- .../generated/rusefi_hellenNA8_96.ini | 52 +++++++++---------- firmware/tunerstudio/generated/rusefi_kin.ini | 52 +++++++++---------- .../tunerstudio/generated/rusefi_m74_9.ini | 52 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f4.ini | 52 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f7.ini | 52 +++++++++---------- .../generated/rusefi_prometheus_405.ini | 52 +++++++++---------- .../generated/rusefi_prometheus_469.ini | 52 +++++++++---------- .../generated/rusefi_proteus_f4.ini | 52 +++++++++---------- .../generated/rusefi_proteus_f7.ini | 52 +++++++++---------- .../generated/rusefi_proteus_h7.ini | 52 +++++++++---------- .../tunerstudio/generated/rusefi_s105.ini | 52 +++++++++---------- .../generated/rusefi_subaru_eg33_f7.ini | 52 +++++++++---------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 52 +++++++++---------- .../com/rusefi/config/generated/Fields.java | 4 +- .../rusefi/config/generated/TsOutputs.java | 48 ++++++++--------- 83 files changed, 1073 insertions(+), 1150 deletions(-) diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index d377cfb00e..d9874f7b3c 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1063,7 +1063,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2930125701 +#define SIGNATURE_HASH 3637768076 #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 @@ -1357,7 +1357,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.04.12.cypress.2930125701" +#define TS_SIGNATURE "rusEFI master.2023.04.12.cypress.3637768076" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 d04e607aa1..8ec5073449 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1063,7 +1063,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3329329481 +#define SIGNATURE_HASH 2953071936 #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 @@ -1357,7 +1357,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.04.12.kin.3329329481" +#define TS_SIGNATURE "rusEFI master.2023.04.12.kin.2953071936" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 3ebb885ff8..2a801c68cf 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 @@ -1014,7 +1014,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3715856680 +#define SIGNATURE_HASH 2869869857 #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 @@ -1309,7 +1309,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.04.12.subaru_eg33_f7.3715856680" +#define TS_SIGNATURE "rusEFI master.2023.04.12.subaru_eg33_f7.2869869857" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 46041bc126..79deaff0e1 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -156,7 +156,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index b4872688cb..1540d2a59a 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -160,28 +160,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 4dcb4ad2ef..d4cf1cb7f5 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -135,28 +135,28 @@ fuelPidCorrection2("fuelPidCorrection 2", SensorCategory.SENSOR_INPUTS, FieldTyp rawTps1Secondary("rawTps1Secondary", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 282, 0.001, 0.0, 5.0, "V"), rawTps2Primary("rawTps2Primary", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 284, 0.001, 0.0, 5.0, "V"), rawTps2Secondary("rawTps2Secondary", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 286, 0.001, 0.0, 5.0, "V"), -knockCount("knock: count", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 288, 1.0, 0.0, 0.0, ""), -accelerationZ("Acceleration: Z", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 290, 0.01, 0.0, 0.0, "G"), -accelerationRoll("Acceleration: Roll", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 292, 0.01, 0.0, 0.0, "G"), -accelerationYaw("Acceleration: Yaw", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 294, 0.01, 0.0, 0.0, "G"), -vvtTargets1("vvtTargets 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 296, 1.0, 0.0, 0.0, "deg"), -vvtTargets2("vvtTargets 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 297, 1.0, 0.0, 0.0, "deg"), -vvtTargets3("vvtTargets 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 298, 1.0, 0.0, 0.0, "deg"), -vvtTargets4("vvtTargets 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 299, 1.0, 0.0, 0.0, "deg"), -turboSpeed("Turbocharger Speed", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 300, 1.0, 0.0, 0.0, "hz"), -tps1Split("tps1Split", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 302, 0.01, 0.0, 0.0, "%"), -tps2Split("tps2Split", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 304, 0.01, 0.0, 0.0, "%"), -tps12Split("tps12Split", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 306, 0.01, 0.0, 0.0, "%"), -accPedalSplit("accPedalSplit", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 308, 0.01, 0.0, 0.0, "%"), -sparkCutReason("Spark Cut Code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 310, 1.0, 0.0, 0.0, "code"), -fuelCutReason("Fuel Cut Code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 311, 1.0, 0.0, 0.0, "code"), -mafEstimate("MAF estimate", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 312, 0.1, 0.0, 0.0, "kg/h"), -instantRpm("sync: instant RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 314, 1.0, 0.0, 0.0, "rpm"), -systemEventReuse("systemEventReuse", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 316, 1.0, 0.0, 0.0, "counter"), -rawMap("rawMap", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 318, 0.001, 0.0, 5.0, "V"), -rawAfr("rawAfr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 320, 0.001, 0.0, 5.0, "V"), -tpsAccelFrom("tpsAccelFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 322, 1.0, 0.0, 100.0, "%"), -tpsAccelTo("tpsAccelTo", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 323, 1.0, 0.0, 100.0, "%"), +accelerationZ("Acceleration: Z", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 288, 0.01, 0.0, 0.0, "G"), +accelerationRoll("Acceleration: Roll", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 290, 0.01, 0.0, 0.0, "G"), +accelerationYaw("Acceleration: Yaw", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 292, 0.01, 0.0, 0.0, "G"), +vvtTargets1("vvtTargets 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 294, 1.0, 0.0, 0.0, "deg"), +vvtTargets2("vvtTargets 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 295, 1.0, 0.0, 0.0, "deg"), +vvtTargets3("vvtTargets 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 296, 1.0, 0.0, 0.0, "deg"), +vvtTargets4("vvtTargets 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 297, 1.0, 0.0, 0.0, "deg"), +turboSpeed("Turbocharger Speed", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 298, 1.0, 0.0, 0.0, "hz"), +tps1Split("tps1Split", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 300, 0.01, 0.0, 0.0, "%"), +tps2Split("tps2Split", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 302, 0.01, 0.0, 0.0, "%"), +tps12Split("tps12Split", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 304, 0.01, 0.0, 0.0, "%"), +accPedalSplit("accPedalSplit", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 306, 0.01, 0.0, 0.0, "%"), +sparkCutReason("Spark Cut Code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 308, 1.0, 0.0, 0.0, "code"), +fuelCutReason("Fuel Cut Code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 309, 1.0, 0.0, 0.0, "code"), +mafEstimate("MAF estimate", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 310, 0.1, 0.0, 0.0, "kg/h"), +instantRpm("sync: instant RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 312, 1.0, 0.0, 0.0, "rpm"), +systemEventReuse("systemEventReuse", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 314, 1.0, 0.0, 0.0, "counter"), +rawMap("rawMap", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 316, 0.001, 0.0, 5.0, "V"), +rawAfr("rawAfr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 318, 0.001, 0.0, 5.0, "V"), +tpsAccelFrom("tpsAccelFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 320, 1.0, 0.0, 100.0, "%"), +tpsAccelTo("tpsAccelTo", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 321, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_322("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 322, 1.0, -20.0, 100.0, "units"), calibrationValue2("calibrationValue2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 324, 1.0, 0.0, 0.0, ""), luaInvocationCounter("luaInvocationCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 332, 1.0, 0.0, 0.0, "count"), luaLastCycleDuration("luaLastCycleDuration", SensorCategory.SENSOR_INPUTS, FieldType.INT, 336, 1.0, 0.0, 0.0, "nt"), diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index 968f19aa0c..f1f8ce0e6e 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Mar 31 14:05:10 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Apr 12 14:18:00 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -741,109 +741,110 @@ struct output_channels_s { * offset 286 */ scaled_channel rawTps2Secondary = (int16_t)0; - /** - * @@GAUGE_NAME_KNOCK_COUNTER@@ - * offset 288 - */ - uint16_t knockCount = (uint16_t)0; /** * @@GAUGE_NAME_ACCEL_Z@@ G - * offset 290 + * offset 288 */ scaled_channel accelerationZ = (int16_t)0; /** * @@GAUGE_NAME_ACCEL_ROLL@@ G - * offset 292 + * offset 290 */ scaled_channel accelerationRoll = (int16_t)0; /** * @@GAUGE_NAME_ACCEL_YAW@@ G - * offset 294 + * offset 292 */ scaled_channel accelerationYaw = (int16_t)0; /** deg - * offset 296 + * offset 294 */ int8_t vvtTargets[4]; /** * @@GAUGE_NAME_TURBO_SPEED@@ hz - * offset 300 + * offset 298 */ uint16_t turboSpeed = (uint16_t)0; /** % - * offset 302 + * offset 300 */ scaled_channel tps1Split = (int16_t)0; /** % - * offset 304 + * offset 302 */ scaled_channel tps2Split = (int16_t)0; /** % - * offset 306 + * offset 304 */ scaled_channel tps12Split = (int16_t)0; /** % - * offset 308 + * offset 306 */ scaled_channel accPedalSplit = (int16_t)0; /** * Spark Cut Code code - * offset 310 + * offset 308 */ int8_t sparkCutReason = (int8_t)0; /** * Fuel Cut Code code - * offset 311 + * offset 309 */ int8_t fuelCutReason = (int8_t)0; /** * @@GAUGE_NAME_AIR_FLOW_ESTIMATE@@ kg/h - * offset 312 + * offset 310 */ scaled_channel mafEstimate = (uint16_t)0; /** * sync: instant RPM rpm - * offset 314 + * offset 312 */ uint16_t instantRpm = (uint16_t)0; /** counter - * offset 316 + * offset 314 */ uint16_t systemEventReuse = (uint16_t)0; /** V - * offset 318 + * offset 316 */ scaled_channel rawMap = (uint16_t)0; /** V - * offset 320 + * offset 318 */ scaled_channel rawAfr = (uint16_t)0; /** % - * offset 322 + * offset 320 */ uint8_t tpsAccelFrom = (uint8_t)0; /** % - * offset 323 + * offset 321 */ uint8_t tpsAccelTo = (uint8_t)0; + /** + * need 4 byte alignment + units + * offset 322 + */ + uint8_t alignmentFill_at_322[2]; /** * offset 324 */ @@ -1392,4 +1393,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 780); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Mar 31 14:05:10 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Apr 12 14:18:00 UTC 2023 diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index bce59e60f9..7dfca7f93b 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -135,7 +135,6 @@ static constexpr LogField fields[] = { {engine->outputChannels.rawTps1Secondary, "rawTps1Secondary", "V", 3}, {engine->outputChannels.rawTps2Primary, "rawTps2Primary", "V", 3}, {engine->outputChannels.rawTps2Secondary, "rawTps2Secondary", "V", 3}, - {engine->outputChannels.knockCount, "knock: count", "", 0}, {engine->outputChannels.accelerationZ, "Acceleration: Z", "G", 0}, {engine->outputChannels.accelerationRoll, "Acceleration: Roll", "G", 0}, {engine->outputChannels.accelerationYaw, "Acceleration: Yaw", "G", 0}, diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 5b83939d5a..8573b9c07d 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1063,7 +1063,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3337172259 +#define SIGNATURE_HASH 2963075370 #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 @@ -1357,7 +1357,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.04.12.f407-discovery.3337172259" +#define TS_SIGNATURE "rusEFI master.2023.04.12.f407-discovery.2963075370" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index a19aa40459..e07b712366 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 31697125 -#define TS_SIGNATURE "rusEFI master.2023.04.12.48way.31697125" +#define SIGNATURE_HASH 2006346988 +#define TS_SIGNATURE "rusEFI master.2023.04.12.48way.2006346988" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index d6031e832d..946a233b4a 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 4069929526 -#define TS_SIGNATURE "rusEFI master.2023.04.12.alphax-2chan.4069929526" +#define SIGNATURE_HASH 2229532223 +#define TS_SIGNATURE "rusEFI master.2023.04.12.alphax-2chan.2229532223" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 3e6682cdb0..712a33b879 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 1372560896 -#define TS_SIGNATURE "rusEFI master.2023.04.12.alphax-4chan.1372560896" +#define SIGNATURE_HASH 666524169 +#define TS_SIGNATURE "rusEFI master.2023.04.12.alphax-4chan.666524169" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index c71587c7c7..486c5edafa 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2088503983 -#define TS_SIGNATURE "rusEFI master.2023.04.12.alphax-8chan.2088503983" +#define SIGNATURE_HASH 168414886 +#define TS_SIGNATURE "rusEFI master.2023.04.12.alphax-8chan.168414886" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index f9c0c014c9..7cbba7b2f0 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 2993479330 -#define TS_SIGNATURE "rusEFI master.2023.04.12.atlas.2993479330" +#define SIGNATURE_HASH 3289979563 +#define TS_SIGNATURE "rusEFI master.2023.04.12.atlas.3289979563" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 72554d2f42..6714bb0d19 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 2099129833 -#define TS_SIGNATURE "rusEFI master.2023.04.12.core8.2099129833" +#define SIGNATURE_HASH 191621600 +#define TS_SIGNATURE "rusEFI master.2023.04.12.core8.191621600" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 8f05fb47c9..86f60bbdb7 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 2930125701 -#define TS_SIGNATURE "rusEFI master.2023.04.12.cypress.2930125701" +#define SIGNATURE_HASH 3637768076 +#define TS_SIGNATURE "rusEFI master.2023.04.12.cypress.3637768076" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 806a15711e..25d7d5bd80 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 3337172259 -#define TS_SIGNATURE "rusEFI master.2023.04.12.f407-discovery.3337172259" +#define SIGNATURE_HASH 2963075370 +#define TS_SIGNATURE "rusEFI master.2023.04.12.f407-discovery.2963075370" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 759f8c9d92..cf0ce140d1 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 2930125701 -#define TS_SIGNATURE "rusEFI master.2023.04.12.f429-discovery.2930125701" +#define SIGNATURE_HASH 3637768076 +#define TS_SIGNATURE "rusEFI master.2023.04.12.f429-discovery.3637768076" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index a505332f20..04ed60743b 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 2364853071 -#define TS_SIGNATURE "rusEFI master.2023.04.12.frankenso_na6.2364853071" +#define SIGNATURE_HASH 4202762054 +#define TS_SIGNATURE "rusEFI master.2023.04.12.frankenso_na6.4202762054" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index da54c53656..c8256ae7e2 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 2309988045 -#define TS_SIGNATURE "rusEFI master.2023.04.12.harley81.2309988045" +#define SIGNATURE_HASH 4292500164 +#define TS_SIGNATURE "rusEFI master.2023.04.12.harley81.4292500164" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 732278922c..2171c89e9e 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 4126339655 -#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen-gm-e67.4126339655" +#define SIGNATURE_HASH 2206676558 +#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen-gm-e67.2206676558" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 129eb29c0c..988d646533 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1674490771 -#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen-honda-k.1674490771" +#define SIGNATURE_HASH 364607386 +#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen-honda-k.364607386" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 6f09e85062..f350fffcfa 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 1145158404 -#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen-nb1.1145158404" +#define SIGNATURE_HASH 842301197 +#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen-nb1.842301197" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index eed1127c76..ae75393b56 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 1167835251 -#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen121nissan.1167835251" +#define SIGNATURE_HASH 871236730 +#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen121nissan.871236730" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index d274b68bb1..de56509bc7 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 553800389 -#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen121vag.553800389" +#define SIGNATURE_HASH 1467455180 +#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen121vag.1467455180" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index caad7c98b0..3b50631ed5 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 143772158 -#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen128.143772158" +#define SIGNATURE_HASH 2128874999 +#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen128.2128874999" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 8ff710a62a..d6f9e45048 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 2561864186 -#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen154hyundai.2561864186" +#define SIGNATURE_HASH 4006032883 +#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen154hyundai.4006032883" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 79c0a943a6..0fc534440d 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 2070114288 -#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen72.2070114288" +#define SIGNATURE_HASH 219589625 +#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen72.219589625" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 24ec92c26c..99ee1e959b 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 3899246808 -#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen81.3899246808" +#define SIGNATURE_HASH 2652638417 +#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen81.2652638417" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 40103e2346..bdf9bd98e9 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 3158510932 -#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen88bmw.3158510932" +#define SIGNATURE_HASH 3392588125 +#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen88bmw.3392588125" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 6b23bca498..53937cffe1 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 2215437150 -#define TS_SIGNATURE "rusEFI master.2023.04.12.hellenNA6.2215437150" +#define SIGNATURE_HASH 4068026199 +#define TS_SIGNATURE "rusEFI master.2023.04.12.hellenNA6.4068026199" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 5d8868a986..c0c5eee6d6 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 2949976930 -#define TS_SIGNATURE "rusEFI master.2023.04.12.hellenNA8_96.2949976930" +#define SIGNATURE_HASH 3651196779 +#define TS_SIGNATURE "rusEFI master.2023.04.12.hellenNA8_96.3651196779" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 1687db8ea0..dc95f8c118 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 3329329481 -#define TS_SIGNATURE "rusEFI master.2023.04.12.kin.3329329481" +#define SIGNATURE_HASH 2953071936 +#define TS_SIGNATURE "rusEFI master.2023.04.12.kin.2953071936" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index e9ce1e38cc..c6ffacddb0 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1898510014 -#define TS_SIGNATURE "rusEFI master.2023.04.12.m74_9.1898510014" +#define SIGNATURE_HASH 123548343 +#define TS_SIGNATURE "rusEFI master.2023.04.12.m74_9.123548343" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 6d2bc95263..166e0928b7 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 1381639589 -#define TS_SIGNATURE "rusEFI master.2023.04.12.mre_f4.1381639589" +#define SIGNATURE_HASH 607117740 +#define TS_SIGNATURE "rusEFI master.2023.04.12.mre_f4.607117740" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 8d961d21fc..6655e5dd67 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 1381639589 -#define TS_SIGNATURE "rusEFI master.2023.04.12.mre_f7.1381639589" +#define SIGNATURE_HASH 607117740 +#define TS_SIGNATURE "rusEFI master.2023.04.12.mre_f7.607117740" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index a5e411f6c6..4478376bfc 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 4266455651 -#define TS_SIGNATURE "rusEFI master.2023.04.12.prometheus_405.4266455651" +#define SIGNATURE_HASH 2285450858 +#define TS_SIGNATURE "rusEFI master.2023.04.12.prometheus_405.2285450858" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 7930f083d7..d93e2c7f54 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 4266455651 -#define TS_SIGNATURE "rusEFI master.2023.04.12.prometheus_469.4266455651" +#define SIGNATURE_HASH 2285450858 +#define TS_SIGNATURE "rusEFI master.2023.04.12.prometheus_469.2285450858" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 5dd67b90b2..4ec951d7de 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 2153886322 -#define TS_SIGNATURE "rusEFI master.2023.04.12.proteus_f4.2153886322" +#define SIGNATURE_HASH 4128536187 +#define TS_SIGNATURE "rusEFI master.2023.04.12.proteus_f4.4128536187" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 87d875794f..569bbdf339 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 2153886322 -#define TS_SIGNATURE "rusEFI master.2023.04.12.proteus_f7.2153886322" +#define SIGNATURE_HASH 4128536187 +#define TS_SIGNATURE "rusEFI master.2023.04.12.proteus_f7.4128536187" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 75125a7b68..ed3f613c1d 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 2153886322 -#define TS_SIGNATURE "rusEFI master.2023.04.12.proteus_h7.2153886322" +#define SIGNATURE_HASH 4128536187 +#define TS_SIGNATURE "rusEFI master.2023.04.12.proteus_h7.4128536187" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 02a8c6cade..a6f079a479 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2178895579 -#define TS_SIGNATURE "rusEFI master.2023.04.12.s105.2178895579" +#define SIGNATURE_HASH 4155149010 +#define TS_SIGNATURE "rusEFI master.2023.04.12.s105.4155149010" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 206a77e461..7374c1a5ec 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 3715856680 -#define TS_SIGNATURE "rusEFI master.2023.04.12.subaru_eg33_f7.3715856680" +#define SIGNATURE_HASH 2869869857 +#define TS_SIGNATURE "rusEFI master.2023.04.12.subaru_eg33_f7.2869869857" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 212d111f80..73bdc9aa20 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 604506023 -#define TS_SIGNATURE "rusEFI master.2023.04.12.tdg-pdm8.604506023" +#define SIGNATURE_HASH 1383973806 +#define TS_SIGNATURE "rusEFI master.2023.04.12.tdg-pdm8.1383973806" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 36b36c0773..2552224095 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -388,9 +388,6 @@ float getOutputValueByName(const char *name) { // rawTps2Secondary case 70357120: return engine->outputChannels.rawTps2Secondary; -// knockCount - case 699938372: - return engine->outputChannels.knockCount; // accelerationZ case 633018089: return engine->outputChannels.accelerationZ; diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 1e6dfe40f3..180aa00707 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.f407-discovery.3337172259" + signature = "rusEFI master.2023.04.12.f407-discovery.2963075370" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.f407-discovery.3337172259" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.f407-discovery.2963075370" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:35 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:45 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index f191f86cd0..8db3112828 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.48way.31697125" + signature = "rusEFI master.2023.04.12.48way.2006346988" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.48way.31697125" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.48way.2006346988" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:16 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:29 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 11a82dfb18..ef80b98653 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.alphax-2chan.4069929526" + signature = "rusEFI master.2023.04.12.alphax-2chan.2229532223" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.alphax-2chan.4069929526" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.alphax-2chan.2229532223" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:33:47 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:04 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 6261c88388..1e6b755b99 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.alphax-4chan.1372560896" + signature = "rusEFI master.2023.04.12.alphax-4chan.666524169" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.alphax-4chan.1372560896" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.alphax-4chan.666524169" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:33:49 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:06 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index bd5cdb429a..7022c83a0b 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.alphax-8chan.2088503983" + signature = "rusEFI master.2023.04.12.alphax-8chan.168414886" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.alphax-8chan.2088503983" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.alphax-8chan.168414886" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:33:51 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:07 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 1c566fb338..805f3c1693 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.atlas.2993479330" + signature = "rusEFI master.2023.04.12.atlas.3289979563" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.atlas.2993479330" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.atlas.3289979563" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:32 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:42 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index ff41a3c5f0..b5ead7eaf8 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.core8.2099129833" + signature = "rusEFI master.2023.04.12.core8.191621600" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.core8.2099129833" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.core8.191621600" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:14 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:28 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 8618460312..33bd91b1b6 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.cypress.2930125701" + signature = "rusEFI master.2023.04.12.cypress.3637768076" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.cypress.2930125701" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.cypress.3637768076" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:33:44 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Apr 12 14:18:02 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index e5f1f15780..7f70188261 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.f407-discovery.3337172259" + signature = "rusEFI master.2023.04.12.f407-discovery.2963075370" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.f407-discovery.3337172259" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.f407-discovery.2963075370" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:29 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:40 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index e518c481b6..8eb901bd1f 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.f429-discovery.2930125701" + signature = "rusEFI master.2023.04.12.f429-discovery.3637768076" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.f429-discovery.2930125701" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.f429-discovery.3637768076" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:31 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:41 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 144a2e6f5d..cade2cf3b5 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.frankenso_na6.2364853071" + signature = "rusEFI master.2023.04.12.frankenso_na6.4202762054" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.frankenso_na6.2364853071" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.frankenso_na6.4202762054" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:20 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:33 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index f38759614d..cb7f981973 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.harley81.2309988045" + signature = "rusEFI master.2023.04.12.harley81.4292500164" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.harley81.2309988045" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.harley81.4292500164" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:33:52 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:08 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 203bf02c7b..51b303a879 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.hellen-gm-e67.4126339655" + signature = "rusEFI master.2023.04.12.hellen-gm-e67.2206676558" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.hellen-gm-e67.4126339655" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.hellen-gm-e67.2206676558" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:07 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:21 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index ef396e0871..51f283c003 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.hellen-honda-k.1674490771" + signature = "rusEFI master.2023.04.12.hellen-honda-k.364607386" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.hellen-honda-k.1674490771" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.hellen-honda-k.364607386" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:33:58 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:14 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 39553c1977..3c518071c2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.hellen-nb1.1145158404" + signature = "rusEFI master.2023.04.12.hellen-nb1.842301197" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.hellen-nb1.1145158404" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.hellen-nb1.842301197" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:05 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:20 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 5e75a08230..35b714bf0c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.hellen121nissan.1167835251" + signature = "rusEFI master.2023.04.12.hellen121nissan.871236730" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.hellen121nissan.1167835251" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.hellen121nissan.871236730" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:33:56 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:12 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 089d2dbca9..d6c6249697 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.hellen121vag.553800389" + signature = "rusEFI master.2023.04.12.hellen121vag.1467455180" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.hellen121vag.553800389" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.hellen121vag.1467455180" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:33:55 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:11 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index babef7b4de..45bff8d347 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.hellen128.143772158" + signature = "rusEFI master.2023.04.12.hellen128.2128874999" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.hellen128.143772158" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.hellen128.2128874999" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:33:54 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:09 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index d96f81ca4f..f5bd3ed321 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.hellen154hyundai.2561864186" + signature = "rusEFI master.2023.04.12.hellen154hyundai.4006032883" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.hellen154hyundai.2561864186" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.hellen154hyundai.4006032883" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:00 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:15 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index dc7fbcfd21..37bac7c5af 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.hellen72.2070114288" + signature = "rusEFI master.2023.04.12.hellen72.219589625" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.hellen72.2070114288" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.hellen72.219589625" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:02 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:18 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 80b879afb0..9371226a76 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.hellen81.3899246808" + signature = "rusEFI master.2023.04.12.hellen81.2652638417" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.hellen81.3899246808" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.hellen81.2652638417" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:04 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:19 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 39e34db9eb..9080314c7a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.hellen88bmw.3158510932" + signature = "rusEFI master.2023.04.12.hellen88bmw.3392588125" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.hellen88bmw.3158510932" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.hellen88bmw.3392588125" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:01 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:16 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 13c7f69e26..aab0f2361a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.hellenNA6.2215437150" + signature = "rusEFI master.2023.04.12.hellenNA6.4068026199" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.hellenNA6.2215437150" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.hellenNA6.4068026199" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:08 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:23 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 64146961e7..6e43291583 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.hellenNA8_96.2949976930" + signature = "rusEFI master.2023.04.12.hellenNA8_96.3651196779" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.hellenNA8_96.2949976930" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.hellenNA8_96.3651196779" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:10 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:24 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 80effec683..8d2b5688ed 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.kin.3329329481" + signature = "rusEFI master.2023.04.12.kin.2953071936" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.kin.3329329481" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.kin.2953071936" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:33:43 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Apr 12 14:18:01 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index c25dd27bb1..a79a35f46f 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.m74_9.1898510014" + signature = "rusEFI master.2023.04.12.m74_9.123548343" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.m74_9.1898510014" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.m74_9.123548343" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:17 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:30 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 2d12ea0938..c16704ee0b 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.mre_f4.1381639589" + signature = "rusEFI master.2023.04.12.mre_f4.607117740" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.mre_f4.1381639589" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.mre_f4.607117740" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:13 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:26 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4582,7 +4581,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 131769462f..ba7fe554c9 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.mre_f7.1381639589" + signature = "rusEFI master.2023.04.12.mre_f7.607117740" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.mre_f7.1381639589" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.mre_f7.607117740" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:11 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:25 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4582,7 +4581,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index d8baf64170..22accca100 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.prometheus_405.4266455651" + signature = "rusEFI master.2023.04.12.prometheus_405.2285450858" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.prometheus_405.4266455651" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.prometheus_405.2285450858" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:23 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:35 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index b874125127..6f57bb28fe 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.prometheus_469.4266455651" + signature = "rusEFI master.2023.04.12.prometheus_469.2285450858" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.prometheus_469.4266455651" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.prometheus_469.2285450858" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:22 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:34 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 6107f998e8..1832b57992 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.proteus_f4.2153886322" + signature = "rusEFI master.2023.04.12.proteus_f4.4128536187" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.proteus_f4.2153886322" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.proteus_f4.4128536187" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:26 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:38 UTC 2023 pageSize = 26432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index e079493686..e0aab4482b 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.proteus_f7.2153886322" + signature = "rusEFI master.2023.04.12.proteus_f7.4128536187" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.proteus_f7.2153886322" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.proteus_f7.4128536187" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:24 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:36 UTC 2023 pageSize = 26432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 0c6cd2d595..ba25d7c656 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.proteus_h7.2153886322" + signature = "rusEFI master.2023.04.12.proteus_h7.4128536187" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.proteus_h7.2153886322" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.proteus_h7.4128536187" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:28 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:39 UTC 2023 pageSize = 26432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index c2ae630bef..b650eb89e3 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.s105.2178895579" + signature = "rusEFI master.2023.04.12.s105.4155149010" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.s105.2178895579" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.s105.4155149010" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:19 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:31 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index b96b2f636c..78c104387a 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.subaru_eg33_f7.3715856680" + signature = "rusEFI master.2023.04.12.subaru_eg33_f7.2869869857" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.subaru_eg33_f7.3715856680" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.subaru_eg33_f7.2869869857" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:33:46 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:03 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 70f2557af8..c99291da86 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.04.12.tdg-pdm8.604506023" + signature = "rusEFI master.2023.04.12.tdg-pdm8.1383973806" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.04.12.tdg-pdm8.604506023" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.04.12.tdg-pdm8.1383973806" ; 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 @@ -87,7 +87,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 Wed Apr 12 00:34:34 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:44 UTC 2023 pageSize = 22432 page = 1 @@ -2400,28 +2400,27 @@ fuelPidCorrection2 = scalar, S16, 280, "%", 0.01, 0 rawTps1Secondary = scalar, S16, 282, "V", 0.001, 0 rawTps2Primary = scalar, S16, 284, "V", 0.001, 0 rawTps2Secondary = scalar, S16, 286, "V", 0.001, 0 -knockCount = scalar, U16, 288, "", 1, 0 -accelerationZ = scalar, S16, 290, "G", 0.01, 0 -accelerationRoll = scalar, S16, 292, "G", 0.01, 0 -accelerationYaw = scalar, S16, 294, "G", 0.01, 0 -vvtTargets1 = scalar, S08, 296, "deg", 1, 0 -vvtTargets2 = scalar, S08, 297, "deg", 1, 0 -vvtTargets3 = scalar, S08, 298, "deg", 1, 0 -vvtTargets4 = scalar, S08, 299, "deg", 1, 0 -turboSpeed = scalar, U16, 300, "hz", 1, 0 -tps1Split = scalar, S16, 302, "%", 0.01, 0 -tps2Split = scalar, S16, 304, "%", 0.01, 0 -tps12Split = scalar, S16, 306, "%", 0.01, 0 -accPedalSplit = scalar, S16, 308, "%", 0.01, 0 -sparkCutReason = scalar, S08, 310, "code", 1, 0 -fuelCutReason = scalar, S08, 311, "code", 1, 0 -mafEstimate = scalar, U16, 312, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 314, "rpm", 1, 0 -systemEventReuse = scalar, U16, 316, "counter", 1, 0 -rawMap = scalar, U16, 318, "V", 0.001, 0 -rawAfr = scalar, U16, 320, "V", 0.001, 0 -tpsAccelFrom = scalar, U08, 322, "%", 1, 0 -tpsAccelTo = scalar, U08, 323, "%", 1, 0 +accelerationZ = scalar, S16, 288, "G", 0.01, 0 +accelerationRoll = scalar, S16, 290, "G", 0.01, 0 +accelerationYaw = scalar, S16, 292, "G", 0.01, 0 +vvtTargets1 = scalar, S08, 294, "deg", 1, 0 +vvtTargets2 = scalar, S08, 295, "deg", 1, 0 +vvtTargets3 = scalar, S08, 296, "deg", 1, 0 +vvtTargets4 = scalar, S08, 297, "deg", 1, 0 +turboSpeed = scalar, U16, 298, "hz", 1, 0 +tps1Split = scalar, S16, 300, "%", 0.01, 0 +tps2Split = scalar, S16, 302, "%", 0.01, 0 +tps12Split = scalar, S16, 304, "%", 0.01, 0 +accPedalSplit = scalar, S16, 306, "%", 0.01, 0 +sparkCutReason = scalar, S08, 308, "code", 1, 0 +fuelCutReason = scalar, S08, 309, "code", 1, 0 +mafEstimate = scalar, U16, 310, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 312, "rpm", 1, 0 +systemEventReuse = scalar, U16, 314, "counter", 1, 0 +rawMap = scalar, U16, 316, "V", 0.001, 0 +rawAfr = scalar, U16, 318, "V", 0.001, 0 +tpsAccelFrom = scalar, U08, 320, "%", 1, 0 +tpsAccelTo = scalar, U08, 321, "%", 1, 0 calibrationValue2 = scalar, F32, 324, "", 1, 0 isMainRelayOn = bits, U32, 328, [0:0] isUsbConnected = bits, U32, 328, [1:1] @@ -4294,7 +4293,7 @@ gaugeCategory = Knock knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 + knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -4581,7 +4580,6 @@ entry = fuelPidCorrection2, "fuelPidCorrection 2", float, "%.3f" entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = knockCount, "knock: count", int, "%d" entry = accelerationZ, "Acceleration: Z", float, "%.3f" entry = accelerationRoll, "Acceleration: Roll", float, "%.3f" entry = accelerationYaw, "Acceleration: Yaw", float, "%.3f" 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 22ed1f2f1b..87f75d5c97 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 Wed Apr 12 00:34:37 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:47 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1231,7 +1231,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2023.04.12.f407-discovery.3337172259"; + public static final String TS_SIGNATURE = "rusEFI master.2023.04.12.f407-discovery.2963075370"; 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 = 1376; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index 7a7d01cf96..b2e8b812a0 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Apr 11 19:17:29 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Apr 12 14:18:00 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -568,28 +568,28 @@ public class TsOutputs { public static final Field RAWTPS1SECONDARY = Field.create("RAWTPS1SECONDARY", 282, FieldType.INT16).setScale(0.001).setBaseOffset(0); public static final Field RAWTPS2PRIMARY = Field.create("RAWTPS2PRIMARY", 284, FieldType.INT16).setScale(0.001).setBaseOffset(0); public static final Field RAWTPS2SECONDARY = Field.create("RAWTPS2SECONDARY", 286, FieldType.INT16).setScale(0.001).setBaseOffset(0); - public static final Field KNOCKCOUNT = Field.create("KNOCKCOUNT", 288, FieldType.INT16).setScale(1.0).setBaseOffset(0); - public static final Field ACCELERATIONZ = Field.create("ACCELERATIONZ", 290, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field ACCELERATIONROLL = Field.create("ACCELERATIONROLL", 292, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field ACCELERATIONYAW = Field.create("ACCELERATIONYAW", 294, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field VVTTARGETS1 = Field.create("VVTTARGETS1", 296, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field VVTTARGETS2 = Field.create("VVTTARGETS2", 297, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field VVTTARGETS3 = Field.create("VVTTARGETS3", 298, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field VVTTARGETS4 = Field.create("VVTTARGETS4", 299, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field TURBOSPEED = Field.create("TURBOSPEED", 300, FieldType.INT16).setScale(1.0).setBaseOffset(0); - public static final Field TPS1SPLIT = Field.create("TPS1SPLIT", 302, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field TPS2SPLIT = Field.create("TPS2SPLIT", 304, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field TPS12SPLIT = Field.create("TPS12SPLIT", 306, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field ACCPEDALSPLIT = Field.create("ACCPEDALSPLIT", 308, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field SPARKCUTREASON = Field.create("SPARKCUTREASON", 310, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field FUELCUTREASON = Field.create("FUELCUTREASON", 311, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field MAFESTIMATE = Field.create("MAFESTIMATE", 312, FieldType.INT16).setScale(0.1).setBaseOffset(0); - public static final Field INSTANTRPM = Field.create("INSTANTRPM", 314, FieldType.INT16).setScale(1.0).setBaseOffset(0); - public static final Field SYSTEMEVENTREUSE = Field.create("SYSTEMEVENTREUSE", 316, FieldType.INT16).setScale(1.0).setBaseOffset(0); - public static final Field RAWMAP = Field.create("RAWMAP", 318, FieldType.INT16).setScale(0.001).setBaseOffset(0); - public static final Field RAWAFR = Field.create("RAWAFR", 320, FieldType.INT16).setScale(0.001).setBaseOffset(0); - public static final Field TPSACCELFROM = Field.create("TPSACCELFROM", 322, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field TPSACCELTO = Field.create("TPSACCELTO", 323, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field ACCELERATIONZ = Field.create("ACCELERATIONZ", 288, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field ACCELERATIONROLL = Field.create("ACCELERATIONROLL", 290, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field ACCELERATIONYAW = Field.create("ACCELERATIONYAW", 292, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field VVTTARGETS1 = Field.create("VVTTARGETS1", 294, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field VVTTARGETS2 = Field.create("VVTTARGETS2", 295, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field VVTTARGETS3 = Field.create("VVTTARGETS3", 296, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field VVTTARGETS4 = Field.create("VVTTARGETS4", 297, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field TURBOSPEED = Field.create("TURBOSPEED", 298, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field TPS1SPLIT = Field.create("TPS1SPLIT", 300, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field TPS2SPLIT = Field.create("TPS2SPLIT", 302, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field TPS12SPLIT = Field.create("TPS12SPLIT", 304, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field ACCPEDALSPLIT = Field.create("ACCPEDALSPLIT", 306, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field SPARKCUTREASON = Field.create("SPARKCUTREASON", 308, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field FUELCUTREASON = Field.create("FUELCUTREASON", 309, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field MAFESTIMATE = Field.create("MAFESTIMATE", 310, FieldType.INT16).setScale(0.1).setBaseOffset(0); + public static final Field INSTANTRPM = Field.create("INSTANTRPM", 312, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field SYSTEMEVENTREUSE = Field.create("SYSTEMEVENTREUSE", 314, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field RAWMAP = Field.create("RAWMAP", 316, FieldType.INT16).setScale(0.001).setBaseOffset(0); + public static final Field RAWAFR = Field.create("RAWAFR", 318, FieldType.INT16).setScale(0.001).setBaseOffset(0); + public static final Field TPSACCELFROM = Field.create("TPSACCELFROM", 320, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field TPSACCELTO = Field.create("TPSACCELTO", 321, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field ALIGNMENTFILL_AT_322 = Field.create("ALIGNMENTFILL_AT_322", 322, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field CALIBRATIONVALUE2 = Field.create("CALIBRATIONVALUE2", 324, FieldType.FLOAT).setBaseOffset(0); public static final Field ISMAINRELAYON = Field.create("ISMAINRELAYON", 328, FieldType.BIT, 0).setBaseOffset(0); public static final Field ISUSBCONNECTED = Field.create("ISUSBCONNECTED", 328, FieldType.BIT, 1).setBaseOffset(0); @@ -1049,7 +1049,6 @@ public class TsOutputs { RAWTPS1SECONDARY, RAWTPS2PRIMARY, RAWTPS2SECONDARY, - KNOCKCOUNT, ACCELERATIONZ, ACCELERATIONROLL, ACCELERATIONYAW, @@ -1071,6 +1070,7 @@ public class TsOutputs { RAWAFR, TPSACCELFROM, TPSACCELTO, + ALIGNMENTFILL_AT_322, CALIBRATIONVALUE2, ISMAINRELAYON, ISUSBCONNECTED,