WFT is wrong with MRE_miata_na6 config? operationMode complexity #898
more refactoring
This commit is contained in:
parent
f6971c2bea
commit
43962ccff0
|
@ -410,7 +410,7 @@ void TriggerShape::setSecondTriggerSynchronizationGap(float syncRatio) {
|
||||||
/**
|
/**
|
||||||
* External logger is needed because at this point our logger is not yet initialized
|
* External logger is needed because at this point our logger is not yet initialized
|
||||||
*/
|
*/
|
||||||
void TriggerShape::initializeTriggerShape(Logging *logger, operation_mode_e operationMode, bool useOnlyRisingEdgeForTrigger, const trigger_config_s *triggerConfig) {
|
void TriggerShape::initializeTriggerShape(Logging *logger, operation_mode_e ambiguousOperationMode, bool useOnlyRisingEdgeForTrigger, const trigger_config_s *triggerConfig) {
|
||||||
|
|
||||||
#if EFI_PROD_CODE
|
#if EFI_PROD_CODE
|
||||||
efiAssertVoid(CUSTOM_ERR_6641, getCurrentRemainingStack() > 256, "init t");
|
efiAssertVoid(CUSTOM_ERR_6641, getCurrentRemainingStack() > 256, "init t");
|
||||||
|
@ -425,7 +425,7 @@ void TriggerShape::initializeTriggerShape(Logging *logger, operation_mode_e oper
|
||||||
|
|
||||||
case TT_TOOTHED_WHEEL:
|
case TT_TOOTHED_WHEEL:
|
||||||
initializeSkippedToothTriggerShapeExt(this, triggerConfig->customTotalToothCount,
|
initializeSkippedToothTriggerShapeExt(this, triggerConfig->customTotalToothCount,
|
||||||
triggerConfig->customSkippedToothCount, operationMode);
|
triggerConfig->customSkippedToothCount, ambiguousOperationMode);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TT_MAZDA_MIATA_NA:
|
case TT_MAZDA_MIATA_NA:
|
||||||
|
@ -482,19 +482,19 @@ void TriggerShape::initializeTriggerShape(Logging *logger, operation_mode_e oper
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TT_ONE_PLUS_ONE:
|
case TT_ONE_PLUS_ONE:
|
||||||
configureOnePlusOne(this, operationMode);
|
configureOnePlusOne(this, ambiguousOperationMode);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TT_3_1_CAM:
|
case TT_3_1_CAM:
|
||||||
configure3_1_cam(this, operationMode);
|
configure3_1_cam(this, ambiguousOperationMode);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TT_ONE_PLUS_TOOTHED_WHEEL_60_2:
|
case TT_ONE_PLUS_TOOTHED_WHEEL_60_2:
|
||||||
configureOnePlus60_2(this, operationMode);
|
configureOnePlus60_2(this, ambiguousOperationMode);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TT_ONE:
|
case TT_ONE:
|
||||||
setToothedWheelConfiguration(this, 1, 0, operationMode);
|
setToothedWheelConfiguration(this, 1, 0, ambiguousOperationMode);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TT_MAZDA_SOHC_4:
|
case TT_MAZDA_SOHC_4:
|
||||||
|
@ -506,7 +506,7 @@ void TriggerShape::initializeTriggerShape(Logging *logger, operation_mode_e oper
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TT_TOOTHED_WHEEL_60_2:
|
case TT_TOOTHED_WHEEL_60_2:
|
||||||
setToothedWheelConfiguration(this, 60, 2, operationMode);
|
setToothedWheelConfiguration(this, 60, 2, ambiguousOperationMode);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TT_60_2_VW:
|
case TT_60_2_VW:
|
||||||
|
@ -514,7 +514,7 @@ void TriggerShape::initializeTriggerShape(Logging *logger, operation_mode_e oper
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TT_TOOTHED_WHEEL_36_1:
|
case TT_TOOTHED_WHEEL_36_1:
|
||||||
setToothedWheelConfiguration(this, 36, 1, operationMode);
|
setToothedWheelConfiguration(this, 36, 1, ambiguousOperationMode);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TT_HONDA_4_24_1:
|
case TT_HONDA_4_24_1:
|
||||||
|
|
|
@ -82,7 +82,7 @@ class TriggerState;
|
||||||
class TriggerShape {
|
class TriggerShape {
|
||||||
public:
|
public:
|
||||||
TriggerShape();
|
TriggerShape();
|
||||||
void initializeTriggerShape(Logging *logger, operation_mode_e operationMode,
|
void initializeTriggerShape(Logging *logger, operation_mode_e ambiguousOperationMode,
|
||||||
bool useOnlyRisingEdgeForTrigger, const trigger_config_s *triggerConfig);
|
bool useOnlyRisingEdgeForTrigger, const trigger_config_s *triggerConfig);
|
||||||
void findTriggerPosition(event_trigger_position_s *position,
|
void findTriggerPosition(event_trigger_position_s *position,
|
||||||
angle_t angleOffset DEFINE_CONFIG_PARAM(angle_t, globalTriggerAngleOffset));
|
angle_t angleOffset DEFINE_CONFIG_PARAM(angle_t, globalTriggerAngleOffset));
|
||||||
|
|
Loading…
Reference in New Issue