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 50566521d5..08fa338f52 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 @@ -1946,7 +1946,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2880801794 +#define SIGNATURE_HASH 1512474323 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2501,7 +2501,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.08.11.hellen_cypress.2880801794" +#define TS_SIGNATURE "rusEFI 2022.08.11.hellen_cypress.1512474323" #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 f60e60ce99..303d182e25 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1932,7 +1932,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 4126600079 +#define SIGNATURE_HASH 73785694 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2487,7 +2487,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.08.11.kin.4126600079" +#define TS_SIGNATURE "rusEFI 2022.08.11.kin.73785694" #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 f1692e1f9f..dfb3e543e7 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 @@ -1912,7 +1912,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3850910650 +#define SIGNATURE_HASH 337326443 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2468,7 +2468,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.08.11.subaru_eg33_f7.3850910650" +#define TS_SIGNATURE "rusEFI 2022.08.11.subaru_eg33_f7.337326443" #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 553c5bc5e6..3916e27291 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -268,6 +268,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 2a7e24a56b..ee7508dbea 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -336,4 +336,5 @@ gppwmOutput1Gauge = gppwmOutput1,"GPPWM Output 1", "%", 0.0,100.0, 0.0,100.0, 0. gppwmOutput2Gauge = gppwmOutput2,"GPPWM Output 2", "%", 0.0,100.0, 0.0,100.0, 0.0,100.0, 2,2 gppwmOutput3Gauge = gppwmOutput3,"GPPWM Output 3", "%", 0.0,100.0, 0.0,100.0, 0.0,100.0, 2,2 gppwmOutput4Gauge = gppwmOutput4,"GPPWM Output 4", "%", 0.0,100.0, 0.0,100.0, 0.0,100.0, 2,2 +rawBatteryGauge = rawBattery,"rawBattery", "V", 0.0,5.0, 0.0,5.0, 0.0,5.0, 3,3 unusedAtTheEndGauge = unusedAtTheEnd,"unusedAtTheEnd", "", 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 d76aa36600..ce3af4f16d 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -271,64 +271,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = 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 54f0893376..f36041dd6a 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -220,7 +220,8 @@ gppwmOutput1("GPPWM Output 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 526 gppwmOutput2("GPPWM Output 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 527, 0.5, 0.0, 100.0, "%"), gppwmOutput3("GPPWM Output 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 528, 0.5, 0.0, 100.0, "%"), gppwmOutput4("GPPWM Output 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 529, 0.5, 0.0, 100.0, "%"), -unusedAtTheEnd("unusedAtTheEnd", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 530, 1.0, 0.0, 0.0, ""), +rawBattery("rawBattery", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 530, 0.001, 0.0, 5.0, "V"), +unusedAtTheEnd("unusedAtTheEnd", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 532, 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 bfaa73bbcf..74f64bbf68 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 Wed Jul 27 09:37:52 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Aug 11 14:24:10 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1298,11 +1298,16 @@ struct output_channels_s { */ scaled_channel gppwmOutput[4]; /** + V * offset 530 */ - uint8_t unusedAtTheEnd[58]; + scaled_channel rawBattery = (int16_t)0; + /** + * offset 532 + */ + uint8_t unusedAtTheEnd[56]; }; 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 Wed Jul 27 09:37:52 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Aug 11 14:24:10 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 5c341fd85f..75674452ce 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1946,7 +1946,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 4003054088 +#define SIGNATURE_HASH 520800473 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2501,7 +2501,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.08.11.all.4003054088" +#define TS_SIGNATURE "rusEFI 2022.08.11.all.520800473" #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 e5e9653720..17a9fd82d1 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 4190030407 -#define TS_SIGNATURE "rusEFI 2022.08.11.48way.4190030407" +#define SIGNATURE_HASH 137216150 +#define TS_SIGNATURE "rusEFI 2022.08.11.48way.137216150" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 0f238f27b8..8e292aee65 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 4003054088 -#define TS_SIGNATURE "rusEFI 2022.08.11.all.4003054088" +#define SIGNATURE_HASH 520800473 +#define TS_SIGNATURE "rusEFI 2022.08.11.all.520800473" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 4f27304ba5..fc7234be7c 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 3700121444 -#define TS_SIGNATURE "rusEFI 2022.08.11.alphax-2chan.3700121444" +#define SIGNATURE_HASH 756569525 +#define TS_SIGNATURE "rusEFI 2022.08.11.alphax-2chan.756569525" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 8a789b6024..f09d8dcc86 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 3440717131 -#define TS_SIGNATURE "rusEFI 2022.08.11.alphax-4chan.3440717131" +#define SIGNATURE_HASH 1015424922 +#define TS_SIGNATURE "rusEFI 2022.08.11.alphax-4chan.1015424922" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index beca7286b3..4ca4fa7d19 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 4065539887 -#define TS_SIGNATURE "rusEFI 2022.08.11.atlas.4065539887" +#define SIGNATURE_HASH 62930430 +#define TS_SIGNATURE "rusEFI 2022.08.11.atlas.62930430" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 842ec3c64e..3c44b8053c 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 410358769 -#define TS_SIGNATURE "rusEFI 2022.08.11.core8.410358769" +#define SIGNATURE_HASH 3924203808 +#define TS_SIGNATURE "rusEFI 2022.08.11.core8.3924203808" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 6ce9cb272e..19df4fb133 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 4003054088 -#define TS_SIGNATURE "rusEFI 2022.08.11.f407-discovery.4003054088" +#define SIGNATURE_HASH 520800473 +#define TS_SIGNATURE "rusEFI 2022.08.11.f407-discovery.520800473" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 936ef6b76d..e8b85288f1 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 4003054088 -#define TS_SIGNATURE "rusEFI 2022.08.11.f429-discovery.4003054088" +#define SIGNATURE_HASH 520800473 +#define TS_SIGNATURE "rusEFI 2022.08.11.f429-discovery.520800473" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index b6943c2b70..af6268851f 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 2901753548 -#define TS_SIGNATURE "rusEFI 2022.08.11.frankenso_na6.2901753548" +#define SIGNATURE_HASH 1566979101 +#define TS_SIGNATURE "rusEFI 2022.08.11.frankenso_na6.1566979101" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 7c6bc886ca..98bb0c3985 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 2591399287 -#define TS_SIGNATURE "rusEFI 2022.08.11.harley81.2591399287" +#define SIGNATURE_HASH 1810274214 +#define TS_SIGNATURE "rusEFI 2022.08.11.harley81.1810274214" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index c982a5b246..69f01838ee 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 3482768237 -#define TS_SIGNATURE "rusEFI 2022.08.11.hellen-gm-e67.3482768237" +#define SIGNATURE_HASH 1040570812 +#define TS_SIGNATURE "rusEFI 2022.08.11.hellen-gm-e67.1040570812" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 891b8fc766..d77abfc251 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 923988932 -#define TS_SIGNATURE "rusEFI 2022.08.11.hellen-nb1.923988932" +#define SIGNATURE_HASH 3330406677 +#define TS_SIGNATURE "rusEFI 2022.08.11.hellen-nb1.3330406677" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 27219efdd9..5ea01a6c10 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 1715960546 -#define TS_SIGNATURE "rusEFI 2022.08.11.hellen121nissan.1715960546" +#define SIGNATURE_HASH 2547281971 +#define TS_SIGNATURE "rusEFI 2022.08.11.hellen121nissan.2547281971" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 780a7dfa4f..38c17c1af1 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 2662859122 -#define TS_SIGNATURE "rusEFI 2022.08.11.hellen121vag.2662859122" +#define SIGNATURE_HASH 1865092003 +#define TS_SIGNATURE "rusEFI 2022.08.11.hellen121vag.1865092003" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 062827c89c..129fff9bbe 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 275250998 -#define TS_SIGNATURE "rusEFI 2022.08.11.hellen128.275250998" +#define SIGNATURE_HASH 3790927335 +#define TS_SIGNATURE "rusEFI 2022.08.11.hellen128.3790927335" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index cb4da3456b..1d35cba78e 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 1993781388 -#define TS_SIGNATURE "rusEFI 2022.08.11.hellen154hyundai.1993781388" +#define SIGNATURE_HASH 2269493853 +#define TS_SIGNATURE "rusEFI 2022.08.11.hellen154hyundai.2269493853" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 4a7537ff08..4d66cd66eb 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 480701196 -#define TS_SIGNATURE "rusEFI 2022.08.11.hellen72.480701196" +#define SIGNATURE_HASH 3979731421 +#define TS_SIGNATURE "rusEFI 2022.08.11.hellen72.3979731421" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index af4526340a..83be84d911 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 3425442306 -#define TS_SIGNATURE "rusEFI 2022.08.11.hellen81.3425442306" +#define SIGNATURE_HASH 1035931859 +#define TS_SIGNATURE "rusEFI 2022.08.11.hellen81.1035931859" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index aea900a7cc..cbde6a25a8 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 4218212804 -#define TS_SIGNATURE "rusEFI 2022.08.11.hellen88bmw.4218212804" +#define SIGNATURE_HASH 184539925 +#define TS_SIGNATURE "rusEFI 2022.08.11.hellen88bmw.184539925" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index c14297f844..8d83fe531f 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 1813132136 -#define TS_SIGNATURE "rusEFI 2022.08.11.hellenNA6.1813132136" +#define SIGNATURE_HASH 2642491833 +#define TS_SIGNATURE "rusEFI 2022.08.11.hellenNA6.2642491833" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 394619aca2..2356e83662 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 3961526328 -#define TS_SIGNATURE "rusEFI 2022.08.11.hellenNA8_96.3961526328" +#define SIGNATURE_HASH 498275049 +#define TS_SIGNATURE "rusEFI 2022.08.11.hellenNA8_96.498275049" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index b232e2c2a7..bb95ea23a7 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 2880801794 -#define TS_SIGNATURE "rusEFI 2022.08.11.hellen_cypress.2880801794" +#define SIGNATURE_HASH 1512474323 +#define TS_SIGNATURE "rusEFI 2022.08.11.hellen_cypress.1512474323" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index aaf9691ef4..bac6d29816 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 4126600079 -#define TS_SIGNATURE "rusEFI 2022.08.11.kin.4126600079" +#define SIGNATURE_HASH 73785694 +#define TS_SIGNATURE "rusEFI 2022.08.11.kin.73785694" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 2d4766495c..1966316a38 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 558845694 -#define TS_SIGNATURE "rusEFI 2022.08.11.mre_f4.558845694" +#define SIGNATURE_HASH 3504096303 +#define TS_SIGNATURE "rusEFI 2022.08.11.mre_f4.3504096303" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 5a7f2aee0e..2d02049d20 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 558845694 -#define TS_SIGNATURE "rusEFI 2022.08.11.mre_f7.558845694" +#define SIGNATURE_HASH 3504096303 +#define TS_SIGNATURE "rusEFI 2022.08.11.mre_f7.3504096303" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 3bda655432..8a6b2cf86d 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 3195214830 -#define TS_SIGNATURE "rusEFI 2022.08.11.prometheus_405.3195214830" +#define SIGNATURE_HASH 1340084543 +#define TS_SIGNATURE "rusEFI 2022.08.11.prometheus_405.1340084543" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 1eac7bb7bf..7633870079 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 3195214830 -#define TS_SIGNATURE "rusEFI 2022.08.11.prometheus_469.3195214830" +#define SIGNATURE_HASH 1340084543 +#define TS_SIGNATURE "rusEFI 2022.08.11.prometheus_469.1340084543" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 2ab2bfae9b..d22c5ce6ee 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 1263797630 -#define TS_SIGNATURE "rusEFI 2022.08.11.proteus_f4.1263797630" +#define SIGNATURE_HASH 3133607855 +#define TS_SIGNATURE "rusEFI 2022.08.11.proteus_f4.3133607855" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 7c4464dc1a..6fd7368d49 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 1263797630 -#define TS_SIGNATURE "rusEFI 2022.08.11.proteus_f7.1263797630" +#define SIGNATURE_HASH 3133607855 +#define TS_SIGNATURE "rusEFI 2022.08.11.proteus_f7.3133607855" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index f6ed41d6f7..33a396e7e6 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 1263797630 -#define TS_SIGNATURE "rusEFI 2022.08.11.proteus_h7.1263797630" +#define SIGNATURE_HASH 3133607855 +#define TS_SIGNATURE "rusEFI 2022.08.11.proteus_h7.3133607855" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 87fea0c953..15fc266921 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 3850910650 -#define TS_SIGNATURE "rusEFI 2022.08.11.subaru_eg33_f7.3850910650" +#define SIGNATURE_HASH 337326443 +#define TS_SIGNATURE "rusEFI 2022.08.11.subaru_eg33_f7.337326443" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 81c48d08ff..54cd6ec3a9 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 1150356572 -#define TS_SIGNATURE "rusEFI 2022.08.11.tdg-pdm8.1150356572" +#define SIGNATURE_HASH 3036808845 +#define TS_SIGNATURE "rusEFI 2022.08.11.tdg-pdm8.3036808845" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 2137172ae2..4357755557 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -449,5 +449,7 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.auxSpeed2; if (strEqualCaseInsensitive(name, "ISSValue")) return engine->outputChannels.ISSValue; + if (strEqualCaseInsensitive(name, "rawBattery")) + return engine->outputChannels.rawBattery; return EFI_ERROR_CODE; } diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 5127c8b9d8..6f91e75dc6 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.08.11.all.4003054088" + signature = "rusEFI 2022.08.11.all.520800473" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.all.4003054088" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.all.520800473" ; 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 Thu Aug 11 04:34:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:25:11 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 c58c11d60d..7fdb8425c7 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.08.11.48way.4190030407" + signature = "rusEFI 2022.08.11.48way.137216150" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.48way.4190030407" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.48way.137216150" ; 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 Thu Aug 11 04:34:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:48 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 7531849bf8..7c456c126c 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.08.11.alphax-2chan.3700121444" + signature = "rusEFI 2022.08.11.alphax-2chan.756569525" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.alphax-2chan.3700121444" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.alphax-2chan.756569525" ; 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 Thu Aug 11 04:33:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:13 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 8ae85a8872..f3912c9557 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.08.11.alphax-4chan.3440717131" + signature = "rusEFI 2022.08.11.alphax-4chan.1015424922" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.alphax-4chan.3440717131" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.alphax-4chan.1015424922" ; 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 Thu Aug 11 04:33:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:15 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 6b3cad059c..53436eabda 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.08.11.atlas.4065539887" + signature = "rusEFI 2022.08.11.atlas.62930430" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.atlas.4065539887" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.atlas.62930430" ; 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 Thu Aug 11 04:34:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:25:07 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 e6f3a29314..7650494faf 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.08.11.core8.410358769" + signature = "rusEFI 2022.08.11.core8.3924203808" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.core8.410358769" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.core8.3924203808" ; 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 Thu Aug 11 04:34:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:46 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 ee81b42678..e4cebeca46 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.08.11.f407-discovery.4003054088" + signature = "rusEFI 2022.08.11.f407-discovery.520800473" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.f407-discovery.4003054088" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.f407-discovery.520800473" ; 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 Thu Aug 11 04:34:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:25:03 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 70bde6ec63..f9873e6999 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.08.11.f429-discovery.4003054088" + signature = "rusEFI 2022.08.11.f429-discovery.520800473" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.f429-discovery.4003054088" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.f429-discovery.520800473" ; 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 Thu Aug 11 04:34:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:25:05 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 cc4b3d6541..2f0bfe1666 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.08.11.frankenso_na6.2901753548" + signature = "rusEFI 2022.08.11.frankenso_na6.1566979101" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.frankenso_na6.2901753548" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.frankenso_na6.1566979101" ; 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 Thu Aug 11 04:34:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:50 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 442f39dfb3..c364fcf88f 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.08.11.harley81.2591399287" + signature = "rusEFI 2022.08.11.harley81.1810274214" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.harley81.2591399287" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.harley81.1810274214" ; 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 Thu Aug 11 04:33:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:17 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 a1db398bb5..7c37c32dae 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.08.11.hellen-gm-e67.3482768237" + signature = "rusEFI 2022.08.11.hellen-gm-e67.1040570812" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.hellen-gm-e67.3482768237" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.hellen-gm-e67.1040570812" ; 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 Thu Aug 11 04:33:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:36 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 136c739d20..bd8df58dea 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.08.11.hellen-nb1.923988932" + signature = "rusEFI 2022.08.11.hellen-nb1.3330406677" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.hellen-nb1.923988932" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.hellen-nb1.3330406677" ; 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 Thu Aug 11 04:33:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:34 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 a34c8338c4..44565b29e0 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.08.11.hellen121nissan.1715960546" + signature = "rusEFI 2022.08.11.hellen121nissan.2547281971" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.hellen121nissan.1715960546" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.hellen121nissan.2547281971" ; 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 Thu Aug 11 04:33:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:24 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 bbb7039a91..65829a53dd 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.08.11.hellen121vag.2662859122" + signature = "rusEFI 2022.08.11.hellen121vag.1865092003" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.hellen121vag.2662859122" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.hellen121vag.1865092003" ; 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 Thu Aug 11 04:33:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:22 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 58097c58a4..ce519ebb14 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.08.11.hellen128.275250998" + signature = "rusEFI 2022.08.11.hellen128.3790927335" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.hellen128.275250998" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.hellen128.3790927335" ; 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 Thu Aug 11 04:33:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:20 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 d5d250da06..de7ca0f028 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.08.11.hellen154hyundai.1993781388" + signature = "rusEFI 2022.08.11.hellen154hyundai.2269493853" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.hellen154hyundai.1993781388" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.hellen154hyundai.2269493853" ; 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 Thu Aug 11 04:33:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:26 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 acd27a464b..3cc384724a 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.08.11.hellen72.480701196" + signature = "rusEFI 2022.08.11.hellen72.3979731421" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.hellen72.480701196" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.hellen72.3979731421" ; 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 Thu Aug 11 04:33:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:30 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 3558e753f9..10848cacea 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.08.11.hellen81.3425442306" + signature = "rusEFI 2022.08.11.hellen81.1035931859" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.hellen81.3425442306" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.hellen81.1035931859" ; 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 Thu Aug 11 04:33:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:32 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 914574744c..81c88079a9 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.08.11.hellen88bmw.4218212804" + signature = "rusEFI 2022.08.11.hellen88bmw.184539925" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.hellen88bmw.4218212804" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.hellen88bmw.184539925" ; 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 Thu Aug 11 04:33:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:28 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 4f7312f37f..7d834401ea 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.08.11.hellenNA6.1813132136" + signature = "rusEFI 2022.08.11.hellenNA6.2642491833" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.hellenNA6.1813132136" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.hellenNA6.2642491833" ; 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 Thu Aug 11 04:34:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:38 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 2be7faf1ea..547e9e3563 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.08.11.hellenNA8_96.3961526328" + signature = "rusEFI 2022.08.11.hellenNA8_96.498275049" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.hellenNA8_96.3961526328" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.hellenNA8_96.498275049" ; 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 Thu Aug 11 04:34:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:40 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 d2c5754316..7168cf332f 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.08.11.hellen_cypress.2880801794" + signature = "rusEFI 2022.08.11.hellen_cypress.1512474323" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.hellen_cypress.2880801794" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.hellen_cypress.1512474323" ; 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 Thu Aug 11 04:34:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Aug 11 14:25:14 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 1c1747032d..0237aea5db 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.08.11.kin.4126600079" + signature = "rusEFI 2022.08.11.kin.73785694" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.kin.4126600079" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.kin.73785694" ; 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 Thu Aug 11 04:34:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Aug 11 14:25:13 UTC 2022 pageSize = 21272 page = 1 @@ -2350,64 +2350,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3648,6 +3647,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4079,6 +4079,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 2b4f455f0c..69813cfb52 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.08.11.mre_f4.558845694" + signature = "rusEFI 2022.08.11.mre_f4.3504096303" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.mre_f4.558845694" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.mre_f4.3504096303" ; 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 Thu Aug 11 04:34:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:44 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 bccd836153..8ef392f38a 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.08.11.mre_f7.558845694" + signature = "rusEFI 2022.08.11.mre_f7.3504096303" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.mre_f7.558845694" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.mre_f7.3504096303" ; 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 Thu Aug 11 04:34:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:42 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 63d68619c4..92aed750bc 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.08.11.prometheus_405.3195214830" + signature = "rusEFI 2022.08.11.prometheus_405.1340084543" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.prometheus_405.3195214830" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.prometheus_405.1340084543" ; 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 Thu Aug 11 04:34:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:54 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 3dfc292766..469100b40e 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.08.11.prometheus_469.3195214830" + signature = "rusEFI 2022.08.11.prometheus_469.1340084543" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.prometheus_469.3195214830" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.prometheus_469.1340084543" ; 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 Thu Aug 11 04:34:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:52 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 f0514e46a8..9e03acaaa7 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.08.11.proteus_f4.1263797630" + signature = "rusEFI 2022.08.11.proteus_f4.3133607855" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.proteus_f4.1263797630" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.proteus_f4.3133607855" ; 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 Thu Aug 11 04:34:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:58 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 ceb2df9cb2..9a79ec1648 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.08.11.proteus_f7.1263797630" + signature = "rusEFI 2022.08.11.proteus_f7.3133607855" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.proteus_f7.1263797630" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.proteus_f7.3133607855" ; 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 Thu Aug 11 04:34:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:24:56 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 dd8c75f62a..3e4b51d131 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.08.11.proteus_h7.1263797630" + signature = "rusEFI 2022.08.11.proteus_h7.3133607855" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.proteus_h7.1263797630" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.proteus_h7.3133607855" ; 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 Thu Aug 11 04:34:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:25:00 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 f90700d259..b4479c773e 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.08.11.subaru_eg33_f7.3850910650" + signature = "rusEFI 2022.08.11.subaru_eg33_f7.337326443" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.subaru_eg33_f7.3850910650" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.subaru_eg33_f7.337326443" ; 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 Thu Aug 11 04:34:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Aug 11 14:25:16 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 ac46bca7b0..57026780fb 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.08.11.tdg-pdm8.1150356572" + signature = "rusEFI 2022.08.11.tdg-pdm8.3036808845" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.11.tdg-pdm8.1150356572" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.11.tdg-pdm8.3036808845" ; 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 Thu Aug 11 04:34:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:25:09 UTC 2022 pageSize = 21300 page = 1 @@ -2389,64 +2389,63 @@ gppwmOutput1 = scalar, U08, 526, "%", 0.5, 0 gppwmOutput2 = scalar, U08, 527, "%", 0.5, 0 gppwmOutput3 = scalar, U08, 528, "%", 0.5, 0 gppwmOutput4 = scalar, U08, 529, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 530, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 531, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 532, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 533, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 534, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 535, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 536, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 537, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 538, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 539, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 540, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 541, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 542, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 543, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 544, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 545, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 546, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 547, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 548, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 549, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 550, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 551, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 552, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 553, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 554, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 555, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 556, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 557, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 558, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 559, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 587, "", 1, 0 +rawBattery = scalar, S16, 530, "V", 0.001, 0 +unusedAtTheEnd1 = scalar, U08, 532, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 533, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 534, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 535, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 536, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 537, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 538, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 539, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 540, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 541, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 542, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 543, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 544, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 545, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 546, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 547, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 548, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 549, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 550, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 551, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 552, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 553, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 554, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 555, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 556, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 557, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 558, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 559, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 560, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 561, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 587, "", 1, 0 ; total TS size = 588 m_knockRetard = scalar, F32, 588, "", 1, 0 m_knockThreshold = scalar, F32, 592, "", 1, 0 @@ -3687,6 +3686,7 @@ gaugeCategory = Sensors - Raw 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 + rawBatteryGauge = rawBattery , "Raw Battery", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "V", 0, 5, 0, 0, 5, 5, 3, 0 rawIdlePositionSensorGauge = rawIdlePositionSensor, "Raw Idle Position", "V", 0, 5, 0, 0, 5, 5, 3, 0 @@ -4118,6 +4118,7 @@ entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" +entry = rawBattery, "rawBattery", 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 d909120032..0720d3f905 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 04:34:32 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 11 14:25:20 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1894,6 +1894,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 = 520800473; public static final int silentTriggerError_offset = 1360; public static final int skippedWheelOnCam_offset = 1360; public static final int slowAdcAlpha_offset = 1600; @@ -2383,7 +2384,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.08.11.all.4003054088"; + public static final String TS_SIGNATURE = "rusEFI 2022.08.11.all.520800473"; 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 = 1040; 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 9c9c7ce5e2..37ea5e6c1f 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 Sat Jul 30 15:33:10 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Aug 11 14:24:10 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -733,7 +733,8 @@ public class TsOutputs { public static final Field GPPWMOUTPUT2 = Field.create("GPPWMOUTPUT2", 527, FieldType.INT8).setScale(0.5); public static final Field GPPWMOUTPUT3 = Field.create("GPPWMOUTPUT3", 528, FieldType.INT8).setScale(0.5); public static final Field GPPWMOUTPUT4 = Field.create("GPPWMOUTPUT4", 529, FieldType.INT8).setScale(0.5); - public static final Field UNUSEDATTHEEND = Field.create("UNUSEDATTHEEND", 530, FieldType.INT8).setScale(1.0); + public static final Field RAWBATTERY = Field.create("RAWBATTERY", 530, FieldType.INT16).setScale(0.001); + public static final Field UNUSEDATTHEEND = Field.create("UNUSEDATTHEEND", 532, FieldType.INT8).setScale(1.0); public static final Field[] VALUES = { SD_PRESENT, ISIGNITIONENABLEDINDICATOR, @@ -1073,6 +1074,7 @@ public class TsOutputs { GPPWMOUTPUT2, GPPWMOUTPUT3, GPPWMOUTPUT4, + RAWBATTERY, UNUSEDATTHEEND, }; }