This commit is contained in:
Andrey 2022-11-16 15:23:42 -05:00
parent 6ca9b6eda7
commit 99edf9484a
2 changed files with 11 additions and 10 deletions

View File

@ -218,7 +218,7 @@ void TriggerWaveform::calculateExpectedEventCounts() {
}
/**
* Deprecated! many usages should be replaced by addEvent360
* See header for documentation
*/
void TriggerWaveform::addEvent720(angle_t angle, TriggerValue const state, TriggerWheel const channelIndex) {
addEvent(angle / FOUR_STROKE_CYCLE_DURATION, state, channelIndex);
@ -229,18 +229,10 @@ void TriggerWaveform::addEvent360(angle_t angle, TriggerValue const state, Trigg
addEvent(CRANK_MODE_MULTIPLIER * angle / FOUR_STROKE_CYCLE_DURATION, state, channelIndex);
}
/**
* This version of the method is best when same wheel could be mounted either on crank or cam
*
* @param angle 0 to 360 or 0 to 720 depending on configuration
*/
void TriggerWaveform::addEventAngle(angle_t angle, TriggerValue const state, TriggerWheel const channelIndex) {
addEvent(angle / getCycleDuration(), state, channelIndex);
}
/**
* @param angle [0,1)
*/
void TriggerWaveform::addEvent(angle_t angle, TriggerValue const state, TriggerWheel const channelIndex) {
efiAssertVoid(CUSTOM_OMODE_UNDEF, operationMode != OM_NONE, "operationMode not set");
@ -636,6 +628,9 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e triggerOperatio
break;
case TT_BENELLI:
configureBenelli(this);
break;
case UNUSED_29:
case UNUSED_34:
case TT_1_16:

View File

@ -170,7 +170,9 @@ public:
bool isRiseEvent[PWM_PHASE_MAX_COUNT];
/* (0..1] angle range */
/**
* @param angle (0..1]
*/
void addEvent(angle_t angle, TriggerValue const state, TriggerWheel const channelIndex = TriggerWheel::T_PRIMARY);
/* (0..720] angle range
* Deprecated! many usages should be replaced by addEvent360
@ -183,11 +185,15 @@ public:
void addEvent360(angle_t angle, TriggerValue const state, TriggerWheel const channelIndex = TriggerWheel::T_PRIMARY);
/**
* This version of the method is best when same wheel could be mounted either on crank or cam
*
* This version of 'addEvent...' family considers the angle duration of operationMode in this trigger
* For example, (0..180] for FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR
*
* TODO: one day kill all usages with FOUR_STROKE_CAM_SENSOR 720 cycle and add runtime prohibition
* TODO: for FOUR_STROKE_CAM_SENSOR addEvent360 is the way to go
*
* @param angle (0..360] or (0..720] depending on configuration
*/
void addEventAngle(angle_t angle, TriggerValue const state, TriggerWheel const channelIndex = TriggerWheel::T_PRIMARY);