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 2ab0d0e248..c744ad0889 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 @@ -1935,7 +1935,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2410253572 +#define SIGNATURE_HASH 105007755 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2490,7 +2490,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.07.15.hellen_cypress.2410253572" +#define TS_SIGNATURE "rusEFI 2022.07.15.hellen_cypress.105007755" #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 e01da730b6..32315573db 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1921,7 +1921,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3521833609 +#define SIGNATURE_HASH 1476472070 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2476,7 +2476,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.07.15.kin.3521833609" +#define TS_SIGNATURE "rusEFI 2022.07.15.kin.1476472070" #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 d83bc31a50..a6092ddac0 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 @@ -1901,7 +1901,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3247717052 +#define SIGNATURE_HASH 1216347443 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2457,7 +2457,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.07.15.subaru_eg33_f7.3247717052" +#define TS_SIGNATURE "rusEFI 2022.07.15.subaru_eg33_f7.1216347443" #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 c201180581..f1f74d5357 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -256,6 +256,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 35f51776d3..73b3900ded 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -324,6 +324,14 @@ boostStatus_resetCounterGauge = boostStatus_resetCounter,"boostStatus_ resetCoun auxSpeed1Gauge = auxSpeed1,"aux speed 1", "s", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 auxSpeed2Gauge = auxSpeed2,"aux speed 2", "s", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 ISSValueGauge = ISSValue,"Input Shaft Speed", "RPM", 0.0,8000.0, 0.0,8000.0, 0.0,8000.0, 0,0 +rawAnalogInput1Gauge = rawAnalogInput1,"rawAnalogInput 1", "V", 0.0,5.0, 0.0,5.0, 0.0,5.0, 3,3 +rawAnalogInput2Gauge = rawAnalogInput2,"rawAnalogInput 2", "V", 0.0,5.0, 0.0,5.0, 0.0,5.0, 3,3 +rawAnalogInput3Gauge = rawAnalogInput3,"rawAnalogInput 3", "V", 0.0,5.0, 0.0,5.0, 0.0,5.0, 3,3 +rawAnalogInput4Gauge = rawAnalogInput4,"rawAnalogInput 4", "V", 0.0,5.0, 0.0,5.0, 0.0,5.0, 3,3 +rawAnalogInput5Gauge = rawAnalogInput5,"rawAnalogInput 5", "V", 0.0,5.0, 0.0,5.0, 0.0,5.0, 3,3 +rawAnalogInput6Gauge = rawAnalogInput6,"rawAnalogInput 6", "V", 0.0,5.0, 0.0,5.0, 0.0,5.0, 3,3 +rawAnalogInput7Gauge = rawAnalogInput7,"rawAnalogInput 7", "V", 0.0,5.0, 0.0,5.0, 0.0,5.0, 3,3 +rawAnalogInput8Gauge = rawAnalogInput8,"rawAnalogInput 8", "V", 0.0,5.0, 0.0,5.0, 0.0,5.0, 3,3 unusedAtTheEnd1Gauge = unusedAtTheEnd1,"unusedAtTheEnd 1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd2Gauge = unusedAtTheEnd2,"unusedAtTheEnd 2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd3Gauge = unusedAtTheEnd3,"unusedAtTheEnd 3", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 @@ -386,19 +394,3 @@ unusedAtTheEnd59Gauge = unusedAtTheEnd59,"unusedAtTheEnd 59", "", 0.0,0.0, 0.0,0 unusedAtTheEnd60Gauge = unusedAtTheEnd60,"unusedAtTheEnd 60", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd61Gauge = unusedAtTheEnd61,"unusedAtTheEnd 61", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd62Gauge = unusedAtTheEnd62,"unusedAtTheEnd 62", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd63Gauge = unusedAtTheEnd63,"unusedAtTheEnd 63", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd64Gauge = unusedAtTheEnd64,"unusedAtTheEnd 64", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd65Gauge = unusedAtTheEnd65,"unusedAtTheEnd 65", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd66Gauge = unusedAtTheEnd66,"unusedAtTheEnd 66", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd67Gauge = unusedAtTheEnd67,"unusedAtTheEnd 67", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd68Gauge = unusedAtTheEnd68,"unusedAtTheEnd 68", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd69Gauge = unusedAtTheEnd69,"unusedAtTheEnd 69", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd70Gauge = unusedAtTheEnd70,"unusedAtTheEnd 70", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd71Gauge = unusedAtTheEnd71,"unusedAtTheEnd 71", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd72Gauge = unusedAtTheEnd72,"unusedAtTheEnd 72", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd73Gauge = unusedAtTheEnd73,"unusedAtTheEnd 73", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd74Gauge = unusedAtTheEnd74,"unusedAtTheEnd 74", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd75Gauge = unusedAtTheEnd75,"unusedAtTheEnd 75", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd76Gauge = unusedAtTheEnd76,"unusedAtTheEnd 76", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd77Gauge = unusedAtTheEnd77,"unusedAtTheEnd 77", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd78Gauge = unusedAtTheEnd78,"unusedAtTheEnd 78", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 0776564c45..9bc6e6eb8f 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -259,84 +259,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index fc24bf053e..7370950543 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -208,84 +208,76 @@ boostStatus("boostStatus", SensorCategory.SENSOR_INPUTS, FieldType.INT, 488, 1.0 auxSpeed1("aux speed 1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 504, 1.0, 0.0, 0.0, "s"), auxSpeed2("aux speed 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 506, 1.0, 0.0, 0.0, "s"), ISSValue("Input Shaft Speed", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 508, 1.0, 0.0, 8000.0, "RPM"), -unusedAtTheEnd1("unusedAtTheEnd 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 510, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd2("unusedAtTheEnd 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 511, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd3("unusedAtTheEnd 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 512, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd4("unusedAtTheEnd 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 513, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd5("unusedAtTheEnd 5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 514, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd6("unusedAtTheEnd 6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 515, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd7("unusedAtTheEnd 7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 516, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd8("unusedAtTheEnd 8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 517, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd9("unusedAtTheEnd 9", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 518, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd10("unusedAtTheEnd 10", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 519, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd11("unusedAtTheEnd 11", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 520, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd12("unusedAtTheEnd 12", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 521, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd13("unusedAtTheEnd 13", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 522, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd14("unusedAtTheEnd 14", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 523, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd15("unusedAtTheEnd 15", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 524, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd16("unusedAtTheEnd 16", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 525, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd17("unusedAtTheEnd 17", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 526, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd18("unusedAtTheEnd 18", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 527, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd19("unusedAtTheEnd 19", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 528, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd20("unusedAtTheEnd 20", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 529, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd21("unusedAtTheEnd 21", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 530, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd22("unusedAtTheEnd 22", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 531, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd23("unusedAtTheEnd 23", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 532, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd24("unusedAtTheEnd 24", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 533, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd25("unusedAtTheEnd 25", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 534, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd26("unusedAtTheEnd 26", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 535, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd27("unusedAtTheEnd 27", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 536, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd28("unusedAtTheEnd 28", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 537, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd29("unusedAtTheEnd 29", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 538, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd30("unusedAtTheEnd 30", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 539, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd31("unusedAtTheEnd 31", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 540, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd32("unusedAtTheEnd 32", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 541, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd33("unusedAtTheEnd 33", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 542, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd34("unusedAtTheEnd 34", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 543, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd35("unusedAtTheEnd 35", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 544, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd36("unusedAtTheEnd 36", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 545, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd37("unusedAtTheEnd 37", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 546, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd38("unusedAtTheEnd 38", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 547, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd39("unusedAtTheEnd 39", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 548, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd40("unusedAtTheEnd 40", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 549, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd41("unusedAtTheEnd 41", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 550, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd42("unusedAtTheEnd 42", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 551, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd43("unusedAtTheEnd 43", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 552, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd44("unusedAtTheEnd 44", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 553, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd45("unusedAtTheEnd 45", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 554, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd46("unusedAtTheEnd 46", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 555, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd47("unusedAtTheEnd 47", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 556, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd48("unusedAtTheEnd 48", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 557, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd49("unusedAtTheEnd 49", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 558, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd50("unusedAtTheEnd 50", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 559, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd51("unusedAtTheEnd 51", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 560, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd52("unusedAtTheEnd 52", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 561, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd53("unusedAtTheEnd 53", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 562, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd54("unusedAtTheEnd 54", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 563, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd55("unusedAtTheEnd 55", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 564, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd56("unusedAtTheEnd 56", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 565, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd57("unusedAtTheEnd 57", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 566, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd58("unusedAtTheEnd 58", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 567, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd59("unusedAtTheEnd 59", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 568, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd60("unusedAtTheEnd 60", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 569, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd61("unusedAtTheEnd 61", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 570, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd62("unusedAtTheEnd 62", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 571, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd63("unusedAtTheEnd 63", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 572, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd64("unusedAtTheEnd 64", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 573, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd65("unusedAtTheEnd 65", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 574, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd66("unusedAtTheEnd 66", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 575, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd67("unusedAtTheEnd 67", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 576, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd68("unusedAtTheEnd 68", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 577, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd69("unusedAtTheEnd 69", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 578, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd70("unusedAtTheEnd 70", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 579, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd71("unusedAtTheEnd 71", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 580, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd72("unusedAtTheEnd 72", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 581, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd73("unusedAtTheEnd 73", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 582, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd74("unusedAtTheEnd 74", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 583, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd75("unusedAtTheEnd 75", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 584, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd76("unusedAtTheEnd 76", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 585, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd77("unusedAtTheEnd 77", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 586, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd78("unusedAtTheEnd 78", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 587, 1.0, 0.0, 0.0, ""), +rawAnalogInput1("rawAnalogInput 1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 510, 0.001, 0.0, 5.0, "V"), +rawAnalogInput2("rawAnalogInput 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 512, 0.001, 0.0, 5.0, "V"), +rawAnalogInput3("rawAnalogInput 3", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 514, 0.001, 0.0, 5.0, "V"), +rawAnalogInput4("rawAnalogInput 4", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 516, 0.001, 0.0, 5.0, "V"), +rawAnalogInput5("rawAnalogInput 5", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 518, 0.001, 0.0, 5.0, "V"), +rawAnalogInput6("rawAnalogInput 6", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 520, 0.001, 0.0, 5.0, "V"), +rawAnalogInput7("rawAnalogInput 7", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 522, 0.001, 0.0, 5.0, "V"), +rawAnalogInput8("rawAnalogInput 8", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 524, 0.001, 0.0, 5.0, "V"), +unusedAtTheEnd1("unusedAtTheEnd 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 526, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd2("unusedAtTheEnd 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 527, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd3("unusedAtTheEnd 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 528, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd4("unusedAtTheEnd 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 529, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd5("unusedAtTheEnd 5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 530, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd6("unusedAtTheEnd 6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 531, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd7("unusedAtTheEnd 7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 532, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd8("unusedAtTheEnd 8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 533, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd9("unusedAtTheEnd 9", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 534, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd10("unusedAtTheEnd 10", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 535, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd11("unusedAtTheEnd 11", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 536, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd12("unusedAtTheEnd 12", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 537, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd13("unusedAtTheEnd 13", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 538, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd14("unusedAtTheEnd 14", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 539, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd15("unusedAtTheEnd 15", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 540, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd16("unusedAtTheEnd 16", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 541, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd17("unusedAtTheEnd 17", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 542, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd18("unusedAtTheEnd 18", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 543, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd19("unusedAtTheEnd 19", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 544, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd20("unusedAtTheEnd 20", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 545, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd21("unusedAtTheEnd 21", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 546, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd22("unusedAtTheEnd 22", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 547, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd23("unusedAtTheEnd 23", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 548, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd24("unusedAtTheEnd 24", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 549, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd25("unusedAtTheEnd 25", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 550, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd26("unusedAtTheEnd 26", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 551, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd27("unusedAtTheEnd 27", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 552, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd28("unusedAtTheEnd 28", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 553, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd29("unusedAtTheEnd 29", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 554, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd30("unusedAtTheEnd 30", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 555, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd31("unusedAtTheEnd 31", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 556, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd32("unusedAtTheEnd 32", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 557, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd33("unusedAtTheEnd 33", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 558, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd34("unusedAtTheEnd 34", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 559, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd35("unusedAtTheEnd 35", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 560, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd36("unusedAtTheEnd 36", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 561, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd37("unusedAtTheEnd 37", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 562, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd38("unusedAtTheEnd 38", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 563, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd39("unusedAtTheEnd 39", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 564, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd40("unusedAtTheEnd 40", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 565, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd41("unusedAtTheEnd 41", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 566, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd42("unusedAtTheEnd 42", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 567, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd43("unusedAtTheEnd 43", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 568, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd44("unusedAtTheEnd 44", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 569, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd45("unusedAtTheEnd 45", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 570, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd46("unusedAtTheEnd 46", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 571, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd47("unusedAtTheEnd 47", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 572, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd48("unusedAtTheEnd 48", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 573, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd49("unusedAtTheEnd 49", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 574, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd50("unusedAtTheEnd 50", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 575, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd51("unusedAtTheEnd 51", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 576, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd52("unusedAtTheEnd 52", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 577, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd53("unusedAtTheEnd 53", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 578, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd54("unusedAtTheEnd 54", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 579, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd55("unusedAtTheEnd 55", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 580, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd56("unusedAtTheEnd 56", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 581, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd57("unusedAtTheEnd 57", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 582, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd58("unusedAtTheEnd 58", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 583, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd59("unusedAtTheEnd 59", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 584, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd60("unusedAtTheEnd 60", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 585, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd61("unusedAtTheEnd 61", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 586, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd62("unusedAtTheEnd 62", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 587, 1.0, 0.0, 0.0, ""), m_knockRetard("Degrees retarded: larger number = more retard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 588, 1.0, -1.0, -1.0, ""), m_knockThreshold("m_knockThreshold", SensorCategory.SENSOR_INPUTS, FieldType.INT, 592, 1.0, -1.0, -1.0, ""), m_knockCount("m_knockCount", SensorCategory.SENSOR_INPUTS, FieldType.INT, 596, 1.0, -1.0, -1.0, ""), diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index 65de14451a..8ef070f7a1 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary\output_channels.txt Fri Jul 08 09:42:21 EDT 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Jul 15 10:28:13 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1287,11 +1287,16 @@ struct output_channels_s { */ scaled_channel ISSValue = (uint16_t)0; /** + V * offset 510 */ - uint8_t unusedAtTheEnd[78]; + scaled_channel rawAnalogInput[AUX_ANALOG_INPUT_COUNT]; + /** + * offset 526 + */ + uint8_t unusedAtTheEnd[62]; }; static_assert(sizeof(output_channels_s) == 588); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary\output_channels.txt Fri Jul 08 09:42:21 EDT 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Jul 15 10:28:13 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 0d793e916c..4e9bd3e361 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1935,7 +1935,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3397763854 +#define SIGNATURE_HASH 1131283585 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2490,7 +2490,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.07.15.all.3397763854" +#define TS_SIGNATURE "rusEFI 2022.07.15.all.1131283585" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index bd624f6821..9316296ad8 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3718433601 -#define TS_SIGNATURE "rusEFI 2022.07.15.48way.3718433601" +#define SIGNATURE_HASH 1414073550 +#define TS_SIGNATURE "rusEFI 2022.07.15.48way.1414073550" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 024eb6dd62..6daaa309fb 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 3397763854 -#define TS_SIGNATURE "rusEFI 2022.07.15.all.3397763854" +#define SIGNATURE_HASH 1131283585 +#define TS_SIGNATURE "rusEFI 2022.07.15.all.1131283585" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 588119fabd..bba8a9f163 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 4170669666 -#define TS_SIGNATURE "rusEFI 2022.07.15.alphax-2chan.4170669666" +#define SIGNATURE_HASH 1903991277 +#define TS_SIGNATURE "rusEFI 2022.07.15.alphax-2chan.1903991277" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 3ffe1acd8a..b71c94d3bc 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 3909692493 -#define TS_SIGNATURE "rusEFI 2022.07.15.alphax-4chan.3909692493" +#define SIGNATURE_HASH 1625484226 +#define TS_SIGNATURE "rusEFI 2022.07.15.alphax-4chan.1625484226" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index d4de56ac2c..650e31f13a 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 3595515433 -#define TS_SIGNATURE "rusEFI 2022.07.15.atlas.3595515433" +#define SIGNATURE_HASH 1604645286 +#define TS_SIGNATURE "rusEFI 2022.07.15.atlas.1604645286" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 4fa5fe5d59..0b377d95a0 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 1013551863 -#define TS_SIGNATURE "rusEFI 2022.07.15.core8.1013551863" +#define SIGNATURE_HASH 3045217656 +#define TS_SIGNATURE "rusEFI 2022.07.15.core8.3045217656" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index aa35170676..f42b6363f6 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3397763854 -#define TS_SIGNATURE "rusEFI 2022.07.15.f407-discovery.3397763854" +#define SIGNATURE_HASH 1131283585 +#define TS_SIGNATURE "rusEFI 2022.07.15.f407-discovery.1131283585" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 50a6a3abd2..8b24cf950b 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 3397763854 -#define TS_SIGNATURE "rusEFI 2022.07.15.f429-discovery.3397763854" +#define SIGNATURE_HASH 1131283585 +#define TS_SIGNATURE "rusEFI 2022.07.15.f429-discovery.1131283585" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index b60fb0524e..06dc6d2fd8 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 2296987594 -#define TS_SIGNATURE "rusEFI 2022.07.15.frankenso_na6.2296987594" +#define SIGNATURE_HASH 16971845 +#define TS_SIGNATURE "rusEFI 2022.07.15.frankenso_na6.16971845" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 475472602f..c0dcbddbae 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 3194592369 -#define TS_SIGNATURE "rusEFI 2022.07.15.harley81.3194592369" +#define SIGNATURE_HASH 931290110 +#define TS_SIGNATURE "rusEFI 2022.07.15.harley81.931290110" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 87658f05a5..c3cc6262f4 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3951743595 -#define TS_SIGNATURE "rusEFI 2022.07.15.hellen-gm-e67.3951743595" +#define SIGNATURE_HASH 1650529764 +#define TS_SIGNATURE "rusEFI 2022.07.15.hellen-gm-e67.1650529764" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 4d5e0b5aa1..f3d256e49c 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 319746754 -#define TS_SIGNATURE "rusEFI 2022.07.15.hellen-nb1.319746754" +#define SIGNATURE_HASH 2598712653 +#define TS_SIGNATURE "rusEFI 2022.07.15.hellen-nb1.2598712653" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index b81894b7cb..c8cbd75dd8 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 1113291748 -#define TS_SIGNATURE "rusEFI 2022.07.15.hellen121nissan.1113291748" +#define SIGNATURE_HASH 3417357419 +#define TS_SIGNATURE "rusEFI 2022.07.15.hellen121nissan.3417357419" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 872432c038..ef3a6af252 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 3131310196 -#define TS_SIGNATURE "rusEFI 2022.07.15.hellen121vag.3131310196" +#define SIGNATURE_HASH 860866555 +#define TS_SIGNATURE "rusEFI 2022.07.15.hellen121vag.860866555" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 4ccf6c75c9..b717ba21ce 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 40118511 -#define TS_SIGNATURE "rusEFI 2022.07.15.hellen128.40118511" +#define SIGNATURE_HASH 2341465952 +#define TS_SIGNATURE "rusEFI 2022.07.15.hellen128.2341465952" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 8e3bdb3b29..01d5280697 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 1389015434 -#define TS_SIGNATURE "rusEFI 2022.07.15.hellen154hyundai.1389015434" +#define SIGNATURE_HASH 3676403205 +#define TS_SIGNATURE "rusEFI 2022.07.15.hellen154hyundai.3676403205" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index e391229ffc..3b6a233ce7 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 951773706 -#define TS_SIGNATURE "rusEFI 2022.07.15.hellen72.951773706" +#define SIGNATURE_HASH 2974887301 +#define TS_SIGNATURE "rusEFI 2022.07.15.hellen72.2974887301" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index c7dc6e99b1..fe7a079763 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 3895466756 -#define TS_SIGNATURE "rusEFI 2022.07.15.hellen81.3895466756" +#define SIGNATURE_HASH 1641798795 +#define TS_SIGNATURE "rusEFI 2022.07.15.hellen81.1641798795" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 8d627caff6..ee9c5cabc0 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 2971025115 -#define TS_SIGNATURE "rusEFI 2022.07.15.hellen88bmw.2971025115" +#define SIGNATURE_HASH 956168532 +#define TS_SIGNATURE "rusEFI 2022.07.15.hellen88bmw.956168532" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 9c0a8da41a..d21b1337fc 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 1208889966 -#define TS_SIGNATURE "rusEFI 2022.07.15.hellenNA6.1208889966" +#define SIGNATURE_HASH 3253073377 +#define TS_SIGNATURE "rusEFI 2022.07.15.hellenNA6.3253073377" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 0d4508bad7..bbb87ec493 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 3359381822 -#define TS_SIGNATURE "rusEFI 2022.07.15.hellenNA8_96.3359381822" +#define SIGNATURE_HASH 1104666289 +#define TS_SIGNATURE "rusEFI 2022.07.15.hellenNA8_96.1104666289" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 6129fbe68e..6bd5403fef 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 2410253572 -#define TS_SIGNATURE "rusEFI 2022.07.15.hellen_cypress.2410253572" +#define SIGNATURE_HASH 105007755 +#define TS_SIGNATURE "rusEFI 2022.07.15.hellen_cypress.105007755" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 622c821703..732b46bc12 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 3521833609 -#define TS_SIGNATURE "rusEFI 2022.07.15.kin.3521833609" +#define SIGNATURE_HASH 1476472070 +#define TS_SIGNATURE "rusEFI 2022.07.15.kin.1476472070" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 69944bd499..44be0b8b8c 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 89346040 -#define TS_SIGNATURE "rusEFI 2022.07.15.mre_f4.89346040" +#define SIGNATURE_HASH 2360903799 +#define TS_SIGNATURE "rusEFI 2022.07.15.mre_f4.2360903799" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 7d625f9a66..716d06838e 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 89346040 -#define TS_SIGNATURE "rusEFI 2022.07.15.mre_f7.89346040" +#define SIGNATURE_HASH 2360903799 +#define TS_SIGNATURE "rusEFI 2022.07.15.mre_f7.2360903799" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index abe7e0aae8..a1a013946a 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 2590972648 -#define TS_SIGNATURE "rusEFI 2022.07.15.prometheus_405.2590972648" +#define SIGNATURE_HASH 327474535 +#define TS_SIGNATURE "rusEFI 2022.07.15.prometheus_405.327474535" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 1b0f46b6dc..033394e8b6 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 2590972648 -#define TS_SIGNATURE "rusEFI 2022.07.15.prometheus_469.2590972648" +#define SIGNATURE_HASH 327474535 +#define TS_SIGNATURE "rusEFI 2022.07.15.prometheus_469.327474535" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index cdd0941777..3ace438109 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 1866990712 -#define TS_SIGNATURE "rusEFI 2022.07.15.proteus_f4.1866990712" +#define SIGNATURE_HASH 3869492215 +#define TS_SIGNATURE "rusEFI 2022.07.15.proteus_f4.3869492215" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index f72e5247af..1376a9c130 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 1866990712 -#define TS_SIGNATURE "rusEFI 2022.07.15.proteus_f7.1866990712" +#define SIGNATURE_HASH 3869492215 +#define TS_SIGNATURE "rusEFI 2022.07.15.proteus_f7.3869492215" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index a665bb6ce4..c5e881e9da 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 1866990712 -#define TS_SIGNATURE "rusEFI 2022.07.15.proteus_h7.1866990712" +#define SIGNATURE_HASH 3869492215 +#define TS_SIGNATURE "rusEFI 2022.07.15.proteus_h7.3869492215" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 41c663a155..b7e8b58dcf 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 3247717052 -#define TS_SIGNATURE "rusEFI 2022.07.15.subaru_eg33_f7.3247717052" +#define SIGNATURE_HASH 1216347443 +#define TS_SIGNATURE "rusEFI 2022.07.15.subaru_eg33_f7.1216347443" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 7e6b1e07cb..3094fd5e32 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 1619856730 -#define TS_SIGNATURE "rusEFI 2022.07.15.tdg-pdm8.1619856730" +#define SIGNATURE_HASH 3915827925 +#define TS_SIGNATURE "rusEFI 2022.07.15.tdg-pdm8.3915827925" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index d38fa00393..caf80647cc 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.07.15.all.3397763854" + signature = "rusEFI 2022.07.15.all.1131283585" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.all.3397763854" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.all.1131283585" ; 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 @@ -85,7 +85,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 Jul 15 08:46:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:29:06 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 57a7e288a7..b1126519f7 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.07.15.48way.3718433601" + signature = "rusEFI 2022.07.15.48way.1414073550" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.48way.3718433601" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.48way.1414073550" ; 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 @@ -85,7 +85,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 Jul 15 08:45:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:46 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index d55bf4eb58..918a7aec66 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.07.15.alphax-2chan.4170669666" + signature = "rusEFI 2022.07.15.alphax-2chan.1903991277" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.alphax-2chan.4170669666" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.alphax-2chan.1903991277" ; 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 @@ -85,7 +85,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 Jul 15 08:45:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:15 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index e1efbfd07b..cd273e5c17 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.07.15.alphax-4chan.3909692493" + signature = "rusEFI 2022.07.15.alphax-4chan.1625484226" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.alphax-4chan.3909692493" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.alphax-4chan.1625484226" ; 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 @@ -85,7 +85,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 Jul 15 08:45:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:17 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 63e07905a3..ada5bd9693 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.07.15.atlas.3595515433" + signature = "rusEFI 2022.07.15.atlas.1604645286" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.atlas.3595515433" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.atlas.1604645286" ; 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 @@ -85,7 +85,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 Jul 15 08:46:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:29:02 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index f23c9f7a64..44d7d467bc 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.07.15.core8.1013551863" + signature = "rusEFI 2022.07.15.core8.3045217656" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.core8.1013551863" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.core8.3045217656" ; 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 @@ -85,7 +85,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 Jul 15 08:45:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:44 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 1c97312215..074d349d28 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.07.15.f407-discovery.3397763854" + signature = "rusEFI 2022.07.15.f407-discovery.1131283585" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.f407-discovery.3397763854" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.f407-discovery.1131283585" ; 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 @@ -85,7 +85,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 Jul 15 08:46:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:59 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 94ddd36bc1..6aa14afb07 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.07.15.f429-discovery.3397763854" + signature = "rusEFI 2022.07.15.f429-discovery.1131283585" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.f429-discovery.3397763854" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.f429-discovery.1131283585" ; 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 @@ -85,7 +85,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 Jul 15 08:46:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:29:00 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index e50796a234..8bd5a7f41f 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.07.15.frankenso_na6.2296987594" + signature = "rusEFI 2022.07.15.frankenso_na6.16971845" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.frankenso_na6.2296987594" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.frankenso_na6.16971845" ; 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 @@ -85,7 +85,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 Jul 15 08:45:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:48 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 26faf6490c..e7f36160fc 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.07.15.harley81.3194592369" + signature = "rusEFI 2022.07.15.harley81.931290110" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.harley81.3194592369" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.harley81.931290110" ; 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 @@ -85,7 +85,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 Jul 15 08:45:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:19 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index eed32891cf..0a3d2dab87 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.07.15.hellen-gm-e67.3951743595" + signature = "rusEFI 2022.07.15.hellen-gm-e67.1650529764" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.hellen-gm-e67.3951743595" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.hellen-gm-e67.1650529764" ; 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 @@ -85,7 +85,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 Jul 15 08:45:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:35 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 61f84f9974..88b511cb28 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.07.15.hellen-nb1.319746754" + signature = "rusEFI 2022.07.15.hellen-nb1.2598712653" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.hellen-nb1.319746754" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.hellen-nb1.2598712653" ; 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 @@ -85,7 +85,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 Jul 15 08:45:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:33 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 0f8142b6f1..d5b2d2a2b4 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.07.15.hellen121nissan.1113291748" + signature = "rusEFI 2022.07.15.hellen121nissan.3417357419" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.hellen121nissan.1113291748" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.hellen121nissan.3417357419" ; 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 @@ -85,7 +85,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 Jul 15 08:45:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:24 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 4c1adb0140..55193a3d83 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.07.15.hellen121vag.3131310196" + signature = "rusEFI 2022.07.15.hellen121vag.860866555" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.hellen121vag.3131310196" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.hellen121vag.860866555" ; 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 @@ -85,7 +85,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 Jul 15 08:45:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:22 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 007db874f6..c15194625c 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.07.15.hellen128.40118511" + signature = "rusEFI 2022.07.15.hellen128.2341465952" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.hellen128.40118511" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.hellen128.2341465952" ; 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 @@ -85,7 +85,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 Jul 15 08:45:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:21 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index a4f16cbeb4..76535a8e63 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.07.15.hellen154hyundai.1389015434" + signature = "rusEFI 2022.07.15.hellen154hyundai.3676403205" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.hellen154hyundai.1389015434" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.hellen154hyundai.3676403205" ; 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 @@ -85,7 +85,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 Jul 15 08:45:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:26 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 920b990cae..b54efd8e47 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.07.15.hellen72.951773706" + signature = "rusEFI 2022.07.15.hellen72.2974887301" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.hellen72.951773706" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.hellen72.2974887301" ; 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 @@ -85,7 +85,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 Jul 15 08:45:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:30 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index ee5a764cf6..351b03a057 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.07.15.hellen81.3895466756" + signature = "rusEFI 2022.07.15.hellen81.1641798795" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.hellen81.3895466756" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.hellen81.1641798795" ; 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 @@ -85,7 +85,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 Jul 15 08:45:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:32 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 7a55914fea..a9b50b737a 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.07.15.hellen88bmw.2971025115" + signature = "rusEFI 2022.07.15.hellen88bmw.956168532" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.hellen88bmw.2971025115" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.hellen88bmw.956168532" ; 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 @@ -85,7 +85,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 Jul 15 08:45:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:28 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 7fb4010119..bc769e5642 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.07.15.hellenNA6.1208889966" + signature = "rusEFI 2022.07.15.hellenNA6.3253073377" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.hellenNA6.1208889966" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.hellenNA6.3253073377" ; 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 @@ -85,7 +85,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 Jul 15 08:45:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:37 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index d72fd31060..e271573e14 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.07.15.hellenNA8_96.3359381822" + signature = "rusEFI 2022.07.15.hellenNA8_96.1104666289" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.hellenNA8_96.3359381822" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.hellenNA8_96.1104666289" ; 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 @@ -85,7 +85,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 Jul 15 08:45:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:39 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 279fcd5b94..b9a10f7993 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.07.15.hellen_cypress.2410253572" + signature = "rusEFI 2022.07.15.hellen_cypress.105007755" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.hellen_cypress.2410253572" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.hellen_cypress.105007755" ; 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 @@ -85,7 +85,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 Jul 15 08:46:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Jul 15 10:29:09 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 22bf1b3a0a..0730fd8655 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.07.15.kin.3521833609" + signature = "rusEFI 2022.07.15.kin.1476472070" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.kin.3521833609" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.kin.1476472070" ; 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 @@ -85,7 +85,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 Jul 15 08:46:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Jul 15 10:29:07 UTC 2022 pageSize = 21272 page = 1 @@ -2327,84 +2327,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3632,6 +3624,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4048,6 +4048,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index c62d64b5a8..5fa7021ea3 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.07.15.mre_f4.89346040" + signature = "rusEFI 2022.07.15.mre_f4.2360903799" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.mre_f4.89346040" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.mre_f4.2360903799" ; 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 @@ -85,7 +85,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 Jul 15 08:45:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:42 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index cc5744faa5..1a81f2d104 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.07.15.mre_f7.89346040" + signature = "rusEFI 2022.07.15.mre_f7.2360903799" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.mre_f7.89346040" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.mre_f7.2360903799" ; 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 @@ -85,7 +85,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 Jul 15 08:45:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:40 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index e37f3f33f7..378b9a6f90 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.07.15.prometheus_405.2590972648" + signature = "rusEFI 2022.07.15.prometheus_405.327474535" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.prometheus_405.2590972648" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.prometheus_405.327474535" ; 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 @@ -85,7 +85,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 Jul 15 08:45:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:51 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 2e446564fc..58380cef63 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.07.15.prometheus_469.2590972648" + signature = "rusEFI 2022.07.15.prometheus_469.327474535" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.prometheus_469.2590972648" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.prometheus_469.327474535" ; 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 @@ -85,7 +85,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 Jul 15 08:45:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:49 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 37792518ad..130a4c3ea1 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.07.15.proteus_f4.1866990712" + signature = "rusEFI 2022.07.15.proteus_f4.3869492215" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.proteus_f4.1866990712" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.proteus_f4.3869492215" ; 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 @@ -85,7 +85,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 Jul 15 08:45:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:55 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index b68a43e0c8..1adeb17919 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.07.15.proteus_f7.1866990712" + signature = "rusEFI 2022.07.15.proteus_f7.3869492215" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.proteus_f7.1866990712" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.proteus_f7.3869492215" ; 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 @@ -85,7 +85,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 Jul 15 08:45:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:53 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 7fafe53641..2277ce832b 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.07.15.proteus_h7.1866990712" + signature = "rusEFI 2022.07.15.proteus_h7.3869492215" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.proteus_h7.1866990712" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.proteus_h7.3869492215" ; 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 @@ -85,7 +85,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 Jul 15 08:45:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:28:57 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 0590e5930f..b142df2789 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.07.15.subaru_eg33_f7.3247717052" + signature = "rusEFI 2022.07.15.subaru_eg33_f7.1216347443" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.subaru_eg33_f7.3247717052" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.subaru_eg33_f7.1216347443" ; 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 @@ -85,7 +85,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 Jul 15 08:46:12 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 Fri Jul 15 10:29:10 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index c90feb1fba..62dbf18bbe 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.07.15.tdg-pdm8.1619856730" + signature = "rusEFI 2022.07.15.tdg-pdm8.3915827925" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.07.15.tdg-pdm8.1619856730" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.07.15.tdg-pdm8.3915827925" ; 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 @@ -85,7 +85,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 Jul 15 08:46:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:29:04 UTC 2022 pageSize = 21300 page = 1 @@ -2366,84 +2366,76 @@ boostStatus_resetCounter = scalar, U32, 500, "", 1, 0 auxSpeed1 = scalar, U16, 504, "s", 1, 0 auxSpeed2 = scalar, U16, 506, "s", 1, 0 ISSValue = scalar, U16, 508, "RPM", 1, 0 -unusedAtTheEnd1 = scalar, U08, 510, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 511, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 512, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 513, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 514, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 515, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 516, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 517, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 518, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 519, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 520, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 521, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 522, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 523, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 524, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 525, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 526, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 527, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 528, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 529, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 587, "", 1, 0 +rawAnalogInput1 = scalar, S16, 510, "V", 0.001, 0 +rawAnalogInput2 = scalar, S16, 512, "V", 0.001, 0 +rawAnalogInput3 = scalar, S16, 514, "V", 0.001, 0 +rawAnalogInput4 = scalar, S16, 516, "V", 0.001, 0 +rawAnalogInput5 = scalar, S16, 518, "V", 0.001, 0 +rawAnalogInput6 = scalar, S16, 520, "V", 0.001, 0 +rawAnalogInput7 = scalar, S16, 522, "V", 0.001, 0 +rawAnalogInput8 = scalar, S16, 524, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 526, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 527, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 528, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 529, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 530, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 531, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3671,6 +3663,14 @@ gaugeCategory = Sensors - Raw rawTps1SecondaryGauge = rawTps1Secondary, "Raw TPS 1 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2PrimaryGauge = rawTps2Primary, "Raw TPS 2 Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawTps2SecondaryGauge = rawTps2Secondary, "Raw TPS 2 Secondary", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput1Gauge = rawAnalogInput1, "Raw Aux 1", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput2Gauge = rawAnalogInput2, "Raw Aux 2", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput3Gauge = rawAnalogInput3, "Raw Aux 3", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput4Gauge = rawAnalogInput4, "Raw Aux 4", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput5Gauge = rawAnalogInput5, "Raw Aux 5", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput6Gauge = rawAnalogInput6, "Raw Aux 6", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput7Gauge = rawAnalogInput7, "Raw Aux 7", "V", 0, 5, 0, 0, 5, 5, 3, 0 + rawAnalogInput8Gauge = rawAnalogInput8, "Raw Aux 8", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","V",0, 5, 0, 0, 5, 5, 3, 0 rawCltGauge = rawClt , "Raw CLT", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4087,6 +4087,14 @@ entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" entry = ISSValue, "Input Shaft Speed", int, "%d" +entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" +entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" +entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" +entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" +entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" +entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" +entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" +entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", 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 d672e7ad39..540c4f24db 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 Jul 15 08:46:14 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 15 10:29:12 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1883,6 +1883,7 @@ public class Fields { public static final int servoOutputPins7_offset = 2086; public static final int servoOutputPins8_offset = 2088; public static final int showHumanReadableWarning_offset = 960; + public static final int SIGNATURE_HASH = 1131283585; public static final int silentTriggerError_offset = 1360; public static final int skippedWheelOnCam_offset = 1360; public static final int slowAdcAlpha_offset = 1600; @@ -2372,7 +2373,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.07.15.all.3397763854"; + public static final String TS_SIGNATURE = "rusEFI 2022.07.15.all.1131283585"; 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 = 1032; 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 fbee3f564f..8011c6ad36 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 Mon Jul 11 16:49:47 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Jul 15 10:28:13 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -718,84 +718,76 @@ public class TsOutputs { public static final Field AUXSPEED1 = Field.create("AUXSPEED1", 504, FieldType.INT16).setScale(1.0); public static final Field AUXSPEED2 = Field.create("AUXSPEED2", 506, FieldType.INT16).setScale(1.0); public static final Field ISSVALUE = Field.create("ISSVALUE", 508, FieldType.INT16).setScale(1.0); - public static final Field UNUSEDATTHEEND1 = Field.create("UNUSEDATTHEEND1", 510, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND2 = Field.create("UNUSEDATTHEEND2", 511, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND3 = Field.create("UNUSEDATTHEEND3", 512, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND4 = Field.create("UNUSEDATTHEEND4", 513, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND5 = Field.create("UNUSEDATTHEEND5", 514, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND6 = Field.create("UNUSEDATTHEEND6", 515, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND7 = Field.create("UNUSEDATTHEEND7", 516, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND8 = Field.create("UNUSEDATTHEEND8", 517, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND9 = Field.create("UNUSEDATTHEEND9", 518, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND10 = Field.create("UNUSEDATTHEEND10", 519, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND11 = Field.create("UNUSEDATTHEEND11", 520, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND12 = Field.create("UNUSEDATTHEEND12", 521, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND13 = Field.create("UNUSEDATTHEEND13", 522, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND14 = Field.create("UNUSEDATTHEEND14", 523, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND15 = Field.create("UNUSEDATTHEEND15", 524, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND16 = Field.create("UNUSEDATTHEEND16", 525, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND17 = Field.create("UNUSEDATTHEEND17", 526, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND18 = Field.create("UNUSEDATTHEEND18", 527, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND19 = Field.create("UNUSEDATTHEEND19", 528, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND20 = Field.create("UNUSEDATTHEEND20", 529, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND21 = Field.create("UNUSEDATTHEEND21", 530, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND22 = Field.create("UNUSEDATTHEEND22", 531, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND23 = Field.create("UNUSEDATTHEEND23", 532, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND24 = Field.create("UNUSEDATTHEEND24", 533, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND25 = Field.create("UNUSEDATTHEEND25", 534, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND26 = Field.create("UNUSEDATTHEEND26", 535, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND27 = Field.create("UNUSEDATTHEEND27", 536, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND28 = Field.create("UNUSEDATTHEEND28", 537, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND29 = Field.create("UNUSEDATTHEEND29", 538, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND30 = Field.create("UNUSEDATTHEEND30", 539, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND31 = Field.create("UNUSEDATTHEEND31", 540, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND32 = Field.create("UNUSEDATTHEEND32", 541, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND33 = Field.create("UNUSEDATTHEEND33", 542, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND34 = Field.create("UNUSEDATTHEEND34", 543, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND35 = Field.create("UNUSEDATTHEEND35", 544, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND36 = Field.create("UNUSEDATTHEEND36", 545, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND37 = Field.create("UNUSEDATTHEEND37", 546, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND38 = Field.create("UNUSEDATTHEEND38", 547, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND39 = Field.create("UNUSEDATTHEEND39", 548, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND40 = Field.create("UNUSEDATTHEEND40", 549, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND41 = Field.create("UNUSEDATTHEEND41", 550, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND42 = Field.create("UNUSEDATTHEEND42", 551, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND43 = Field.create("UNUSEDATTHEEND43", 552, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND44 = Field.create("UNUSEDATTHEEND44", 553, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND45 = Field.create("UNUSEDATTHEEND45", 554, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND46 = Field.create("UNUSEDATTHEEND46", 555, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND47 = Field.create("UNUSEDATTHEEND47", 556, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND48 = Field.create("UNUSEDATTHEEND48", 557, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND49 = Field.create("UNUSEDATTHEEND49", 558, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND50 = Field.create("UNUSEDATTHEEND50", 559, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND51 = Field.create("UNUSEDATTHEEND51", 560, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND52 = Field.create("UNUSEDATTHEEND52", 561, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND53 = Field.create("UNUSEDATTHEEND53", 562, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND54 = Field.create("UNUSEDATTHEEND54", 563, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND55 = Field.create("UNUSEDATTHEEND55", 564, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND56 = Field.create("UNUSEDATTHEEND56", 565, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND57 = Field.create("UNUSEDATTHEEND57", 566, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND58 = Field.create("UNUSEDATTHEEND58", 567, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND59 = Field.create("UNUSEDATTHEEND59", 568, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND60 = Field.create("UNUSEDATTHEEND60", 569, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND61 = Field.create("UNUSEDATTHEEND61", 570, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND62 = Field.create("UNUSEDATTHEEND62", 571, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND63 = Field.create("UNUSEDATTHEEND63", 572, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND64 = Field.create("UNUSEDATTHEEND64", 573, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND65 = Field.create("UNUSEDATTHEEND65", 574, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND66 = Field.create("UNUSEDATTHEEND66", 575, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND67 = Field.create("UNUSEDATTHEEND67", 576, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND68 = Field.create("UNUSEDATTHEEND68", 577, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND69 = Field.create("UNUSEDATTHEEND69", 578, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND70 = Field.create("UNUSEDATTHEEND70", 579, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND71 = Field.create("UNUSEDATTHEEND71", 580, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND72 = Field.create("UNUSEDATTHEEND72", 581, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND73 = Field.create("UNUSEDATTHEEND73", 582, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND74 = Field.create("UNUSEDATTHEEND74", 583, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND75 = Field.create("UNUSEDATTHEEND75", 584, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND76 = Field.create("UNUSEDATTHEEND76", 585, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND77 = Field.create("UNUSEDATTHEEND77", 586, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND78 = Field.create("UNUSEDATTHEEND78", 587, FieldType.INT8).setScale(1.0); + public static final Field RAWANALOGINPUT1 = Field.create("RAWANALOGINPUT1", 510, FieldType.INT16).setScale(0.001); + public static final Field RAWANALOGINPUT2 = Field.create("RAWANALOGINPUT2", 512, FieldType.INT16).setScale(0.001); + public static final Field RAWANALOGINPUT3 = Field.create("RAWANALOGINPUT3", 514, FieldType.INT16).setScale(0.001); + public static final Field RAWANALOGINPUT4 = Field.create("RAWANALOGINPUT4", 516, FieldType.INT16).setScale(0.001); + public static final Field RAWANALOGINPUT5 = Field.create("RAWANALOGINPUT5", 518, FieldType.INT16).setScale(0.001); + public static final Field RAWANALOGINPUT6 = Field.create("RAWANALOGINPUT6", 520, FieldType.INT16).setScale(0.001); + public static final Field RAWANALOGINPUT7 = Field.create("RAWANALOGINPUT7", 522, FieldType.INT16).setScale(0.001); + public static final Field RAWANALOGINPUT8 = Field.create("RAWANALOGINPUT8", 524, FieldType.INT16).setScale(0.001); + public static final Field UNUSEDATTHEEND1 = Field.create("UNUSEDATTHEEND1", 526, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND2 = Field.create("UNUSEDATTHEEND2", 527, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND3 = Field.create("UNUSEDATTHEEND3", 528, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND4 = Field.create("UNUSEDATTHEEND4", 529, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND5 = Field.create("UNUSEDATTHEEND5", 530, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND6 = Field.create("UNUSEDATTHEEND6", 531, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND7 = Field.create("UNUSEDATTHEEND7", 532, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND8 = Field.create("UNUSEDATTHEEND8", 533, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND9 = Field.create("UNUSEDATTHEEND9", 534, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND10 = Field.create("UNUSEDATTHEEND10", 535, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND11 = Field.create("UNUSEDATTHEEND11", 536, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND12 = Field.create("UNUSEDATTHEEND12", 537, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND13 = Field.create("UNUSEDATTHEEND13", 538, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND14 = Field.create("UNUSEDATTHEEND14", 539, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND15 = Field.create("UNUSEDATTHEEND15", 540, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND16 = Field.create("UNUSEDATTHEEND16", 541, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND17 = Field.create("UNUSEDATTHEEND17", 542, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND18 = Field.create("UNUSEDATTHEEND18", 543, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND19 = Field.create("UNUSEDATTHEEND19", 544, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND20 = Field.create("UNUSEDATTHEEND20", 545, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND21 = Field.create("UNUSEDATTHEEND21", 546, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND22 = Field.create("UNUSEDATTHEEND22", 547, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND23 = Field.create("UNUSEDATTHEEND23", 548, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND24 = Field.create("UNUSEDATTHEEND24", 549, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND25 = Field.create("UNUSEDATTHEEND25", 550, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND26 = Field.create("UNUSEDATTHEEND26", 551, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND27 = Field.create("UNUSEDATTHEEND27", 552, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND28 = Field.create("UNUSEDATTHEEND28", 553, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND29 = Field.create("UNUSEDATTHEEND29", 554, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND30 = Field.create("UNUSEDATTHEEND30", 555, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND31 = Field.create("UNUSEDATTHEEND31", 556, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND32 = Field.create("UNUSEDATTHEEND32", 557, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND33 = Field.create("UNUSEDATTHEEND33", 558, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND34 = Field.create("UNUSEDATTHEEND34", 559, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND35 = Field.create("UNUSEDATTHEEND35", 560, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND36 = Field.create("UNUSEDATTHEEND36", 561, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND37 = Field.create("UNUSEDATTHEEND37", 562, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND38 = Field.create("UNUSEDATTHEEND38", 563, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND39 = Field.create("UNUSEDATTHEEND39", 564, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND40 = Field.create("UNUSEDATTHEEND40", 565, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND41 = Field.create("UNUSEDATTHEEND41", 566, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND42 = Field.create("UNUSEDATTHEEND42", 567, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND43 = Field.create("UNUSEDATTHEEND43", 568, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND44 = Field.create("UNUSEDATTHEEND44", 569, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND45 = Field.create("UNUSEDATTHEEND45", 570, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND46 = Field.create("UNUSEDATTHEEND46", 571, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND47 = Field.create("UNUSEDATTHEEND47", 572, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND48 = Field.create("UNUSEDATTHEEND48", 573, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND49 = Field.create("UNUSEDATTHEEND49", 574, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND50 = Field.create("UNUSEDATTHEEND50", 575, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND51 = Field.create("UNUSEDATTHEEND51", 576, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND52 = Field.create("UNUSEDATTHEEND52", 577, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND53 = Field.create("UNUSEDATTHEEND53", 578, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND54 = Field.create("UNUSEDATTHEEND54", 579, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND55 = Field.create("UNUSEDATTHEEND55", 580, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND56 = Field.create("UNUSEDATTHEEND56", 581, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND57 = Field.create("UNUSEDATTHEEND57", 582, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND58 = Field.create("UNUSEDATTHEEND58", 583, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND59 = Field.create("UNUSEDATTHEEND59", 584, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND60 = Field.create("UNUSEDATTHEEND60", 585, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND61 = Field.create("UNUSEDATTHEEND61", 586, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND62 = Field.create("UNUSEDATTHEEND62", 587, FieldType.INT8).setScale(1.0); public static final Field[] VALUES = { SD_PRESENT, ISIGNITIONENABLEDINDICATOR, @@ -1123,6 +1115,14 @@ public class TsOutputs { AUXSPEED1, AUXSPEED2, ISSVALUE, + RAWANALOGINPUT1, + RAWANALOGINPUT2, + RAWANALOGINPUT3, + RAWANALOGINPUT4, + RAWANALOGINPUT5, + RAWANALOGINPUT6, + RAWANALOGINPUT7, + RAWANALOGINPUT8, UNUSEDATTHEEND1, UNUSEDATTHEEND2, UNUSEDATTHEEND3, @@ -1185,21 +1185,5 @@ public class TsOutputs { UNUSEDATTHEEND60, UNUSEDATTHEEND61, UNUSEDATTHEEND62, - UNUSEDATTHEEND63, - UNUSEDATTHEEND64, - UNUSEDATTHEEND65, - UNUSEDATTHEEND66, - UNUSEDATTHEEND67, - UNUSEDATTHEEND68, - UNUSEDATTHEEND69, - UNUSEDATTHEEND70, - UNUSEDATTHEEND71, - UNUSEDATTHEEND72, - UNUSEDATTHEEND73, - UNUSEDATTHEEND74, - UNUSEDATTHEEND75, - UNUSEDATTHEEND76, - UNUSEDATTHEEND77, - UNUSEDATTHEEND78, }; }