diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 3b422c6fbf..b7f68cf5e2 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -1907,7 +1907,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 940 -#define SIGNATURE_HASH 1585712979 +#define SIGNATURE_HASH 1283995558 #define silentTriggerError_offset 1340 #define skippedWheelOnCam_offset 1340 #define slowAdcAlpha_offset 1580 @@ -2490,7 +2490,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.05.13.hellen_cypress.1585712979" +#define TS_SIGNATURE "rusEFI 2022.05.14.hellen_cypress.1283995558" #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 8524fcf531..b6aa659470 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1893,7 +1893,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 940 -#define SIGNATURE_HASH 13068510 +#define SIGNATURE_HASH 315314219 #define silentTriggerError_offset 1340 #define skippedWheelOnCam_offset 1340 #define slowAdcAlpha_offset 1580 @@ -2476,7 +2476,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.05.13.kin.13068510" +#define TS_SIGNATURE "rusEFI 2022.05.14.kin.315314219" #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 cf6689a344..dbf9f23f23 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 @@ -1889,7 +1889,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 940 -#define SIGNATURE_HASH 1961447896 +#define SIGNATURE_HASH 1726310701 #define silentTriggerError_offset 1340 #define skippedWheelOnCam_offset 1340 #define slowAdcAlpha_offset 1580 @@ -2473,7 +2473,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2022.05.13.subaru_eg33_f7.1961447896" +#define TS_SIGNATURE "rusEFI 2022.05.14.subaru_eg33_f7.1726310701" #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 3adab30fa4..2a037072af 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -213,6 +213,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index f729422b33..ca8edae1ba 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -247,14 +247,8 @@ testBenchIterGauge = testBenchIter,"testBenchIter", "count", 0.0,0.0, 0.0,0.0, 0 unusedWatGauge = unusedWat,"unusedWat", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 tcRatioGauge = tcRatio,"Torque Converter Ratio", "value", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 lastShiftTimeGauge = lastShiftTime,"S", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedInTheMiddle1Gauge = unusedInTheMiddle1,"unusedInTheMiddle 1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle2Gauge = unusedInTheMiddle2,"unusedInTheMiddle 2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle3Gauge = unusedInTheMiddle3,"unusedInTheMiddle 3", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle4Gauge = unusedInTheMiddle4,"unusedInTheMiddle 4", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle5Gauge = unusedInTheMiddle5,"unusedInTheMiddle 5", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle6Gauge = unusedInTheMiddle6,"unusedInTheMiddle 6", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle7Gauge = unusedInTheMiddle7,"unusedInTheMiddle 7", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle8Gauge = unusedInTheMiddle8,"unusedInTheMiddle 8", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +vssEdgeCounterGauge = vssEdgeCounter,"vssEdgeCounter", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +issEdgeCounterGauge = issEdgeCounter,"issEdgeCounter", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 auxLinear1Gauge = auxLinear1,"Aux Linear 1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 auxLinear2Gauge = auxLinear2,"Aux Linear 2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 launchSpeedConditionGauge = launchSpeedCondition,"launchSpeedCondition", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 @@ -265,30 +259,30 @@ launchIsLaunchConditionGauge = launchIsLaunchCondition,"launchIsLaunchCondition" launchCombinedConditionsGauge = launchCombinedConditions,"launchCombinedConditions", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 dfcoActiveGauge = dfcoActive,"dfcoActive", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 tpsAccelActiveGauge = tpsAccelActive,"tpsAccelActive", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_8Gauge = unusedBit_229_8,"unusedBit_229_8", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_9Gauge = unusedBit_229_9,"unusedBit_229_9", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_10Gauge = unusedBit_229_10,"unusedBit_229_10", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_11Gauge = unusedBit_229_11,"unusedBit_229_11", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_12Gauge = unusedBit_229_12,"unusedBit_229_12", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_13Gauge = unusedBit_229_13,"unusedBit_229_13", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_14Gauge = unusedBit_229_14,"unusedBit_229_14", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_15Gauge = unusedBit_229_15,"unusedBit_229_15", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_16Gauge = unusedBit_229_16,"unusedBit_229_16", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_17Gauge = unusedBit_229_17,"unusedBit_229_17", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_18Gauge = unusedBit_229_18,"unusedBit_229_18", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_19Gauge = unusedBit_229_19,"unusedBit_229_19", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_20Gauge = unusedBit_229_20,"unusedBit_229_20", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_21Gauge = unusedBit_229_21,"unusedBit_229_21", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_22Gauge = unusedBit_229_22,"unusedBit_229_22", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_23Gauge = unusedBit_229_23,"unusedBit_229_23", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_24Gauge = unusedBit_229_24,"unusedBit_229_24", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_25Gauge = unusedBit_229_25,"unusedBit_229_25", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_26Gauge = unusedBit_229_26,"unusedBit_229_26", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_27Gauge = unusedBit_229_27,"unusedBit_229_27", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_28Gauge = unusedBit_229_28,"unusedBit_229_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_29Gauge = unusedBit_229_29,"unusedBit_229_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_30Gauge = unusedBit_229_30,"unusedBit_229_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_229_31Gauge = unusedBit_229_31,"unusedBit_229_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_8Gauge = unusedBit_230_8,"unusedBit_230_8", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_9Gauge = unusedBit_230_9,"unusedBit_230_9", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_10Gauge = unusedBit_230_10,"unusedBit_230_10", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_11Gauge = unusedBit_230_11,"unusedBit_230_11", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_12Gauge = unusedBit_230_12,"unusedBit_230_12", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_13Gauge = unusedBit_230_13,"unusedBit_230_13", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_14Gauge = unusedBit_230_14,"unusedBit_230_14", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_15Gauge = unusedBit_230_15,"unusedBit_230_15", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_16Gauge = unusedBit_230_16,"unusedBit_230_16", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_17Gauge = unusedBit_230_17,"unusedBit_230_17", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_18Gauge = unusedBit_230_18,"unusedBit_230_18", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_19Gauge = unusedBit_230_19,"unusedBit_230_19", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_20Gauge = unusedBit_230_20,"unusedBit_230_20", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_21Gauge = unusedBit_230_21,"unusedBit_230_21", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_22Gauge = unusedBit_230_22,"unusedBit_230_22", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_23Gauge = unusedBit_230_23,"unusedBit_230_23", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_24Gauge = unusedBit_230_24,"unusedBit_230_24", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_25Gauge = unusedBit_230_25,"unusedBit_230_25", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_26Gauge = unusedBit_230_26,"unusedBit_230_26", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_27Gauge = unusedBit_230_27,"unusedBit_230_27", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_28Gauge = unusedBit_230_28,"unusedBit_230_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_29Gauge = unusedBit_230_29,"unusedBit_230_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_30Gauge = unusedBit_230_30,"unusedBit_230_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_230_31Gauge = unusedBit_230_31,"unusedBit_230_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 boostControllerOutputGauge = boostControllerOutput,"Boost Output", "%", 0.0,100.0, 0.0,100.0, 0.0,100.0, 1,1 boostControllerOpenLoopPartGauge = boostControllerOpenLoopPart,"Boost Open Loop", "%", 0.0,100.0, 0.0,100.0, 0.0,100.0, 1,1 fallbackMapGauge = fallbackMap,"fallbackMap", "kPa", 0.0,1000.0, 0.0,1000.0, 0.0,1000.0, 1,1 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 0e4f794816..bad77fba4c 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -247,14 +247,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -265,30 +259,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index cd32bf22b0..48bc05a18d 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -183,14 +183,8 @@ testBenchIter("testBenchIter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 388 unusedWat("unusedWat", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 389, 1.0, -1.0, -1.0, ""), tcRatio("Torque Converter Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 390, 0.01, 0.0, 0.0, "value"), lastShiftTime("S", SensorCategory.SENSOR_INPUTS, FieldType.INT, 392, 1.0, -1.0, -1.0, ""), -unusedInTheMiddle1("unusedInTheMiddle 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 396, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle2("unusedInTheMiddle 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 397, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle3("unusedInTheMiddle 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 398, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle4("unusedInTheMiddle 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 399, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle5("unusedInTheMiddle 5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 400, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle6("unusedInTheMiddle 6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 401, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle7("unusedInTheMiddle 7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 402, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle8("unusedInTheMiddle 8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 403, 1.0, 0.0, 0.0, ""), +vssEdgeCounter("vssEdgeCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 396, 1.0, -1.0, -1.0, ""), +issEdgeCounter("issEdgeCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 400, 1.0, -1.0, -1.0, ""), auxLinear1("Aux Linear 1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 404, 0.01, 0.0, 0.0, ""), auxLinear2("Aux Linear 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 406, 0.01, 0.0, 0.0, ""), boostControllerOutput("Boost Output", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 412, 0.5, 0.0, 100.0, "%"), diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index f2af376644..8314920ea2 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 Mon May 09 09:39:55 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat May 14 12:18:31 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1078,7 +1078,11 @@ struct output_channels_s { /** * offset 396 */ - uint8_t unusedInTheMiddle[8]; + int vssEdgeCounter = (int)0; + /** + * offset 400 + */ + int issEdgeCounter = (int)0; /** * @@GAUGE_NAME_AUX_LINEAR_1@@ * offset 404 @@ -1115,76 +1119,76 @@ struct output_channels_s { bool tpsAccelActive : 1 {}; /** offset 408 bit 8 */ - bool unusedBit_229_8 : 1 {}; + bool unusedBit_230_8 : 1 {}; /** offset 408 bit 9 */ - bool unusedBit_229_9 : 1 {}; + bool unusedBit_230_9 : 1 {}; /** offset 408 bit 10 */ - bool unusedBit_229_10 : 1 {}; + bool unusedBit_230_10 : 1 {}; /** offset 408 bit 11 */ - bool unusedBit_229_11 : 1 {}; + bool unusedBit_230_11 : 1 {}; /** offset 408 bit 12 */ - bool unusedBit_229_12 : 1 {}; + bool unusedBit_230_12 : 1 {}; /** offset 408 bit 13 */ - bool unusedBit_229_13 : 1 {}; + bool unusedBit_230_13 : 1 {}; /** offset 408 bit 14 */ - bool unusedBit_229_14 : 1 {}; + bool unusedBit_230_14 : 1 {}; /** offset 408 bit 15 */ - bool unusedBit_229_15 : 1 {}; + bool unusedBit_230_15 : 1 {}; /** offset 408 bit 16 */ - bool unusedBit_229_16 : 1 {}; + bool unusedBit_230_16 : 1 {}; /** offset 408 bit 17 */ - bool unusedBit_229_17 : 1 {}; + bool unusedBit_230_17 : 1 {}; /** offset 408 bit 18 */ - bool unusedBit_229_18 : 1 {}; + bool unusedBit_230_18 : 1 {}; /** offset 408 bit 19 */ - bool unusedBit_229_19 : 1 {}; + bool unusedBit_230_19 : 1 {}; /** offset 408 bit 20 */ - bool unusedBit_229_20 : 1 {}; + bool unusedBit_230_20 : 1 {}; /** offset 408 bit 21 */ - bool unusedBit_229_21 : 1 {}; + bool unusedBit_230_21 : 1 {}; /** offset 408 bit 22 */ - bool unusedBit_229_22 : 1 {}; + bool unusedBit_230_22 : 1 {}; /** offset 408 bit 23 */ - bool unusedBit_229_23 : 1 {}; + bool unusedBit_230_23 : 1 {}; /** offset 408 bit 24 */ - bool unusedBit_229_24 : 1 {}; + bool unusedBit_230_24 : 1 {}; /** offset 408 bit 25 */ - bool unusedBit_229_25 : 1 {}; + bool unusedBit_230_25 : 1 {}; /** offset 408 bit 26 */ - bool unusedBit_229_26 : 1 {}; + bool unusedBit_230_26 : 1 {}; /** offset 408 bit 27 */ - bool unusedBit_229_27 : 1 {}; + bool unusedBit_230_27 : 1 {}; /** offset 408 bit 28 */ - bool unusedBit_229_28 : 1 {}; + bool unusedBit_230_28 : 1 {}; /** offset 408 bit 29 */ - bool unusedBit_229_29 : 1 {}; + bool unusedBit_230_29 : 1 {}; /** offset 408 bit 30 */ - bool unusedBit_229_30 : 1 {}; + bool unusedBit_230_30 : 1 {}; /** offset 408 bit 31 */ - bool unusedBit_229_31 : 1 {}; + bool unusedBit_230_31 : 1 {}; /** * @@GAUGE_NAME_BOOST_OUTPUT@@ % @@ -1364,4 +1368,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 616); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon May 09 09:39:55 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat May 14 12:18:31 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 95bdf97542..1fb6b8596e 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1907,7 +1907,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 940 -#define SIGNATURE_HASH 464011609 +#define SIGNATURE_HASH 161773996 #define silentTriggerError_offset 1340 #define skippedWheelOnCam_offset 1340 #define slowAdcAlpha_offset 1580 @@ -2490,7 +2490,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.05.13.all.464011609" +#define TS_SIGNATURE "rusEFI 2022.05.14.all.161773996" #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_all.h b/firmware/controllers/generated/signature_all.h index 38b24f74df..c59270d63a 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 464011609 -#define TS_SIGNATURE "rusEFI 2022.05.13.all.464011609" +#define SIGNATURE_HASH 161773996 +#define TS_SIGNATURE "rusEFI 2022.05.14.all.161773996" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 6d225cbd11..81671f3659 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 null // -#define SIGNATURE_HASH 3990541397 -#define TS_SIGNATURE "rusEFI 2022.05.13.alphax-2chan.3990541397" +#define SIGNATURE_HASH 4292275360 +#define TS_SIGNATURE "rusEFI 2022.05.14.alphax-2chan.4292275360" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 02f468cb2e..3deef603fa 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 null // -#define SIGNATURE_HASH 3685838680 -#define TS_SIGNATURE "rusEFI 2022.05.13.alphax-4chan.3685838680" +#define SIGNATURE_HASH 3384629165 +#define TS_SIGNATURE "rusEFI 2022.05.14.alphax-4chan.3384629165" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 7cf7bb698f..c94435b821 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 null // -#define SIGNATURE_HASH 123909246 -#define TS_SIGNATURE "rusEFI 2022.05.13.atlas.123909246" +#define SIGNATURE_HASH 359566475 +#define TS_SIGNATURE "rusEFI 2022.05.14.atlas.359566475" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 9405de230f..4eeeb64af4 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 null // -#define SIGNATURE_HASH 3091530608 -#define TS_SIGNATURE "rusEFI 2022.05.13.core8.3091530608" +#define SIGNATURE_HASH 2856926085 +#define TS_SIGNATURE "rusEFI 2022.05.14.core8.2856926085" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 75f5574c75..17400e6b86 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 null // -#define SIGNATURE_HASH 464011609 -#define TS_SIGNATURE "rusEFI 2022.05.13.f429-discovery.464011609" +#define SIGNATURE_HASH 161773996 +#define TS_SIGNATURE "rusEFI 2022.05.14.f429-discovery.161773996" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index c4b9daae96..16d03033b8 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 null // -#define SIGNATURE_HASH 1506065821 -#define TS_SIGNATURE "rusEFI 2022.05.13.frankenso_na6.1506065821" +#define SIGNATURE_HASH 1271432552 +#define TS_SIGNATURE "rusEFI 2022.05.14.frankenso_na6.1271432552" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index f1c55068a5..496773fd15 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 null // -#define SIGNATURE_HASH 2557756025 -#define TS_SIGNATURE "rusEFI 2022.05.13.harley81.2557756025" +#define SIGNATURE_HASH 2323151500 +#define TS_SIGNATURE "rusEFI 2022.05.14.harley81.2323151500" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index d8a1003c84..b299228be0 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 null // -#define SIGNATURE_HASH 3754250551 -#define TS_SIGNATURE "rusEFI 2022.05.13.hellen-nb1.3754250551" +#define SIGNATURE_HASH 3452529090 +#define TS_SIGNATURE "rusEFI 2022.05.14.hellen-nb1.3452529090" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index f4c9d1e454..924ca3c6cc 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 null // -#define SIGNATURE_HASH 1734779567 -#define TS_SIGNATURE "rusEFI 2022.05.13.hellen121nissan.1734779567" +#define SIGNATURE_HASH 1969920602 +#define TS_SIGNATURE "rusEFI 2022.05.14.hellen121nissan.1969920602" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 6f056a1701..3175502229 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 null // -#define SIGNATURE_HASH 1316698558 -#define TS_SIGNATURE "rusEFI 2022.05.13.hellen121vag.1316698558" +#define SIGNATURE_HASH 1551302987 +#define TS_SIGNATURE "rusEFI 2022.05.14.hellen121vag.1551302987" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index ce57d79e03..32e7ec66ce 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 null // -#define SIGNATURE_HASH 2408664743 -#define TS_SIGNATURE "rusEFI 2022.05.13.hellen128.2408664743" +#define SIGNATURE_HASH 2644342354 +#define TS_SIGNATURE "rusEFI 2022.05.14.hellen128.2644342354" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index e846cff417..e6f71d9c00 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 null // -#define SIGNATURE_HASH 3484719636 -#define TS_SIGNATURE "rusEFI 2022.05.13.hellen154hyundai.3484719636" +#define SIGNATURE_HASH 3719865057 +#define TS_SIGNATURE "rusEFI 2022.05.14.hellen154hyundai.3719865057" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index bf5cf5d7d8..c746324185 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 null // -#define SIGNATURE_HASH 63095151 -#define TS_SIGNATURE "rusEFI 2022.05.13.hellen72.63095151" +#define SIGNATURE_HASH 298776986 +#define TS_SIGNATURE "rusEFI 2022.05.14.hellen72.298776986" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index d43a86457f..e26ea63c16 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 null // -#define SIGNATURE_HASH 1248232302 -#define TS_SIGNATURE "rusEFI 2022.05.13.hellen81.1248232302" +#define SIGNATURE_HASH 1483389851 +#define TS_SIGNATURE "rusEFI 2022.05.14.hellen81.1483389851" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index cb2638c018..67a92985c8 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 null // -#define SIGNATURE_HASH 3527459781 -#define TS_SIGNATURE "rusEFI 2022.05.13.hellen88bmw.3527459781" +#define SIGNATURE_HASH 3226270512 +#define TS_SIGNATURE "rusEFI 2022.05.14.hellen88bmw.3226270512" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 8bd1b1fc8f..06b4ecd4a9 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 null // -#define SIGNATURE_HASH 219576285 -#define TS_SIGNATURE "rusEFI 2022.05.13.hellenNA6.219576285" +#define SIGNATURE_HASH 521817896 +#define TS_SIGNATURE "rusEFI 2022.05.14.hellenNA6.521817896" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index f3df1c30e2..c376aa61cc 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 null // -#define SIGNATURE_HASH 2060557880 -#define TS_SIGNATURE "rusEFI 2022.05.13.hellenNA8_96.2060557880" +#define SIGNATURE_HASH 1759356621 +#define TS_SIGNATURE "rusEFI 2022.05.14.hellenNA8_96.1759356621" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 914eaabda2..37930f57e1 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 1585712979 -#define TS_SIGNATURE "rusEFI 2022.05.13.hellen_cypress.1585712979" +#define SIGNATURE_HASH 1283995558 +#define TS_SIGNATURE "rusEFI 2022.05.14.hellen_cypress.1283995558" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 76bd239e0a..2698737f91 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 null // -#define SIGNATURE_HASH 13068510 -#define TS_SIGNATURE "rusEFI 2022.05.13.kin.13068510" +#define SIGNATURE_HASH 315314219 +#define TS_SIGNATURE "rusEFI 2022.05.14.kin.315314219" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 05176c024b..f56297d032 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 null // -#define SIGNATURE_HASH 2538582536 -#define TS_SIGNATURE "rusEFI 2022.05.13.mre_f4.2538582536" +#define SIGNATURE_HASH 2235796221 +#define TS_SIGNATURE "rusEFI 2022.05.14.mre_f4.2235796221" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 5326f40ee2..4077af7887 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 null // -#define SIGNATURE_HASH 2538582536 -#define TS_SIGNATURE "rusEFI 2022.05.13.mre_f7.2538582536" +#define SIGNATURE_HASH 2235796221 +#define TS_SIGNATURE "rusEFI 2022.05.14.mre_f7.2235796221" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 09aefdfad3..87f30219b0 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 null // -#define SIGNATURE_HASH 1262655679 -#define TS_SIGNATURE "rusEFI 2022.05.13.prometheus_405.1262655679" +#define SIGNATURE_HASH 1498325066 +#define TS_SIGNATURE "rusEFI 2022.05.14.prometheus_405.1498325066" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 52803574d4..49d17935dd 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 null // -#define SIGNATURE_HASH 1262655679 -#define TS_SIGNATURE "rusEFI 2022.05.13.prometheus_469.1262655679" +#define SIGNATURE_HASH 1498325066 +#define TS_SIGNATURE "rusEFI 2022.05.14.prometheus_469.1498325066" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index a878d0eb37..0b982fc55b 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 null // -#define SIGNATURE_HASH 3220475185 -#define TS_SIGNATURE "rusEFI 2022.05.13.proteus_f4.3220475185" +#define SIGNATURE_HASH 2918757828 +#define TS_SIGNATURE "rusEFI 2022.05.14.proteus_f4.2918757828" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 89b186906b..70eefa5125 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 null // -#define SIGNATURE_HASH 3220475185 -#define TS_SIGNATURE "rusEFI 2022.05.13.proteus_f7.3220475185" +#define SIGNATURE_HASH 2918757828 +#define TS_SIGNATURE "rusEFI 2022.05.14.proteus_f7.2918757828" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 69a35c01f3..e6d00a96d1 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 null // -#define SIGNATURE_HASH 3220475185 -#define TS_SIGNATURE "rusEFI 2022.05.13.proteus_h7.3220475185" +#define SIGNATURE_HASH 2918757828 +#define TS_SIGNATURE "rusEFI 2022.05.14.proteus_h7.2918757828" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index a2f11814cd..0e36e8b0eb 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 null // -#define SIGNATURE_HASH 1961447896 -#define TS_SIGNATURE "rusEFI 2022.05.13.subaru_eg33_f7.1961447896" +#define SIGNATURE_HASH 1726310701 +#define TS_SIGNATURE "rusEFI 2022.05.14.subaru_eg33_f7.1726310701" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 90637e7bfa..eb11c7db8b 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 null // -#define SIGNATURE_HASH 3677506841 -#define TS_SIGNATURE "rusEFI 2022.05.13.tdg-pdm8.3677506841" +#define SIGNATURE_HASH 3376313836 +#define TS_SIGNATURE "rusEFI 2022.05.14.tdg-pdm8.3376313836" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index ef828fcc44..118df2d77c 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -354,6 +354,10 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.tcRatio; if (strEqualCaseInsensitive(name, "lastShiftTime")) return engine->outputChannels.lastShiftTime; + if (strEqualCaseInsensitive(name, "vssEdgeCounter")) + return engine->outputChannels.vssEdgeCounter; + if (strEqualCaseInsensitive(name, "issEdgeCounter")) + return engine->outputChannels.issEdgeCounter; if (strEqualCaseInsensitive(name, "auxLinear1")) return engine->outputChannels.auxLinear1; if (strEqualCaseInsensitive(name, "auxLinear2")) diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 626e73487e..c83eaa44c9 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.all.464011609" + signature = "rusEFI 2022.05.14.all.161773996" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.all.464011609" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.all.161773996" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:19:02 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index de4b91160e..af0bec86a3 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.alphax-2chan.3990541397" + signature = "rusEFI 2022.05.14.alphax-2chan.4292275360" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.alphax-2chan.3990541397" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.alphax-2chan.4292275360" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:33 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 0b96846b95..f48368deca 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.alphax-4chan.3685838680" + signature = "rusEFI 2022.05.14.alphax-4chan.3384629165" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.alphax-4chan.3685838680" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.alphax-4chan.3384629165" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:34 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 33717350bd..225e3edf01 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.atlas.123909246" + signature = "rusEFI 2022.05.14.atlas.359566475" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.atlas.123909246" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.atlas.359566475" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:19:00 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 7e0db4e359..fdea55e32d 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.core8.3091530608" + signature = "rusEFI 2022.05.14.core8.2856926085" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.core8.3091530608" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.core8.2856926085" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:50 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 4c8273c76b..96dbc05f52 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.f429-discovery.464011609" + signature = "rusEFI 2022.05.14.f429-discovery.161773996" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.f429-discovery.464011609" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.f429-discovery.161773996" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:59 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 545608af6b..5998f54b89 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.frankenso_na6.1506065821" + signature = "rusEFI 2022.05.14.frankenso_na6.1271432552" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.frankenso_na6.1506065821" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.frankenso_na6.1271432552" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:52 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index a98f49511a..8d5dd3e72a 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.harley81.2557756025" + signature = "rusEFI 2022.05.14.harley81.2323151500" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.harley81.2557756025" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.harley81.2323151500" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:35 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index ef33c05379..cd00aba5dc 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.hellen-nb1.3754250551" + signature = "rusEFI 2022.05.14.hellen-nb1.3452529090" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.hellen-nb1.3754250551" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.hellen-nb1.3452529090" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:45 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index abe2106c83..99aa1457b3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.hellen121nissan.1734779567" + signature = "rusEFI 2022.05.14.hellen121nissan.1969920602" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.hellen121nissan.1734779567" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.hellen121nissan.1969920602" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:39 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index c4e3d00971..9311aa3197 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.hellen121vag.1316698558" + signature = "rusEFI 2022.05.14.hellen121vag.1551302987" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.hellen121vag.1316698558" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.hellen121vag.1551302987" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:37 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index d8f2ab539b..1c1cc18dfe 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.hellen128.2408664743" + signature = "rusEFI 2022.05.14.hellen128.2644342354" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.hellen128.2408664743" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.hellen128.2644342354" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:36 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 73eb47c326..27b7aa5a50 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.hellen154hyundai.3484719636" + signature = "rusEFI 2022.05.14.hellen154hyundai.3719865057" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.hellen154hyundai.3484719636" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.hellen154hyundai.3719865057" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:40 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 665b1f3e47..3b22d3b156 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.hellen72.63095151" + signature = "rusEFI 2022.05.14.hellen72.298776986" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.hellen72.63095151" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.hellen72.298776986" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:42 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 7558cdffd9..5038ada863 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.hellen81.1248232302" + signature = "rusEFI 2022.05.14.hellen81.1483389851" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.hellen81.1248232302" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.hellen81.1483389851" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:43 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 9cc65d4f45..e1d30af793 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.hellen88bmw.3527459781" + signature = "rusEFI 2022.05.14.hellen88bmw.3226270512" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.hellen88bmw.3527459781" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.hellen88bmw.3226270512" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:41 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 5cf78a6d03..79aaba9936 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.hellenNA6.219576285" + signature = "rusEFI 2022.05.14.hellenNA6.521817896" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.hellenNA6.219576285" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.hellenNA6.521817896" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:46 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index c81f1c64cd..86e39dcb40 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.hellenNA8_96.2060557880" + signature = "rusEFI 2022.05.14.hellenNA8_96.1759356621" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.hellenNA8_96.2060557880" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.hellenNA8_96.1759356621" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:47 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 9245ad4ec1..9c9e892506 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.hellen_cypress.1585712979" + signature = "rusEFI 2022.05.14.hellen_cypress.1283995558" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.hellen_cypress.1585712979" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.hellen_cypress.1283995558" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat May 14 12:19:04 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index a304b7671d..a5536c2c82 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.kin.13068510" + signature = "rusEFI 2022.05.14.kin.315314219" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.kin.13068510" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.kin.315314219" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat May 14 12:19:03 UTC 2022 pageSize = 21324 page = 1 @@ -2350,14 +2350,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2368,30 +2362,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -3986,6 +3980,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4344,6 +4340,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 0cd2fba351..1fa6b3aeca 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.mre_f4.2538582536" + signature = "rusEFI 2022.05.14.mre_f4.2235796221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.mre_f4.2538582536" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.mre_f4.2235796221" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:49 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 2c4cdae05a..06cb19e833 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.mre_f7.2538582536" + signature = "rusEFI 2022.05.14.mre_f7.2235796221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.mre_f7.2538582536" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.mre_f7.2235796221" ; 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 @@ -84,7 +84,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 Fri May 13 03:56:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:48 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 3d63f34833..a225ef9eb4 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.prometheus_405.1262655679" + signature = "rusEFI 2022.05.14.prometheus_405.1498325066" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.prometheus_405.1262655679" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.prometheus_405.1498325066" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:54 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index e0f01b1fe8..8ca7817e5f 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.prometheus_469.1262655679" + signature = "rusEFI 2022.05.14.prometheus_469.1498325066" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.prometheus_469.1262655679" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.prometheus_469.1498325066" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:53 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 30d43f0e12..ee6c10f07c 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.proteus_f4.3220475185" + signature = "rusEFI 2022.05.14.proteus_f4.2918757828" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.proteus_f4.3220475185" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.proteus_f4.2918757828" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:56 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 6078e1f627..2e0bdbdb85 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.proteus_f7.3220475185" + signature = "rusEFI 2022.05.14.proteus_f7.2918757828" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.proteus_f7.3220475185" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.proteus_f7.2918757828" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:55 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 9911ff96c4..4814e6a54b 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.proteus_h7.3220475185" + signature = "rusEFI 2022.05.14.proteus_h7.2918757828" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.proteus_h7.3220475185" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.proteus_h7.2918757828" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:18:57 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index c3f17b6d45..a9dad2e65d 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.subaru_eg33_f7.1961447896" + signature = "rusEFI 2022.05.14.subaru_eg33_f7.1726310701" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.subaru_eg33_f7.1961447896" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.subaru_eg33_f7.1726310701" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sat May 14 12:19:05 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 3c8a542429..6726677f6c 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.13.tdg-pdm8.3677506841" + signature = "rusEFI 2022.05.14.tdg-pdm8.3376313836" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.05.13.tdg-pdm8.3677506841" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.14.tdg-pdm8.3376313836" ; 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 @@ -84,7 +84,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 Fri May 13 03:57:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:19:01 UTC 2022 pageSize = 21352 page = 1 @@ -2389,14 +2389,8 @@ testBenchIter = scalar, U08, 388, "count", 1, 0 unusedWat = scalar, U08, 389, "", 1, 0 tcRatio = scalar, U16, 390, "value", 0.01, 0 lastShiftTime = scalar, F32, 392, "", 1, 0 -unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 +vssEdgeCounter = scalar, S32, 396, "", 1, 0 +issEdgeCounter = scalar, S32, 400, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2407,30 +2401,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_229_8 = bits, U32, 408, [8:8] -unusedBit_229_9 = bits, U32, 408, [9:9] -unusedBit_229_10 = bits, U32, 408, [10:10] -unusedBit_229_11 = bits, U32, 408, [11:11] -unusedBit_229_12 = bits, U32, 408, [12:12] -unusedBit_229_13 = bits, U32, 408, [13:13] -unusedBit_229_14 = bits, U32, 408, [14:14] -unusedBit_229_15 = bits, U32, 408, [15:15] -unusedBit_229_16 = bits, U32, 408, [16:16] -unusedBit_229_17 = bits, U32, 408, [17:17] -unusedBit_229_18 = bits, U32, 408, [18:18] -unusedBit_229_19 = bits, U32, 408, [19:19] -unusedBit_229_20 = bits, U32, 408, [20:20] -unusedBit_229_21 = bits, U32, 408, [21:21] -unusedBit_229_22 = bits, U32, 408, [22:22] -unusedBit_229_23 = bits, U32, 408, [23:23] -unusedBit_229_24 = bits, U32, 408, [24:24] -unusedBit_229_25 = bits, U32, 408, [25:25] -unusedBit_229_26 = bits, U32, 408, [26:26] -unusedBit_229_27 = bits, U32, 408, [27:27] -unusedBit_229_28 = bits, U32, 408, [28:28] -unusedBit_229_29 = bits, U32, 408, [29:29] -unusedBit_229_30 = bits, U32, 408, [30:30] -unusedBit_229_31 = bits, U32, 408, [31:31] +unusedBit_230_8 = bits, U32, 408, [8:8] +unusedBit_230_9 = bits, U32, 408, [9:9] +unusedBit_230_10 = bits, U32, 408, [10:10] +unusedBit_230_11 = bits, U32, 408, [11:11] +unusedBit_230_12 = bits, U32, 408, [12:12] +unusedBit_230_13 = bits, U32, 408, [13:13] +unusedBit_230_14 = bits, U32, 408, [14:14] +unusedBit_230_15 = bits, U32, 408, [15:15] +unusedBit_230_16 = bits, U32, 408, [16:16] +unusedBit_230_17 = bits, U32, 408, [17:17] +unusedBit_230_18 = bits, U32, 408, [18:18] +unusedBit_230_19 = bits, U32, 408, [19:19] +unusedBit_230_20 = bits, U32, 408, [20:20] +unusedBit_230_21 = bits, U32, 408, [21:21] +unusedBit_230_22 = bits, U32, 408, [22:22] +unusedBit_230_23 = bits, U32, 408, [23:23] +unusedBit_230_24 = bits, U32, 408, [24:24] +unusedBit_230_25 = bits, U32, 408, [25:25] +unusedBit_230_26 = bits, U32, 408, [26:26] +unusedBit_230_27 = bits, U32, 408, [27:27] +unusedBit_230_28 = bits, U32, 408, [28:28] +unusedBit_230_29 = bits, U32, 408, [29:29] +unusedBit_230_30 = bits, U32, 408, [30:30] +unusedBit_230_31 = bits, U32, 408, [31:31] boostControllerOutput = scalar, U08, 412, "%", 0.5, 0 boostControllerOpenLoopPart = scalar, U08, 413, "%", 0.5, 0 fallbackMap = scalar, U16, 414, "kPa", 0.1, 0 @@ -4025,6 +4019,8 @@ gaugeCategory = Sensors - Raw rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawMapGauge = rawMap , "Raw MAP", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawAfrGauge = rawAfr , "Raw EGO", "V", 0, 5, 0, 0, 5, 5, 3, 0 + vssEdgeCounterGauge = vssEdgeCounter + issEdgeCounterGauge = issEdgeCounter gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -4383,6 +4379,8 @@ entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" entry = tcRatio, "Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "S", float, "%.3f" +entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" +entry = issEdgeCounter, "issEdgeCounter", int, "%d" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" 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 749bbe3730..987af5e132 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 Fri May 13 03:57:18 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat May 14 12:19:07 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1855,7 +1855,7 @@ public class Fields { public static final int servoOutputPins7_offset = 2066; public static final int servoOutputPins8_offset = 2068; public static final int showHumanReadableWarning_offset = 940; - public static final int SIGNATURE_HASH = 464011609; + public static final int SIGNATURE_HASH = 161773996; public static final int silentTriggerError_offset = 1340; public static final int skippedWheelOnCam_offset = 1340; public static final int slowAdcAlpha_offset = 1580; @@ -2377,7 +2377,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 2022.05.13.all.464011609"; + public static final String TS_SIGNATURE = "rusEFI 2022.05.14.all.161773996"; 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 = 1016; 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 768cbc8bb2..999b740f64 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 May 10 10:47:40 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat May 14 12:18:31 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -637,14 +637,8 @@ public class TsOutputs { public static final Field UNUSEDWAT = Field.create("UNUSEDWAT", 389, FieldType.INT8).setScale(1.0); public static final Field TCRATIO = Field.create("TCRATIO", 390, FieldType.INT16).setScale(0.01); public static final Field LASTSHIFTTIME = Field.create("LASTSHIFTTIME", 392, FieldType.FLOAT); - public static final Field UNUSEDINTHEMIDDLE1 = Field.create("UNUSEDINTHEMIDDLE1", 396, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE2 = Field.create("UNUSEDINTHEMIDDLE2", 397, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE3 = Field.create("UNUSEDINTHEMIDDLE3", 398, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE4 = Field.create("UNUSEDINTHEMIDDLE4", 399, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE5 = Field.create("UNUSEDINTHEMIDDLE5", 400, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE6 = Field.create("UNUSEDINTHEMIDDLE6", 401, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE7 = Field.create("UNUSEDINTHEMIDDLE7", 402, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE8 = Field.create("UNUSEDINTHEMIDDLE8", 403, FieldType.INT8).setScale(1.0); + public static final Field VSSEDGECOUNTER = Field.create("VSSEDGECOUNTER", 396, FieldType.INT).setScale(1.0); + public static final Field ISSEDGECOUNTER = Field.create("ISSEDGECOUNTER", 400, FieldType.INT).setScale(1.0); public static final Field AUXLINEAR1 = Field.create("AUXLINEAR1", 404, FieldType.INT16).setScale(0.01); public static final Field AUXLINEAR2 = Field.create("AUXLINEAR2", 406, FieldType.INT16).setScale(0.01); public static final Field LAUNCHSPEEDCONDITION = Field.create("LAUNCHSPEEDCONDITION", 408, FieldType.BIT, 0); @@ -655,30 +649,30 @@ public class TsOutputs { public static final Field LAUNCHCOMBINEDCONDITIONS = Field.create("LAUNCHCOMBINEDCONDITIONS", 408, FieldType.BIT, 5); public static final Field DFCOACTIVE = Field.create("DFCOACTIVE", 408, FieldType.BIT, 6); public static final Field TPSACCELACTIVE = Field.create("TPSACCELACTIVE", 408, FieldType.BIT, 7); - public static final Field UNUSEDBIT_229_8 = Field.create("UNUSEDBIT_229_8", 408, FieldType.BIT, 8); - public static final Field UNUSEDBIT_229_9 = Field.create("UNUSEDBIT_229_9", 408, FieldType.BIT, 9); - public static final Field UNUSEDBIT_229_10 = Field.create("UNUSEDBIT_229_10", 408, FieldType.BIT, 10); - public static final Field UNUSEDBIT_229_11 = Field.create("UNUSEDBIT_229_11", 408, FieldType.BIT, 11); - public static final Field UNUSEDBIT_229_12 = Field.create("UNUSEDBIT_229_12", 408, FieldType.BIT, 12); - public static final Field UNUSEDBIT_229_13 = Field.create("UNUSEDBIT_229_13", 408, FieldType.BIT, 13); - public static final Field UNUSEDBIT_229_14 = Field.create("UNUSEDBIT_229_14", 408, FieldType.BIT, 14); - public static final Field UNUSEDBIT_229_15 = Field.create("UNUSEDBIT_229_15", 408, FieldType.BIT, 15); - public static final Field UNUSEDBIT_229_16 = Field.create("UNUSEDBIT_229_16", 408, FieldType.BIT, 16); - public static final Field UNUSEDBIT_229_17 = Field.create("UNUSEDBIT_229_17", 408, FieldType.BIT, 17); - public static final Field UNUSEDBIT_229_18 = Field.create("UNUSEDBIT_229_18", 408, FieldType.BIT, 18); - public static final Field UNUSEDBIT_229_19 = Field.create("UNUSEDBIT_229_19", 408, FieldType.BIT, 19); - public static final Field UNUSEDBIT_229_20 = Field.create("UNUSEDBIT_229_20", 408, FieldType.BIT, 20); - public static final Field UNUSEDBIT_229_21 = Field.create("UNUSEDBIT_229_21", 408, FieldType.BIT, 21); - public static final Field UNUSEDBIT_229_22 = Field.create("UNUSEDBIT_229_22", 408, FieldType.BIT, 22); - public static final Field UNUSEDBIT_229_23 = Field.create("UNUSEDBIT_229_23", 408, FieldType.BIT, 23); - public static final Field UNUSEDBIT_229_24 = Field.create("UNUSEDBIT_229_24", 408, FieldType.BIT, 24); - public static final Field UNUSEDBIT_229_25 = Field.create("UNUSEDBIT_229_25", 408, FieldType.BIT, 25); - public static final Field UNUSEDBIT_229_26 = Field.create("UNUSEDBIT_229_26", 408, FieldType.BIT, 26); - public static final Field UNUSEDBIT_229_27 = Field.create("UNUSEDBIT_229_27", 408, FieldType.BIT, 27); - public static final Field UNUSEDBIT_229_28 = Field.create("UNUSEDBIT_229_28", 408, FieldType.BIT, 28); - public static final Field UNUSEDBIT_229_29 = Field.create("UNUSEDBIT_229_29", 408, FieldType.BIT, 29); - public static final Field UNUSEDBIT_229_30 = Field.create("UNUSEDBIT_229_30", 408, FieldType.BIT, 30); - public static final Field UNUSEDBIT_229_31 = Field.create("UNUSEDBIT_229_31", 408, FieldType.BIT, 31); + public static final Field UNUSEDBIT_230_8 = Field.create("UNUSEDBIT_230_8", 408, FieldType.BIT, 8); + public static final Field UNUSEDBIT_230_9 = Field.create("UNUSEDBIT_230_9", 408, FieldType.BIT, 9); + public static final Field UNUSEDBIT_230_10 = Field.create("UNUSEDBIT_230_10", 408, FieldType.BIT, 10); + public static final Field UNUSEDBIT_230_11 = Field.create("UNUSEDBIT_230_11", 408, FieldType.BIT, 11); + public static final Field UNUSEDBIT_230_12 = Field.create("UNUSEDBIT_230_12", 408, FieldType.BIT, 12); + public static final Field UNUSEDBIT_230_13 = Field.create("UNUSEDBIT_230_13", 408, FieldType.BIT, 13); + public static final Field UNUSEDBIT_230_14 = Field.create("UNUSEDBIT_230_14", 408, FieldType.BIT, 14); + public static final Field UNUSEDBIT_230_15 = Field.create("UNUSEDBIT_230_15", 408, FieldType.BIT, 15); + public static final Field UNUSEDBIT_230_16 = Field.create("UNUSEDBIT_230_16", 408, FieldType.BIT, 16); + public static final Field UNUSEDBIT_230_17 = Field.create("UNUSEDBIT_230_17", 408, FieldType.BIT, 17); + public static final Field UNUSEDBIT_230_18 = Field.create("UNUSEDBIT_230_18", 408, FieldType.BIT, 18); + public static final Field UNUSEDBIT_230_19 = Field.create("UNUSEDBIT_230_19", 408, FieldType.BIT, 19); + public static final Field UNUSEDBIT_230_20 = Field.create("UNUSEDBIT_230_20", 408, FieldType.BIT, 20); + public static final Field UNUSEDBIT_230_21 = Field.create("UNUSEDBIT_230_21", 408, FieldType.BIT, 21); + public static final Field UNUSEDBIT_230_22 = Field.create("UNUSEDBIT_230_22", 408, FieldType.BIT, 22); + public static final Field UNUSEDBIT_230_23 = Field.create("UNUSEDBIT_230_23", 408, FieldType.BIT, 23); + public static final Field UNUSEDBIT_230_24 = Field.create("UNUSEDBIT_230_24", 408, FieldType.BIT, 24); + public static final Field UNUSEDBIT_230_25 = Field.create("UNUSEDBIT_230_25", 408, FieldType.BIT, 25); + public static final Field UNUSEDBIT_230_26 = Field.create("UNUSEDBIT_230_26", 408, FieldType.BIT, 26); + public static final Field UNUSEDBIT_230_27 = Field.create("UNUSEDBIT_230_27", 408, FieldType.BIT, 27); + public static final Field UNUSEDBIT_230_28 = Field.create("UNUSEDBIT_230_28", 408, FieldType.BIT, 28); + public static final Field UNUSEDBIT_230_29 = Field.create("UNUSEDBIT_230_29", 408, FieldType.BIT, 29); + public static final Field UNUSEDBIT_230_30 = Field.create("UNUSEDBIT_230_30", 408, FieldType.BIT, 30); + public static final Field UNUSEDBIT_230_31 = Field.create("UNUSEDBIT_230_31", 408, FieldType.BIT, 31); public static final Field BOOSTCONTROLLEROUTPUT = Field.create("BOOSTCONTROLLEROUTPUT", 412, FieldType.INT8).setScale(0.5); public static final Field BOOSTCONTROLLEROPENLOOPPART = Field.create("BOOSTCONTROLLEROPENLOOPPART", 413, FieldType.INT8).setScale(0.5); public static final Field FALLBACKMAP = Field.create("FALLBACKMAP", 414, FieldType.INT16).setScale(0.1); @@ -1060,14 +1054,8 @@ public class TsOutputs { UNUSEDWAT, TCRATIO, LASTSHIFTTIME, - UNUSEDINTHEMIDDLE1, - UNUSEDINTHEMIDDLE2, - UNUSEDINTHEMIDDLE3, - UNUSEDINTHEMIDDLE4, - UNUSEDINTHEMIDDLE5, - UNUSEDINTHEMIDDLE6, - UNUSEDINTHEMIDDLE7, - UNUSEDINTHEMIDDLE8, + VSSEDGECOUNTER, + ISSEDGECOUNTER, AUXLINEAR1, AUXLINEAR2, LAUNCHSPEEDCONDITION, @@ -1078,30 +1066,30 @@ public class TsOutputs { LAUNCHCOMBINEDCONDITIONS, DFCOACTIVE, TPSACCELACTIVE, - UNUSEDBIT_229_8, - UNUSEDBIT_229_9, - UNUSEDBIT_229_10, - UNUSEDBIT_229_11, - UNUSEDBIT_229_12, - UNUSEDBIT_229_13, - UNUSEDBIT_229_14, - UNUSEDBIT_229_15, - UNUSEDBIT_229_16, - UNUSEDBIT_229_17, - UNUSEDBIT_229_18, - UNUSEDBIT_229_19, - UNUSEDBIT_229_20, - UNUSEDBIT_229_21, - UNUSEDBIT_229_22, - UNUSEDBIT_229_23, - UNUSEDBIT_229_24, - UNUSEDBIT_229_25, - UNUSEDBIT_229_26, - UNUSEDBIT_229_27, - UNUSEDBIT_229_28, - UNUSEDBIT_229_29, - UNUSEDBIT_229_30, - UNUSEDBIT_229_31, + UNUSEDBIT_230_8, + UNUSEDBIT_230_9, + UNUSEDBIT_230_10, + UNUSEDBIT_230_11, + UNUSEDBIT_230_12, + UNUSEDBIT_230_13, + UNUSEDBIT_230_14, + UNUSEDBIT_230_15, + UNUSEDBIT_230_16, + UNUSEDBIT_230_17, + UNUSEDBIT_230_18, + UNUSEDBIT_230_19, + UNUSEDBIT_230_20, + UNUSEDBIT_230_21, + UNUSEDBIT_230_22, + UNUSEDBIT_230_23, + UNUSEDBIT_230_24, + UNUSEDBIT_230_25, + UNUSEDBIT_230_26, + UNUSEDBIT_230_27, + UNUSEDBIT_230_28, + UNUSEDBIT_230_29, + UNUSEDBIT_230_30, + UNUSEDBIT_230_31, BOOSTCONTROLLEROUTPUT, BOOSTCONTROLLEROPENLOOPPART, FALLBACKMAP,