From 81a73508b7c56b26bd7a92beafaffe4b3547c844 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Wed, 31 Aug 2022 23:10:02 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 12 ++- .../controllers/algo/rusefi_generated.h | 7 +- ...ngine_configuration_generated_structures.h | 12 ++- .../controllers/algo/rusefi_generated.h | 7 +- ...ngine_configuration_generated_structures.h | 12 ++- .../controllers/algo/rusefi_generated.h | 7 +- .../console/binary/generated/data_logs.ini | 1 + .../binary/generated/fancy_content.ini | 1 + .../binary/generated/output_channels.ini | 48 ++++----- .../actuators/ac_control_generated.h | 53 +++++----- ...ngine_configuration_generated_structures.h | 12 ++- .../controllers/generated/rusefi_generated.h | 7 +- .../controllers/generated/signature_48way.h | 4 +- .../controllers/generated/signature_all.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../controllers/generated/signature_core8.h | 4 +- .../controllers/generated/signature_cypress.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_harley81.h | 4 +- .../generated/signature_hellen-gm-e67.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- .../lua/generated/value_lookup_generated.cpp | 7 ++ firmware/tunerstudio/generated/rusefi.ini | 61 ++++++------ .../tunerstudio/generated/rusefi_48way.ini | 61 ++++++------ .../generated/rusefi_alphax-2chan.ini | 61 ++++++------ .../generated/rusefi_alphax-4chan.ini | 61 ++++++------ .../tunerstudio/generated/rusefi_atlas.ini | 61 ++++++------ .../tunerstudio/generated/rusefi_core8.ini | 61 ++++++------ .../tunerstudio/generated/rusefi_cypress.ini | 61 ++++++------ .../generated/rusefi_f407-discovery.ini | 61 ++++++------ .../generated/rusefi_f429-discovery.ini | 61 ++++++------ .../generated/rusefi_frankenso_na6.ini | 61 ++++++------ .../tunerstudio/generated/rusefi_harley81.ini | 61 ++++++------ .../generated/rusefi_hellen-gm-e67.ini | 61 ++++++------ .../generated/rusefi_hellen-nb1.ini | 61 ++++++------ .../generated/rusefi_hellen121nissan.ini | 61 ++++++------ .../generated/rusefi_hellen121vag.ini | 61 ++++++------ .../generated/rusefi_hellen128mercedes.ini | 61 ++++++------ .../generated/rusefi_hellen154hyundai.ini | 61 ++++++------ .../tunerstudio/generated/rusefi_hellen72.ini | 61 ++++++------ .../tunerstudio/generated/rusefi_hellen81.ini | 61 ++++++------ .../generated/rusefi_hellen88bmw.ini | 61 ++++++------ .../generated/rusefi_hellenNA6.ini | 61 ++++++------ .../generated/rusefi_hellenNA8_96.ini | 61 ++++++------ firmware/tunerstudio/generated/rusefi_kin.ini | 61 ++++++------ .../tunerstudio/generated/rusefi_mre_f4.ini | 61 ++++++------ .../tunerstudio/generated/rusefi_mre_f7.ini | 61 ++++++------ .../generated/rusefi_prometheus_405.ini | 61 ++++++------ .../generated/rusefi_prometheus_469.ini | 61 ++++++------ .../generated/rusefi_proteus_f4.ini | 61 ++++++------ .../generated/rusefi_proteus_f7.ini | 61 ++++++------ .../generated/rusefi_proteus_h7.ini | 61 ++++++------ .../generated/rusefi_subaru_eg33_f7.ini | 61 ++++++------ .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 61 ++++++------ .../rusefi/config/generated/AcControl.java | 98 +++++++++---------- .../com/rusefi/config/generated/Fields.java | 12 ++- 79 files changed, 1289 insertions(+), 1087 deletions(-) diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h index e1a30ed784..3efc246de5 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Aug 30 06:01:26 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Aug 31 23:09:04 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3985,9 +3985,15 @@ struct engine_configuration_s { */ scaled_channel dfcoDelay; /** + * Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages. + sec * offset 3122 */ - int8_t unused4080[10]; + scaled_channel acDelay; + /** + * offset 3123 + */ + int8_t unused4080[9]; /** lobes/cam * offset 3132 @@ -4983,4 +4989,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21300); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Aug 30 06:01:26 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Aug 31 23:09:04 UTC 2022 diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index 2deaf35430..9de6282894 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -3,6 +3,7 @@ // #define accelerometerSpiDevice_offset 2060 +#define acDelay_offset 3122 #define acFanPin_offset 790 #define acFanPinMode_offset 792 #define acIdleExtraOffset_offset 725 @@ -1937,7 +1938,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3329553180 +#define SIGNATURE_HASH 537105780 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2497,7 +2498,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.31.cypress.3329553180" +#define TS_SIGNATURE "rusEFI 2022.09.01.cypress.537105780" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2539,7 +2540,7 @@ #define unused1130_offset 1628 #define unused120b18_offset 120 #define unused1740b2_offset 1628 -#define unused4080_offset 3122 +#define unused4080_offset 3123 #define unused556_offset 566 #define unused962_offset 1040 #define unused_1484_bit_27_offset 1372 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 41057be998..11edc3e362 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Aug 30 06:01:24 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 31 23:09:03 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3985,9 +3985,15 @@ struct engine_configuration_s { */ scaled_channel dfcoDelay; /** + * Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages. + sec * offset 3122 */ - int8_t unused4080[10]; + scaled_channel acDelay; + /** + * offset 3123 + */ + int8_t unused4080[9]; /** lobes/cam * offset 3132 @@ -4983,4 +4989,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21300); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Aug 30 06:01:24 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 31 23:09:03 UTC 2022 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 952edfa8cd..7644b99fa6 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -3,6 +3,7 @@ // #define accelerometerSpiDevice_offset 2060 +#define acDelay_offset 3122 #define acFanPin_offset 790 #define acFanPinMode_offset 792 #define acIdleExtraOffset_offset 725 @@ -1937,7 +1938,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2929938896 +#define SIGNATURE_HASH 1221867448 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2497,7 +2498,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.31.kin.2929938896" +#define TS_SIGNATURE "rusEFI 2022.09.01.kin.1221867448" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2539,7 +2540,7 @@ #define unused1130_offset 1628 #define unused120b18_offset 120 #define unused1740b2_offset 1628 -#define unused4080_offset 3122 +#define unused4080_offset 3123 #define unused556_offset 566 #define unused962_offset 1040 #define unused_1484_bit_27_offset 1372 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 3d6cdc6681..e3dcdad901 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// 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 Tue Aug 30 06:01:27 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 Wed Aug 31 23:09:06 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3985,9 +3985,15 @@ struct engine_configuration_s { */ scaled_channel dfcoDelay; /** + * Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages. + sec * offset 3122 */ - int8_t unused4080[10]; + scaled_channel acDelay; + /** + * offset 3123 + */ + int8_t unused4080[9]; /** lobes/cam * offset 3132 @@ -4983,4 +4989,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21300); // end -// 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 Tue Aug 30 06:01:27 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 Wed Aug 31 23:09:06 UTC 2022 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 0d99fb9fdc..e25156764a 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 @@ -3,6 +3,7 @@ // #define accelerometerSpiDevice_offset 2060 +#define acDelay_offset 3122 #define acFanPin_offset 790 #define acFanPinMode_offset 792 #define acIdleExtraOffset_offset 725 @@ -1903,7 +1904,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3211406022 +#define SIGNATURE_HASH 1495092398 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2464,7 +2465,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.31.subaru_eg33_f7.3211406022" +#define TS_SIGNATURE "rusEFI 2022.09.01.subaru_eg33_f7.1495092398" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2506,7 +2507,7 @@ #define unused1130_offset 1628 #define unused120b18_offset 120 #define unused1740b2_offset 1628 -#define unused4080_offset 3122 +#define unused4080_offset 3123 #define unused556_offset 566 #define unused962_offset 1040 #define unused_1484_bit_27_offset 1372 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 29790de2d3..81d68b883e 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -312,6 +312,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 6481cb657c..2faff818b8 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -71,6 +71,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index d0f2d8508c..eb9a1fbefe 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -647,30 +647,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 diff --git a/firmware/controllers/actuators/ac_control_generated.h b/firmware/controllers/actuators/ac_control_generated.h index 0381e8efc7..ed56acad89 100644 --- a/firmware/controllers/actuators/ac_control_generated.h +++ b/firmware/controllers/actuators/ac_control_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jul 02 08:20:03 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Wed Aug 31 23:09:02 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -38,77 +38,78 @@ struct ac_control_s { offset 0 bit 7 */ bool isDisabledByLua : 1 {}; /** + * AC compressor on offset 0 bit 8 */ - bool unusedBit_8_8 : 1 {}; + bool acCompressorState : 1 {}; /** offset 0 bit 9 */ - bool unusedBit_8_9 : 1 {}; + bool unusedBit_9_9 : 1 {}; /** offset 0 bit 10 */ - bool unusedBit_8_10 : 1 {}; + bool unusedBit_9_10 : 1 {}; /** offset 0 bit 11 */ - bool unusedBit_8_11 : 1 {}; + bool unusedBit_9_11 : 1 {}; /** offset 0 bit 12 */ - bool unusedBit_8_12 : 1 {}; + bool unusedBit_9_12 : 1 {}; /** offset 0 bit 13 */ - bool unusedBit_8_13 : 1 {}; + bool unusedBit_9_13 : 1 {}; /** offset 0 bit 14 */ - bool unusedBit_8_14 : 1 {}; + bool unusedBit_9_14 : 1 {}; /** offset 0 bit 15 */ - bool unusedBit_8_15 : 1 {}; + bool unusedBit_9_15 : 1 {}; /** offset 0 bit 16 */ - bool unusedBit_8_16 : 1 {}; + bool unusedBit_9_16 : 1 {}; /** offset 0 bit 17 */ - bool unusedBit_8_17 : 1 {}; + bool unusedBit_9_17 : 1 {}; /** offset 0 bit 18 */ - bool unusedBit_8_18 : 1 {}; + bool unusedBit_9_18 : 1 {}; /** offset 0 bit 19 */ - bool unusedBit_8_19 : 1 {}; + bool unusedBit_9_19 : 1 {}; /** offset 0 bit 20 */ - bool unusedBit_8_20 : 1 {}; + bool unusedBit_9_20 : 1 {}; /** offset 0 bit 21 */ - bool unusedBit_8_21 : 1 {}; + bool unusedBit_9_21 : 1 {}; /** offset 0 bit 22 */ - bool unusedBit_8_22 : 1 {}; + bool unusedBit_9_22 : 1 {}; /** offset 0 bit 23 */ - bool unusedBit_8_23 : 1 {}; + bool unusedBit_9_23 : 1 {}; /** offset 0 bit 24 */ - bool unusedBit_8_24 : 1 {}; + bool unusedBit_9_24 : 1 {}; /** offset 0 bit 25 */ - bool unusedBit_8_25 : 1 {}; + bool unusedBit_9_25 : 1 {}; /** offset 0 bit 26 */ - bool unusedBit_8_26 : 1 {}; + bool unusedBit_9_26 : 1 {}; /** offset 0 bit 27 */ - bool unusedBit_8_27 : 1 {}; + bool unusedBit_9_27 : 1 {}; /** offset 0 bit 28 */ - bool unusedBit_8_28 : 1 {}; + bool unusedBit_9_28 : 1 {}; /** offset 0 bit 29 */ - bool unusedBit_8_29 : 1 {}; + bool unusedBit_9_29 : 1 {}; /** offset 0 bit 30 */ - bool unusedBit_8_30 : 1 {}; + bool unusedBit_9_30 : 1 {}; /** offset 0 bit 31 */ - bool unusedBit_8_31 : 1 {}; + bool unusedBit_9_31 : 1 {}; /** * AC latest activity * offset 4 @@ -122,4 +123,4 @@ struct ac_control_s { static_assert(sizeof(ac_control_s) == 12); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jul 02 08:20:03 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Wed Aug 31 23:09:02 UTC 2022 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 48d4d24917..6649462b5f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 30 06:02:17 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:55 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3985,9 +3985,15 @@ struct engine_configuration_s { */ scaled_channel dfcoDelay; /** + * Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages. + sec * offset 3122 */ - int8_t unused4080[10]; + scaled_channel acDelay; + /** + * offset 3123 + */ + int8_t unused4080[9]; /** lobes/cam * offset 3132 @@ -4983,4 +4989,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21300); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 30 06:02:17 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:55 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 7ea55dd549..a38fac5f35 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -3,6 +3,7 @@ // #define accelerometerSpiDevice_offset 2060 +#define acDelay_offset 3122 #define acFanPin_offset 790 #define acFanPinMode_offset 792 #define acIdleExtraOffset_offset 725 @@ -1937,7 +1938,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3329553180 +#define SIGNATURE_HASH 537105780 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2497,7 +2498,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.31.all.3329553180" +#define TS_SIGNATURE "rusEFI 2022.09.01.all.537105780" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2539,7 +2540,7 @@ #define unused1130_offset 1628 #define unused120b18_offset 120 #define unused1740b2_offset 1628 -#define unused4080_offset 3122 +#define unused4080_offset 3123 #define unused556_offset 566 #define unused962_offset 1040 #define unused_1484_bit_27_offset 1372 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index b67dbdb947..d892a057f0 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 3511941971 -#define TS_SIGNATURE "rusEFI 2022.08.31.48way.3511941971" +#define SIGNATURE_HASH 925146427 +#define TS_SIGNATURE "rusEFI 2022.09.01.48way.925146427" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 8261c0de71..5896f51efa 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 3329553180 -#define TS_SIGNATURE "rusEFI 2022.08.31.all.3329553180" +#define SIGNATURE_HASH 537105780 +#define TS_SIGNATURE "rusEFI 2022.09.01.all.537105780" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index b9ccd2a326..1c299b2925 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 4100353648 -#define TS_SIGNATURE "rusEFI 2022.08.31.alphax-2chan.4100353648" +#define SIGNATURE_HASH 303106072 +#define TS_SIGNATURE "rusEFI 2022.09.01.alphax-2chan.303106072" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 1743df7815..6a3ac38759 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 1298673811 -#define TS_SIGNATURE "rusEFI 2022.08.31.alphax-4chan.1298673811" +#define SIGNATURE_HASH 2870957819 +#define TS_SIGNATURE "rusEFI 2022.09.01.alphax-4chan.2870957819" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index dc79f4d7a2..465ec1197c 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 3669886523 -#define TS_SIGNATURE "rusEFI 2022.08.31.atlas.3669886523" +#define SIGNATURE_HASH 1019830355 +#define TS_SIGNATURE "rusEFI 2022.09.01.atlas.1019830355" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index a17b7978fb..72d844ab9a 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 815309541 -#define TS_SIGNATURE "rusEFI 2022.08.31.core8.815309541" +#define SIGNATURE_HASH 3606037645 +#define TS_SIGNATURE "rusEFI 2022.09.01.core8.3606037645" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index fb2caf771c..5d32f420a9 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 3329553180 -#define TS_SIGNATURE "rusEFI 2022.08.31.cypress.3329553180" +#define SIGNATURE_HASH 537105780 +#define TS_SIGNATURE "rusEFI 2022.09.01.cypress.537105780" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 30a2ef1a58..bb6be9caa8 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 3329553180 -#define TS_SIGNATURE "rusEFI 2022.08.31.f407-discovery.3329553180" +#define SIGNATURE_HASH 537105780 +#define TS_SIGNATURE "rusEFI 2022.09.01.f407-discovery.537105780" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 40e167d057..b5d94c2ede 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 3329553180 -#define TS_SIGNATURE "rusEFI 2022.08.31.f429-discovery.3329553180" +#define SIGNATURE_HASH 537105780 +#define TS_SIGNATURE "rusEFI 2022.09.01.f429-discovery.537105780" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 3385e6d899..27a5a98c90 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 2216169432 -#define TS_SIGNATURE "rusEFI 2022.08.31.frankenso_na6.2216169432" +#define SIGNATURE_HASH 1651468720 +#define TS_SIGNATURE "rusEFI 2022.09.01.frankenso_na6.1651468720" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 81fcefe7b4..f6b2cf56f6 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 915011123 -#define TS_SIGNATURE "rusEFI 2022.08.31.harley81.915011123" +#define SIGNATURE_HASH 3506344027 +#define TS_SIGNATURE "rusEFI 2022.09.01.harley81.3506344027" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 4c12f404dc..8cbb54d150 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 1913878186 -#define TS_SIGNATURE "rusEFI 2022.08.31.hellen-gm-e67.1913878186" +#define SIGNATURE_HASH 2489585858 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen-gm-e67.2489585858" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index ddbc720081..1e178cb1a4 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 536855248 -#define TS_SIGNATURE "rusEFI 2022.08.31.hellen-nb1.536855248" +#define SIGNATURE_HASH 4186481848 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen-nb1.4186481848" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 0f88c2f3e9..18ed1f585f 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 1319783414 -#define TS_SIGNATURE "rusEFI 2022.08.31.hellen121nissan.1319783414" +#define SIGNATURE_HASH 2833067422 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen121nissan.2833067422" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index f923654d2d..844d771f41 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 3059036262 -#define TS_SIGNATURE "rusEFI 2022.08.31.hellen121vag.3059036262" +#define SIGNATURE_HASH 1344427534 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen121vag.1344427534" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index f7c8aacdd0..40131af11d 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 948620834 -#define TS_SIGNATURE "rusEFI 2022.08.31.hellen128.948620834" +#define SIGNATURE_HASH 3741165642 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen128.3741165642" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 2463cf9769..978c8843ca 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 1580958104 -#define TS_SIGNATURE "rusEFI 2022.08.31.hellen154hyundai.1580958104" +#define SIGNATURE_HASH 3092047856 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen154hyundai.3092047856" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 0b359f243f..9deb5738a1 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 877386264 -#define TS_SIGNATURE "rusEFI 2022.08.31.hellen72.877386264" +#define SIGNATURE_HASH 3527195760 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen72.3527195760" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index ef68fb3c72..e59180c07e 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 3837864726 -#define TS_SIGNATURE "rusEFI 2022.08.31.hellen81.3837864726" +#define SIGNATURE_HASH 45501822 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen81.45501822" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index f4aa1d10ae..6d0c98b2a2 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 3548504272 -#define TS_SIGNATURE "rusEFI 2022.08.31.hellen88bmw.3548504272" +#define SIGNATURE_HASH 905348792 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen88bmw.905348792" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 7a857bd193..eb7e4b409f 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 59157918 -#define TS_SIGNATURE "rusEFI 2022.08.31.hellenNA6.59157918" +#define SIGNATURE_HASH 3857828854 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellenNA6.3857828854" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 21a0c7bb1b..30854bb97d 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 1719485172 -#define TS_SIGNATURE "rusEFI 2022.08.31.hellenNA8_96.1719485172" +#define SIGNATURE_HASH 2148148380 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellenNA8_96.2148148380" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 81eff1ed70..202d924ff0 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 2929938896 -#define TS_SIGNATURE "rusEFI 2022.08.31.kin.2929938896" +#define SIGNATURE_HASH 1221867448 +#define TS_SIGNATURE "rusEFI 2022.09.01.kin.1221867448" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index e24882af1c..c727ae1228 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 161644522 -#define TS_SIGNATURE "rusEFI 2022.08.31.mre_f4.161644522" +#define SIGNATURE_HASH 4023720322 +#define TS_SIGNATURE "rusEFI 2022.09.01.mre_f4.4023720322" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 5aa35b703e..c454d0f53b 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 161644522 -#define TS_SIGNATURE "rusEFI 2022.08.31.mre_f7.161644522" +#define SIGNATURE_HASH 4023720322 +#define TS_SIGNATURE "rusEFI 2022.09.01.mre_f7.4023720322" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 264ae22984..2cd57fd5dd 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 2526948090 -#define TS_SIGNATURE "rusEFI 2022.08.31.prometheus_405.2526948090" +#define SIGNATURE_HASH 1894337682 +#define TS_SIGNATURE "rusEFI 2022.09.01.prometheus_405.1894337682" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 55e925eef6..ff3bbb898a 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 2526948090 -#define TS_SIGNATURE "rusEFI 2022.08.31.prometheus_469.2526948090" +#define SIGNATURE_HASH 1894337682 +#define TS_SIGNATURE "rusEFI 2022.09.01.prometheus_469.1894337682" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 2f59c9b7f7..76c11e072c 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 1673081962 -#define TS_SIGNATURE "rusEFI 2022.08.31.proteus_f4.1673081962" +#define SIGNATURE_HASH 2244891138 +#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_f4.2244891138" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 2e61d9a884..54167e72c1 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 1673081962 -#define TS_SIGNATURE "rusEFI 2022.08.31.proteus_f7.1673081962" +#define SIGNATURE_HASH 2244891138 +#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_f7.2244891138" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 68f9bbc291..9279e69f04 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 1673081962 -#define TS_SIGNATURE "rusEFI 2022.08.31.proteus_h7.1673081962" +#define SIGNATURE_HASH 2244891138 +#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_h7.2244891138" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 25653e1082..f325df718c 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 3211406022 -#define TS_SIGNATURE "rusEFI 2022.08.31.subaru_eg33_f7.3211406022" +#define SIGNATURE_HASH 1495092398 +#define TS_SIGNATURE "rusEFI 2022.09.01.subaru_eg33_f7.1495092398" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index de34fed936..d95374f0c1 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 1820081480 -#define TS_SIGNATURE "rusEFI 2022.08.31.tdg-pdm8.1820081480" +#define SIGNATURE_HASH 2316000032 +#define TS_SIGNATURE "rusEFI 2022.09.01.tdg-pdm8.2316000032" diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index 58e50e804d..aa3b24e151 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -836,6 +836,8 @@ float getConfigValueByName(const char *name) { return engineConfiguration->maxCamPhaseResolveRpm; if (strEqualCaseInsensitive(name, "dfcoDelay")) return engineConfiguration->dfcoDelay; + if (strEqualCaseInsensitive(name, "acDelay")) + return engineConfiguration->acDelay; if (strEqualCaseInsensitive(name, "hpfpCamLobes")) return engineConfiguration->hpfpCamLobes; if (strEqualCaseInsensitive(name, "hpfpPeakPos")) @@ -2553,6 +2555,11 @@ void setConfigValueByName(const char *name, float value) { engineConfiguration->dfcoDelay = (int)value; return; } + if (strEqualCaseInsensitive(name, "acDelay")) + { + engineConfiguration->acDelay = (int)value; + return; + } if (strEqualCaseInsensitive(name, "hpfpCamLobes")) { engineConfiguration->hpfpCamLobes = (int)value; diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 68cb585cfe..2749473264 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.all.3329553180" + signature = "rusEFI 2022.09.01.all.537105780" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.all.3329553180" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.all.537105780" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:27:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:53 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5468,6 +5471,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6787,6 +6791,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 33a7387ba5..bc32bd1ad8 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.48way.3511941971" + signature = "rusEFI 2022.09.01.48way.925146427" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.48way.3511941971" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.48way.925146427" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:35 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5466,6 +5469,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6783,6 +6787,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 6704acee37..ac5804e742 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.alphax-2chan.4100353648" + signature = "rusEFI 2022.09.01.alphax-2chan.303106072" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.alphax-2chan.4100353648" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.alphax-2chan.303106072" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:08 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5462,6 +5465,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6768,6 +6772,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 203f92e63a..aa3865ed54 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.alphax-4chan.1298673811" + signature = "rusEFI 2022.09.01.alphax-4chan.2870957819" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.alphax-4chan.1298673811" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.alphax-4chan.2870957819" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:09 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5465,6 +5468,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6772,6 +6776,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 60fad8c906..afbbbe80fe 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.atlas.3669886523" + signature = "rusEFI 2022.09.01.atlas.1019830355" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.atlas.3669886523" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.atlas.1019830355" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:27:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:50 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5468,6 +5471,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6779,6 +6783,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 4b76b63998..846b140555 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.core8.815309541" + signature = "rusEFI 2022.09.01.core8.3606037645" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.core8.815309541" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.core8.3606037645" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:34 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5466,6 +5469,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6783,6 +6787,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 8883aee758..07029c0e55 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.cypress.3329553180" + signature = "rusEFI 2022.09.01.cypress.537105780" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.cypress.3329553180" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.cypress.537105780" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Aug 31 02:26:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Aug 31 23:09:04 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5468,6 +5471,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6787,6 +6791,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 830999e13f..0ac0479520 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.f407-discovery.3329553180" + signature = "rusEFI 2022.09.01.f407-discovery.537105780" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.f407-discovery.3329553180" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.f407-discovery.537105780" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:27:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:47 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5468,6 +5471,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6787,6 +6791,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 1dc0446ebb..e8f329fc07 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.f429-discovery.3329553180" + signature = "rusEFI 2022.09.01.f429-discovery.537105780" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.f429-discovery.3329553180" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.f429-discovery.537105780" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:27:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:48 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5468,6 +5471,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6787,6 +6791,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index b289581ee2..7b7c8f487e 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.frankenso_na6.2216169432" + signature = "rusEFI 2022.09.01.frankenso_na6.1651468720" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.frankenso_na6.2216169432" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.frankenso_na6.1651468720" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:37 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5468,6 +5471,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6787,6 +6791,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index f99686ccd3..d5e165ee2d 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.harley81.915011123" + signature = "rusEFI 2022.09.01.harley81.3506344027" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.harley81.915011123" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.harley81.3506344027" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:11 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5465,6 +5468,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6769,6 +6773,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 4f027ecec0..147796d35d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.hellen-gm-e67.1913878186" + signature = "rusEFI 2022.09.01.hellen-gm-e67.2489585858" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.hellen-gm-e67.1913878186" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen-gm-e67.2489585858" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:25 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5465,6 +5468,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6772,6 +6776,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 85f69e5b84..f4522ba171 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.hellen-nb1.536855248" + signature = "rusEFI 2022.09.01.hellen-nb1.4186481848" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.hellen-nb1.536855248" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen-nb1.4186481848" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:24 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5465,6 +5468,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6772,6 +6776,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index de2a16420d..3de4596a4f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.hellen121nissan.1319783414" + signature = "rusEFI 2022.09.01.hellen121nissan.2833067422" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.hellen121nissan.1319783414" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen121nissan.2833067422" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:16 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5465,6 +5468,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6769,6 +6773,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 33f10ec8dc..332777730e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.hellen121vag.3059036262" + signature = "rusEFI 2022.09.01.hellen121vag.1344427534" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.hellen121vag.3059036262" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen121vag.1344427534" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:14 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5465,6 +5468,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6772,6 +6776,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 6f8b5fdb27..84d7acb23c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.hellen128.948620834" + signature = "rusEFI 2022.09.01.hellen128.3741165642" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.hellen128.948620834" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen128.3741165642" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:12 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5465,6 +5468,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6769,6 +6773,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 2217236a8e..5bbde06245 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.hellen154hyundai.1580958104" + signature = "rusEFI 2022.09.01.hellen154hyundai.3092047856" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.hellen154hyundai.1580958104" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen154hyundai.3092047856" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:17 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5465,6 +5468,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6769,6 +6773,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 07d9b2ac9a..f19824c20a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.hellen72.877386264" + signature = "rusEFI 2022.09.01.hellen72.3527195760" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.hellen72.877386264" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen72.3527195760" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:20 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5465,6 +5468,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6772,6 +6776,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 46122867e1..2d5209397f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.hellen81.3837864726" + signature = "rusEFI 2022.09.01.hellen81.45501822" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.hellen81.3837864726" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen81.45501822" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:22 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5463,6 +5466,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6770,6 +6774,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 9fabb699e8..b1269112f7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.hellen88bmw.3548504272" + signature = "rusEFI 2022.09.01.hellen88bmw.905348792" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.hellen88bmw.3548504272" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellen88bmw.905348792" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:19 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5465,6 +5468,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6769,6 +6773,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 742e414059..51f6ff8537 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.hellenNA6.59157918" + signature = "rusEFI 2022.09.01.hellenNA6.3857828854" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.hellenNA6.59157918" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellenNA6.3857828854" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:27 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5465,6 +5468,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6772,6 +6776,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 37d827ea43..33cfe478a3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.hellenNA8_96.1719485172" + signature = "rusEFI 2022.09.01.hellenNA8_96.2148148380" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.hellenNA8_96.1719485172" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.hellenNA8_96.2148148380" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:29 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5465,6 +5468,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6772,6 +6776,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index f2bfd32527..a517fa9b65 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.kin.2929938896" + signature = "rusEFI 2022.09.01.kin.1221867448" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.kin.2929938896" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.kin.1221867448" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 31 02:26:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 31 23:09:03 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5468,6 +5471,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6788,6 +6792,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index c3afd4c7eb..0021f38b25 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.mre_f4.161644522" + signature = "rusEFI 2022.09.01.mre_f4.4023720322" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.mre_f4.161644522" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.mre_f4.4023720322" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:32 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5466,6 +5469,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6771,6 +6775,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 9ac3987bcc..b96dac24d1 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.mre_f7.161644522" + signature = "rusEFI 2022.09.01.mre_f7.4023720322" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.mre_f7.161644522" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.mre_f7.4023720322" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:30 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5466,6 +5469,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6771,6 +6775,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index cc7fc3407a..48c6e8ce0c 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.prometheus_405.2526948090" + signature = "rusEFI 2022.09.01.prometheus_405.1894337682" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.prometheus_405.2526948090" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.prometheus_405.1894337682" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:40 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5462,6 +5465,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6781,6 +6785,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index da8bced76a..8641e60225 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.prometheus_469.2526948090" + signature = "rusEFI 2022.09.01.prometheus_469.1894337682" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.prometheus_469.2526948090" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.prometheus_469.1894337682" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:38 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5462,6 +5465,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6781,6 +6785,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 32452db70c..e9a280a8e1 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.proteus_f4.1673081962" + signature = "rusEFI 2022.09.01.proteus_f4.2244891138" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.proteus_f4.1673081962" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.proteus_f4.2244891138" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:27:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:43 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5462,6 +5465,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6763,6 +6767,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 9b9f16e1aa..54acc81126 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.proteus_f7.1673081962" + signature = "rusEFI 2022.09.01.proteus_f7.2244891138" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.proteus_f7.1673081962" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.proteus_f7.2244891138" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:42 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5462,6 +5465,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6763,6 +6767,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 1cb2acfaf6..cbe12877f5 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.proteus_h7.1673081962" + signature = "rusEFI 2022.09.01.proteus_h7.2244891138" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.proteus_h7.1673081962" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.proteus_h7.2244891138" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:27:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:45 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5462,6 +5465,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6763,6 +6767,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 7f7ceb183b..cb7deba0e9 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.subaru_eg33_f7.3211406022" + signature = "rusEFI 2022.09.01.subaru_eg33_f7.1495092398" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.subaru_eg33_f7.3211406022" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.subaru_eg33_f7.1495092398" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Aug 31 02:26:17 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 Wed Aug 31 23:09:06 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5464,6 +5467,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6781,6 +6785,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 6a80887b03..e28afc7a83 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.31.tdg-pdm8.1820081480" + signature = "rusEFI 2022.09.01.tdg-pdm8.2316000032" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.31.tdg-pdm8.1820081480" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.01.tdg-pdm8.2316000032" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:27:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:51 UTC 2022 pageSize = 21300 page = 1 @@ -1139,7 +1139,8 @@ triggerGapOverrideTo17 = scalar, F32, 3112, "ratio", 1, 0, 0, 20, 3 triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3122, [10], "", 1, 0, 0, 0, 0 +acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 +unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 @@ -1989,6 +1990,7 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 triggerGapOverrideTo18 = "triggerGapOverrideTo 18" maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank." dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..." + acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages." hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." @@ -2771,30 +2773,30 @@ noClt = bits, U32, 836, [4:4] engineTooHot = bits, U32, 836, [5:5] tpsTooHigh = bits, U32, 836, [6:6] isDisabledByLua = bits, U32, 836, [7:7] -unusedBit_8_8 = bits, U32, 836, [8:8] -unusedBit_8_9 = bits, U32, 836, [9:9] -unusedBit_8_10 = bits, U32, 836, [10:10] -unusedBit_8_11 = bits, U32, 836, [11:11] -unusedBit_8_12 = bits, U32, 836, [12:12] -unusedBit_8_13 = bits, U32, 836, [13:13] -unusedBit_8_14 = bits, U32, 836, [14:14] -unusedBit_8_15 = bits, U32, 836, [15:15] -unusedBit_8_16 = bits, U32, 836, [16:16] -unusedBit_8_17 = bits, U32, 836, [17:17] -unusedBit_8_18 = bits, U32, 836, [18:18] -unusedBit_8_19 = bits, U32, 836, [19:19] -unusedBit_8_20 = bits, U32, 836, [20:20] -unusedBit_8_21 = bits, U32, 836, [21:21] -unusedBit_8_22 = bits, U32, 836, [22:22] -unusedBit_8_23 = bits, U32, 836, [23:23] -unusedBit_8_24 = bits, U32, 836, [24:24] -unusedBit_8_25 = bits, U32, 836, [25:25] -unusedBit_8_26 = bits, U32, 836, [26:26] -unusedBit_8_27 = bits, U32, 836, [27:27] -unusedBit_8_28 = bits, U32, 836, [28:28] -unusedBit_8_29 = bits, U32, 836, [29:29] -unusedBit_8_30 = bits, U32, 836, [30:30] -unusedBit_8_31 = bits, U32, 836, [31:31] +acCompressorState = bits, U32, 836, [8:8] +unusedBit_9_9 = bits, U32, 836, [9:9] +unusedBit_9_10 = bits, U32, 836, [10:10] +unusedBit_9_11 = bits, U32, 836, [11:11] +unusedBit_9_12 = bits, U32, 836, [12:12] +unusedBit_9_13 = bits, U32, 836, [13:13] +unusedBit_9_14 = bits, U32, 836, [14:14] +unusedBit_9_15 = bits, U32, 836, [15:15] +unusedBit_9_16 = bits, U32, 836, [16:16] +unusedBit_9_17 = bits, U32, 836, [17:17] +unusedBit_9_18 = bits, U32, 836, [18:18] +unusedBit_9_19 = bits, U32, 836, [19:19] +unusedBit_9_20 = bits, U32, 836, [20:20] +unusedBit_9_21 = bits, U32, 836, [21:21] +unusedBit_9_22 = bits, U32, 836, [22:22] +unusedBit_9_23 = bits, U32, 836, [23:23] +unusedBit_9_24 = bits, U32, 836, [24:24] +unusedBit_9_25 = bits, U32, 836, [25:25] +unusedBit_9_26 = bits, U32, 836, [26:26] +unusedBit_9_27 = bits, U32, 836, [27:27] +unusedBit_9_28 = bits, U32, 836, [28:28] +unusedBit_9_29 = bits, U32, 836, [29:29] +unusedBit_9_30 = bits, U32, 836, [30:30] +unusedBit_9_31 = bits, U32, 836, [31:31] latest_usage_ac_control = scalar, S32, 840, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 844, "", 1, 0 ; total TS size = 848 @@ -4752,6 +4754,7 @@ entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" +entry = acCompressorState, "AC compressor on", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" @@ -5468,6 +5471,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" + indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6787,6 +6791,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "A/C switch mode", acSwitchMode field = "A/C Relay", acRelayPin field = "A/C Relay Mode", acRelayPinMode + field = "A/C compressor delay", acDelay field = "Max RPM", maxAcRpm field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java index 1b42133329..c44fc10501 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Mon Aug 29 12:19:32 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Wed Aug 31 23:09:02 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -395,30 +395,30 @@ public class AcControl { public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 5); public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 6); public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 7); - public static final Field UNUSEDBIT_8_8 = Field.create("UNUSEDBIT_8_8", 0, FieldType.BIT, 8); - public static final Field UNUSEDBIT_8_9 = Field.create("UNUSEDBIT_8_9", 0, FieldType.BIT, 9); - public static final Field UNUSEDBIT_8_10 = Field.create("UNUSEDBIT_8_10", 0, FieldType.BIT, 10); - public static final Field UNUSEDBIT_8_11 = Field.create("UNUSEDBIT_8_11", 0, FieldType.BIT, 11); - public static final Field UNUSEDBIT_8_12 = Field.create("UNUSEDBIT_8_12", 0, FieldType.BIT, 12); - public static final Field UNUSEDBIT_8_13 = Field.create("UNUSEDBIT_8_13", 0, FieldType.BIT, 13); - public static final Field UNUSEDBIT_8_14 = Field.create("UNUSEDBIT_8_14", 0, FieldType.BIT, 14); - public static final Field UNUSEDBIT_8_15 = Field.create("UNUSEDBIT_8_15", 0, FieldType.BIT, 15); - public static final Field UNUSEDBIT_8_16 = Field.create("UNUSEDBIT_8_16", 0, FieldType.BIT, 16); - public static final Field UNUSEDBIT_8_17 = Field.create("UNUSEDBIT_8_17", 0, FieldType.BIT, 17); - public static final Field UNUSEDBIT_8_18 = Field.create("UNUSEDBIT_8_18", 0, FieldType.BIT, 18); - public static final Field UNUSEDBIT_8_19 = Field.create("UNUSEDBIT_8_19", 0, FieldType.BIT, 19); - public static final Field UNUSEDBIT_8_20 = Field.create("UNUSEDBIT_8_20", 0, FieldType.BIT, 20); - public static final Field UNUSEDBIT_8_21 = Field.create("UNUSEDBIT_8_21", 0, FieldType.BIT, 21); - public static final Field UNUSEDBIT_8_22 = Field.create("UNUSEDBIT_8_22", 0, FieldType.BIT, 22); - public static final Field UNUSEDBIT_8_23 = Field.create("UNUSEDBIT_8_23", 0, FieldType.BIT, 23); - public static final Field UNUSEDBIT_8_24 = Field.create("UNUSEDBIT_8_24", 0, FieldType.BIT, 24); - public static final Field UNUSEDBIT_8_25 = Field.create("UNUSEDBIT_8_25", 0, FieldType.BIT, 25); - public static final Field UNUSEDBIT_8_26 = Field.create("UNUSEDBIT_8_26", 0, FieldType.BIT, 26); - public static final Field UNUSEDBIT_8_27 = Field.create("UNUSEDBIT_8_27", 0, FieldType.BIT, 27); - public static final Field UNUSEDBIT_8_28 = Field.create("UNUSEDBIT_8_28", 0, FieldType.BIT, 28); - public static final Field UNUSEDBIT_8_29 = Field.create("UNUSEDBIT_8_29", 0, FieldType.BIT, 29); - public static final Field UNUSEDBIT_8_30 = Field.create("UNUSEDBIT_8_30", 0, FieldType.BIT, 30); - public static final Field UNUSEDBIT_8_31 = Field.create("UNUSEDBIT_8_31", 0, FieldType.BIT, 31); + public static final Field ACCOMPRESSORSTATE = Field.create("ACCOMPRESSORSTATE", 0, FieldType.BIT, 8); + public static final Field UNUSEDBIT_9_9 = Field.create("UNUSEDBIT_9_9", 0, FieldType.BIT, 9); + public static final Field UNUSEDBIT_9_10 = Field.create("UNUSEDBIT_9_10", 0, FieldType.BIT, 10); + public static final Field UNUSEDBIT_9_11 = Field.create("UNUSEDBIT_9_11", 0, FieldType.BIT, 11); + public static final Field UNUSEDBIT_9_12 = Field.create("UNUSEDBIT_9_12", 0, FieldType.BIT, 12); + public static final Field UNUSEDBIT_9_13 = Field.create("UNUSEDBIT_9_13", 0, FieldType.BIT, 13); + public static final Field UNUSEDBIT_9_14 = Field.create("UNUSEDBIT_9_14", 0, FieldType.BIT, 14); + public static final Field UNUSEDBIT_9_15 = Field.create("UNUSEDBIT_9_15", 0, FieldType.BIT, 15); + public static final Field UNUSEDBIT_9_16 = Field.create("UNUSEDBIT_9_16", 0, FieldType.BIT, 16); + public static final Field UNUSEDBIT_9_17 = Field.create("UNUSEDBIT_9_17", 0, FieldType.BIT, 17); + public static final Field UNUSEDBIT_9_18 = Field.create("UNUSEDBIT_9_18", 0, FieldType.BIT, 18); + public static final Field UNUSEDBIT_9_19 = Field.create("UNUSEDBIT_9_19", 0, FieldType.BIT, 19); + public static final Field UNUSEDBIT_9_20 = Field.create("UNUSEDBIT_9_20", 0, FieldType.BIT, 20); + public static final Field UNUSEDBIT_9_21 = Field.create("UNUSEDBIT_9_21", 0, FieldType.BIT, 21); + public static final Field UNUSEDBIT_9_22 = Field.create("UNUSEDBIT_9_22", 0, FieldType.BIT, 22); + public static final Field UNUSEDBIT_9_23 = Field.create("UNUSEDBIT_9_23", 0, FieldType.BIT, 23); + public static final Field UNUSEDBIT_9_24 = Field.create("UNUSEDBIT_9_24", 0, FieldType.BIT, 24); + public static final Field UNUSEDBIT_9_25 = Field.create("UNUSEDBIT_9_25", 0, FieldType.BIT, 25); + public static final Field UNUSEDBIT_9_26 = Field.create("UNUSEDBIT_9_26", 0, FieldType.BIT, 26); + public static final Field UNUSEDBIT_9_27 = Field.create("UNUSEDBIT_9_27", 0, FieldType.BIT, 27); + public static final Field UNUSEDBIT_9_28 = Field.create("UNUSEDBIT_9_28", 0, FieldType.BIT, 28); + public static final Field UNUSEDBIT_9_29 = Field.create("UNUSEDBIT_9_29", 0, FieldType.BIT, 29); + public static final Field UNUSEDBIT_9_30 = Field.create("UNUSEDBIT_9_30", 0, FieldType.BIT, 30); + public static final Field UNUSEDBIT_9_31 = Field.create("UNUSEDBIT_9_31", 0, FieldType.BIT, 31); public static final Field LATEST_USAGE_AC_CONTROL = Field.create("LATEST_USAGE_AC_CONTROL", 4, FieldType.INT).setScale(1.0); public static final Field ACSWITCHLASTCHANGETIMEMS = Field.create("ACSWITCHLASTCHANGETIMEMS", 8, FieldType.INT).setScale(1.0); public static final Field[] VALUES = { @@ -430,30 +430,30 @@ public class AcControl { ENGINETOOHOT, TPSTOOHIGH, ISDISABLEDBYLUA, - UNUSEDBIT_8_8, - UNUSEDBIT_8_9, - UNUSEDBIT_8_10, - UNUSEDBIT_8_11, - UNUSEDBIT_8_12, - UNUSEDBIT_8_13, - UNUSEDBIT_8_14, - UNUSEDBIT_8_15, - UNUSEDBIT_8_16, - UNUSEDBIT_8_17, - UNUSEDBIT_8_18, - UNUSEDBIT_8_19, - UNUSEDBIT_8_20, - UNUSEDBIT_8_21, - UNUSEDBIT_8_22, - UNUSEDBIT_8_23, - UNUSEDBIT_8_24, - UNUSEDBIT_8_25, - UNUSEDBIT_8_26, - UNUSEDBIT_8_27, - UNUSEDBIT_8_28, - UNUSEDBIT_8_29, - UNUSEDBIT_8_30, - UNUSEDBIT_8_31, + ACCOMPRESSORSTATE, + UNUSEDBIT_9_9, + UNUSEDBIT_9_10, + UNUSEDBIT_9_11, + UNUSEDBIT_9_12, + UNUSEDBIT_9_13, + UNUSEDBIT_9_14, + UNUSEDBIT_9_15, + UNUSEDBIT_9_16, + UNUSEDBIT_9_17, + UNUSEDBIT_9_18, + UNUSEDBIT_9_19, + UNUSEDBIT_9_20, + UNUSEDBIT_9_21, + UNUSEDBIT_9_22, + UNUSEDBIT_9_23, + UNUSEDBIT_9_24, + UNUSEDBIT_9_25, + UNUSEDBIT_9_26, + UNUSEDBIT_9_27, + UNUSEDBIT_9_28, + UNUSEDBIT_9_29, + UNUSEDBIT_9_30, + UNUSEDBIT_9_31, LATEST_USAGE_AC_CONTROL, ACSWITCHLASTCHANGETIMEMS, }; 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 959ea1e0b6..a5ffb5f844 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,12 +1,13 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 02:27:16 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 31 23:09:55 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class Fields { public static final int accelerometerSpiDevice_offset = 2060; + public static final int acDelay_offset = 3122; public static final int acFanPin_offset = 790; public static final int acFanPinMode_offset = 792; public static final int acIdleExtraOffset_offset = 725; @@ -1885,6 +1886,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 = 537105780; public static final int silentTriggerError_offset = 1360; public static final int skippedWheelOnCam_offset = 1360; public static final int slowAdcAlpha_offset = 1600; @@ -2379,7 +2381,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.31.all.3329553180"; + public static final String TS_SIGNATURE = "rusEFI 2022.09.01.all.537105780"; 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 = 1240; @@ -2418,7 +2420,7 @@ public class Fields { public static final int unused1130_offset = 1628; public static final int unused120b18_offset = 120; public static final int unused1740b2_offset = 1628; - public static final int unused4080_offset = 3122; + public static final int unused4080_offset = 3123; public static final int unused556_offset = 566; public static final int unused962_offset = 1040; public static final int unused_1484_bit_27_offset = 1372; @@ -3715,7 +3717,8 @@ public class Fields { public static final Field TRIGGERGAPOVERRIDETO18 = Field.create("TRIGGERGAPOVERRIDETO18", 3116, FieldType.FLOAT); public static final Field MAXCAMPHASERESOLVERPM = Field.create("MAXCAMPHASERESOLVERPM", 3120, FieldType.INT8).setScale(50.0); public static final Field DFCODELAY = Field.create("DFCODELAY", 3121, FieldType.INT8).setScale(0.1); - public static final Field UNUSED4080 = Field.create("UNUSED4080", 3122, FieldType.INT8).setScale(1.0); + public static final Field ACDELAY = Field.create("ACDELAY", 3122, FieldType.INT8).setScale(0.1); + public static final Field UNUSED4080 = Field.create("UNUSED4080", 3123, FieldType.INT8).setScale(1.0); public static final Field HPFPCAMLOBES = Field.create("HPFPCAMLOBES", 3132, FieldType.INT8).setScale(1.0); public static final String[] hpfp_cam_e = {"NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2"}; public static final Field HPFPCAM = Field.create("HPFPCAM", 3133, FieldType.INT8, hpfp_cam_e).setScale(1.0); @@ -5078,6 +5081,7 @@ public class Fields { TRIGGERGAPOVERRIDETO18, MAXCAMPHASERESOLVERPM, DFCODELAY, + ACDELAY, UNUSED4080, HPFPCAMLOBES, HPFPCAM,