rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#635

This commit is contained in:
rusefi 2018-12-25 10:33:28 -05:00
parent daed49dd12
commit 5b25174cc3
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
firmware/controllers/trigger/decoders/trigger_mazda.cpp
View File

@ -33,21 +33,21 @@ void initializeMazdaMiataNaShape(TriggerShape *s, bool useOnlyRisingEdgeForTrigg
/**
* http://rusefi.com/forum/viewtopic.php?f=3&t=729&p=12983#p12983
*/
s->addEvent720(useOnlyRisingEdgeForTrigger, 52.960405, T_SECONDARY, TV_RISE);
s->addEvent720(useOnlyRisingEdgeForTrigger, 122.635956, T_SECONDARY, TV_FALL);
s->addEvent720(52.960405, T_SECONDARY, TV_RISE);
s->addEvent720(122.635956, T_SECONDARY, TV_FALL);
s->addEvent720(useOnlyRisingEdgeForTrigger, 216.897031, T_PRIMARY, TV_RISE);
s->addEvent720(useOnlyRisingEdgeForTrigger, 232.640068, T_SECONDARY, TV_RISE);
s->addEvent720(useOnlyRisingEdgeForTrigger, 288.819688, T_PRIMARY, TV_FALL);
s->addEvent720(useOnlyRisingEdgeForTrigger, 302.646323, T_SECONDARY, TV_FALL);
s->addEvent720(216.897031, T_PRIMARY, TV_RISE);
s->addEvent720(232.640068, T_SECONDARY, TV_RISE);
s->addEvent720(288.819688, T_PRIMARY, TV_FALL);
s->addEvent720(302.646323, T_SECONDARY, TV_FALL);
s->addEvent720(useOnlyRisingEdgeForTrigger, 412.448056, T_SECONDARY, TV_RISE);
s->addEvent720(useOnlyRisingEdgeForTrigger, 482.816719, T_SECONDARY, TV_FALL);
s->addEvent720(412.448056, T_SECONDARY, TV_RISE);
s->addEvent720(482.816719, T_SECONDARY, TV_FALL);
s->addEvent720(useOnlyRisingEdgeForTrigger, 577.035495, T_PRIMARY, TV_RISE);
s->addEvent720(useOnlyRisingEdgeForTrigger, 592.878113, T_SECONDARY, TV_RISE);
s->addEvent720(useOnlyRisingEdgeForTrigger, 662.899708, T_SECONDARY, TV_FALL);
s->addEvent720(useOnlyRisingEdgeForTrigger, 720.0f, T_PRIMARY, TV_FALL);
s->addEvent720(577.035495, T_PRIMARY, TV_RISE);
s->addEvent720(592.878113, T_SECONDARY, TV_RISE);
s->addEvent720(662.899708, T_SECONDARY, TV_FALL);
s->addEvent720(720.0f, T_PRIMARY, TV_FALL);
s->useOnlyPrimaryForSync = true;
}

2
firmware/controllers/trigger/trigger_decoder.cpp
View File

@ -484,6 +484,8 @@ void TriggerShape::initializeTriggerShape(Logging *logger, bool useOnlyRisingEdg
shapeDefinitionError = false;
this->useOnlyRisingEdgeForTriggerTemp = useOnlyRisingEdgeForTrigger;
switch (triggerConfig->type) {
case TT_TOOTHED_WHEEL:

4
firmware/controllers/trigger/trigger_structure.cpp
View File

@ -311,8 +311,8 @@ void TriggerShape::addEvent2(angle_t angle, trigger_wheel_e const channelIndex,
addEvent(engineConfiguration->useOnlyRisingEdgeForTrigger, angle / getEngineCycle(operationMode), channelIndex, stateParam);
}
void TriggerShape::addEvent720(bool useOnlyRisingEdgeForTrigger, angle_t angle, trigger_wheel_e const channelIndex, trigger_value_e const stateParam) {
addEvent(useOnlyRisingEdgeForTrigger, angle / 720, channelIndex, stateParam);
void TriggerShape::addEvent720(angle_t angle, trigger_wheel_e const channelIndex, trigger_value_e const stateParam) {
addEvent(useOnlyRisingEdgeForTriggerTemp, angle / 720, channelIndex, stateParam);
}
// todo: the whole 'useOnlyRisingEdgeForTrigger' parameter and logic should not be here

4
firmware/controllers/trigger/trigger_structure.h
View File

@ -175,12 +175,14 @@ public:
*/
int privateTriggerDefinitionSize;
bool useOnlyRisingEdgeForTriggerTemp;
/* 0..1 angle range */
void addEvent(bool useOnlyRisingEdgeForTrigger, angle_t angle, trigger_wheel_e const channelIndex, trigger_value_e const state);
/* 0..720 angle range
* Deprecated?
*/
void addEvent720(bool useOnlyRisingEdgeForTrigger, angle_t angle, trigger_wheel_e const channelIndex, trigger_value_e const state);
void addEvent720(angle_t angle, trigger_wheel_e const channelIndex, trigger_value_e const state);
/* 0..720 angle range
* Deprecated?
*/