This commit is contained in:
Matthew Kennedy 2021-07-23 05:31:23 -07:00 committed by GitHub
parent 9266b1548c
commit 2368e90ae7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 10 deletions

View File

@ -489,8 +489,6 @@ case CUSTOM_ICU_DRIVER_STATE:
return "CUSTOM_ICU_DRIVER_STATE"; return "CUSTOM_ICU_DRIVER_STATE";
case CUSTOM_IDLE_WAVE_CNT: case CUSTOM_IDLE_WAVE_CNT:
return "CUSTOM_IDLE_WAVE_CNT"; return "CUSTOM_IDLE_WAVE_CNT";
case CUSTOM_IGN_MATH_STATE:
return "CUSTOM_IGN_MATH_STATE";
case CUSTOM_IH_STACK: case CUSTOM_IH_STACK:
return "CUSTOM_IH_STACK"; return "CUSTOM_IH_STACK";
case CUSTOM_INJ_DURATION: case CUSTOM_INJ_DURATION:

View File

@ -1982,7 +1982,7 @@ typedef enum {
CUSTOM_ERR_6628 = 6628, CUSTOM_ERR_6628 = 6628,
CUSTOM_STACK_6629 = 6629, CUSTOM_STACK_6629 = 6629,
CUSTOM_IGN_MATH_STATE = 6630, CUSTOM_ERR_6030 = 6630,
CUSTOM_ERR_6631 = 6631, CUSTOM_ERR_6631 = 6631,
CUSTOM_ERR_6632 = 6632, CUSTOM_ERR_6632 = 6632,
CUSTOM_ANGLE_NAN = 6633, CUSTOM_ANGLE_NAN = 6633,

View File

@ -231,10 +231,6 @@ static void doPeriodicSlowCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
} }
} }
// for performance reasons this assertion related to mainTriggerCallback should better be here
efiAssertVoid(CUSTOM_IGN_MATH_STATE, !CONFIG(useOnlyRisingEdgeForTrigger) || CONFIG(ignMathCalculateAtIndex) % 2 == 0, "invalid ignMathCalculateAtIndex");
/** /**
* Update engine RPM state if needed (check timeouts). * Update engine RPM state if needed (check timeouts).
*/ */

View File

@ -447,7 +447,7 @@ void mainTriggerCallback(uint32_t trgEventIndex, efitick_t edgeTimestamp DECLARE
} }
} }
if (trgEventIndex == (uint32_t)CONFIG(ignMathCalculateAtIndex)) { if (trgEventIndex == 0) {
if (isAdcChannelValid(CONFIG(externalKnockSenseAdc))) { if (isAdcChannelValid(CONFIG(externalKnockSenseAdc))) {
float externalKnockValue = getVoltageDivided("knock", engineConfiguration->externalKnockSenseAdc PASS_ENGINE_PARAMETER_SUFFIX); float externalKnockValue = getVoltageDivided("knock", engineConfiguration->externalKnockSenseAdc PASS_ENGINE_PARAMETER_SUFFIX);
engine->knockLogic(externalKnockValue PASS_ENGINE_PARAMETER_SUFFIX); engine->knockLogic(externalKnockValue PASS_ENGINE_PARAMETER_SUFFIX);

View File

@ -1157,7 +1157,7 @@ bit unused_1484_bit_31
int16_t primeInjFalloffTemperature;+This sets the temperature above which no priming pulse is used, The value at -40 is reduced until there is no more priming injection at this temperature.;"*C", 1, 0, 0, 1000, 0 int16_t primeInjFalloffTemperature;+This sets the temperature above which no priming pulse is used, The value at -40 is reduced until there is no more priming injection at this temperature.;"*C", 1, 0, 0, 1000, 0
int ignMathCalculateAtIndex;+At what trigger index should some ignition-related math be executed? This is a performance trick to reduce load on synchronization trigger callback.;"index", 1, 0, 0, 7000, 0 int unused1488;;"index", 1, 0, 0, 7000, 0
brain_pin_e[CAM_INPUTS_COUNT iterate] camInputsDebug; brain_pin_e[CAM_INPUTS_COUNT iterate] camInputsDebug;
uint8_t[CAM_INPUTS_COUNT_padding] camInputsDebugPadding;; uint8_t[CAM_INPUTS_COUNT_padding] camInputsDebugPadding;;

View File

@ -3627,7 +3627,6 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
dialog = parkingLot, "Experimental/Broken" dialog = parkingLot, "Experimental/Broken"
field = "#System hacks" field = "#System hacks"
field = "Global fuel correction", globalFuelCorrection field = "Global fuel correction", globalFuelCorrection
field = "Ignition Math Logic @", ignMathCalculateAtIndex
field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex
field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning
field = "Warning Message", warning_message field = "Warning Message", warning_message