From 7b4a5c9be613a62bcfb819cc447c774eaad908bc Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 9 Sep 2022 17:52:54 -0400 Subject: [PATCH] vvtBooleanForVerySpecialCases, tempBooleanForVerySpecialLogic --- .../algo/engine_configuration_generated_structures.h | 2 +- .../cypress/config/controllers/algo/rusefi_generated.h | 2 +- .../algo/engine_configuration_generated_structures.h | 2 +- .../kinetis/config/controllers/algo/rusefi_generated.h | 2 +- .../algo/engine_configuration_generated_structures.h | 2 +- .../config/controllers/algo/rusefi_generated.h | 2 +- .../generated/engine_configuration_generated_structures.h | 2 +- firmware/controllers/generated/rusefi_generated.h | 2 +- .../controllers/lua/generated/value_lookup_generated.cpp | 8 ++++---- firmware/controllers/trigger/trigger_central.cpp | 2 +- firmware/integration/rusefi_config.txt | 4 ++-- firmware/tunerstudio/rusefi.input | 3 ++- 12 files changed, 17 insertions(+), 16 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 091c30471d..049e168643 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 @@ -2152,7 +2152,7 @@ struct engine_configuration_s { bool stftIgnoreErrorMagnitude : 1 {}; /** offset 960 bit 11 */ - bool tempBooleanForVerySpecialCases : 1 {}; + bool vvtBooleanForVerySpecialCases : 1 {}; /** offset 960 bit 12 */ bool enableSoftwareKnock : 1 {}; 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 e86e30245f..d7a2accdc6 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -2119,7 +2119,7 @@ #define tcuSolenoidTable_offset 17432 #define tcuUpshiftButtonPin_offset 1536 #define tcuUpshiftButtonPinMode_offset 2950 -#define tempBooleanForVerySpecialCases_offset 960 +#define vvtBooleanForVerySpecialCases_offset 960 #define test557pin_offset 846 #define thermistor_conf_s_size 28 #define ThermistorConf_size 32 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 e38fbafc3e..9f8d2ebc6d 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 @@ -2152,7 +2152,7 @@ struct engine_configuration_s { bool stftIgnoreErrorMagnitude : 1 {}; /** offset 960 bit 11 */ - bool tempBooleanForVerySpecialCases : 1 {}; + bool vvtBooleanForVerySpecialCases : 1 {}; /** offset 960 bit 12 */ bool enableSoftwareKnock : 1 {}; 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 bca673bba5..94e8c1d9ef 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -2119,7 +2119,7 @@ #define tcuSolenoidTable_offset 17432 #define tcuUpshiftButtonPin_offset 1536 #define tcuUpshiftButtonPinMode_offset 2950 -#define tempBooleanForVerySpecialCases_offset 960 +#define vvtBooleanForVerySpecialCases_offset 960 #define test557pin_offset 846 #define thermistor_conf_s_size 28 #define ThermistorConf_size 32 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 11e6e7cb31..830253fa6e 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 @@ -2152,7 +2152,7 @@ struct engine_configuration_s { bool stftIgnoreErrorMagnitude : 1 {}; /** offset 960 bit 11 */ - bool tempBooleanForVerySpecialCases : 1 {}; + bool vvtBooleanForVerySpecialCases : 1 {}; /** offset 960 bit 12 */ bool enableSoftwareKnock : 1 {}; 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 fc94b538b2..f383cad069 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 @@ -2086,7 +2086,7 @@ #define tcuSolenoidTable_offset 17432 #define tcuUpshiftButtonPin_offset 1536 #define tcuUpshiftButtonPinMode_offset 2950 -#define tempBooleanForVerySpecialCases_offset 960 +#define vvtBooleanForVerySpecialCases_offset 960 #define test557pin_offset 846 #define thermistor_conf_s_size 28 #define ThermistorConf_size 32 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index f6bdac37a4..dabc4aad37 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -2152,7 +2152,7 @@ struct engine_configuration_s { bool stftIgnoreErrorMagnitude : 1 {}; /** offset 960 bit 11 */ - bool tempBooleanForVerySpecialCases : 1 {}; + bool vvtBooleanForVerySpecialCases : 1 {}; /** offset 960 bit 12 */ bool enableSoftwareKnock : 1 {}; diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 7456ac7b83..ee8ece38c4 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -2119,7 +2119,7 @@ #define tcuSolenoidTable_offset 17432 #define tcuUpshiftButtonPin_offset 1536 #define tcuUpshiftButtonPinMode_offset 2950 -#define tempBooleanForVerySpecialCases_offset 960 +#define vvtBooleanForVerySpecialCases_offset 960 #define test557pin_offset 846 #define thermistor_conf_s_size 28 #define ThermistorConf_size 32 diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index 844d9d8d53..1297809b05 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -442,8 +442,8 @@ float getConfigValueByName(const char *name) { return engineConfiguration->showHumanReadableWarning; if (strEqualCaseInsensitive(name, "stftIgnoreErrorMagnitude")) return engineConfiguration->stftIgnoreErrorMagnitude; - if (strEqualCaseInsensitive(name, "tempBooleanForVerySpecialCases")) - return engineConfiguration->tempBooleanForVerySpecialCases; + if (strEqualCaseInsensitive(name, "vvtBooleanForVerySpecialCases")) + return engineConfiguration->vvtBooleanForVerySpecialCases; if (strEqualCaseInsensitive(name, "enableSoftwareKnock")) return engineConfiguration->enableSoftwareKnock; if (strEqualCaseInsensitive(name, "verboseVVTDecoding")) @@ -1570,9 +1570,9 @@ void setConfigValueByName(const char *name, float value) { engineConfiguration->stftIgnoreErrorMagnitude = (int)value; return; } - if (strEqualCaseInsensitive(name, "tempBooleanForVerySpecialCases")) + if (strEqualCaseInsensitive(name, "vvtBooleanForVerySpecialCases")) { - engineConfiguration->tempBooleanForVerySpecialCases = (int)value; + engineConfiguration->vvtBooleanForVerySpecialCases = (int)value; return; } if (strEqualCaseInsensitive(name, "enableSoftwareKnock")) diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 96fad0b10c..a409db6324 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -180,7 +180,7 @@ static angle_t adjustCrankPhase(int camIndex) { case VVT_MAZDA_SKYACTIV: case VVT_MITSUBISHI_3A92: case VVT_MITSUBISHI_6G75: - return syncAndReport(tc, getCrankDivider(operationMode), engineConfiguration->tempBooleanForVerySpecialCases ? 1 : 0); + return syncAndReport(tc, getCrankDivider(operationMode), engineConfiguration->vvtBooleanForVerySpecialCases ? 1 : 0); case VVT_HONDA_K: firmwareError(OBD_PCM_Processor_Fault, "Undecided on VVT phase of %s", getVvt_mode_e(vvtMode)); return 0; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index c29c95c88f..4c7bb961ab 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -908,7 +908,7 @@ custom maf_sensor_type_e 1 bits, S08, @OFFSET@, [0:1], @@maf_sensor_type_e_enum@ bit enableInnovateLC2 bit showHumanReadableWarning bit stftIgnoreErrorMagnitude;+If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor. - bit tempBooleanForVerySpecialCases + bit vvtBooleanForVerySpecialCases bit enableSoftwareKnock bit verboseVVTDecoding;Verbose info in console below engineSnifferRpmThreshold\nenable vvt_details bit invertCamVVTSignal;get invertCamVVTSignal @@ -1074,7 +1074,7 @@ bit unused_1484_bit_27 bit unused_1484_bit_38 bit unused_1484_bit_29 bit unused_1484_bit_30 -bit unused_1484_bit_31 +bit tempBooleanForVerySpecialLogic uint32_t engineChartSize;;"count", 1, 0, 0, 300, 0 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 343d7e8038..58b35429cf 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -3929,7 +3929,8 @@ dialog = tcuControls, "Transmission Settings" field = useEeprom, useEeprom field = "disablePrimaryUart", disablePrimaryUart field = "#System hacks" - field = "tempBooleanForVerySpecialCases", tempBooleanForVerySpecialCases + field = "vvtBooleanForVerySpecialCases", vvtBooleanForVerySpecialCases + field = tempBooleanForVerySpecialLogic, tempBooleanForVerySpecialLogic field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning