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

Refactor Trigger System #635

This commit is contained in:
rusefi 2019-02-03 00:40:25 -05:00
parent e33eaac860
commit 01dc48ec00
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,8 +20,7 @@
#include "trigger_mazda.h" #include "trigger_mazda.h"
// todo: remove useOnlyRisingEdgeForTrigger parameter from here see https://github.com/rusefi/rusefi/issues/635 void initializeMazdaMiataNaShape(TriggerShape *s) {
void initializeMazdaMiataNaShape(TriggerShape *s, bool useOnlyRisingEdgeForTrigger) {
s->initialize(FOUR_STROKE_CAM_SENSOR, true); s->initialize(FOUR_STROKE_CAM_SENSOR, true);
s->setTriggerSynchronizationGap2(1.4930 * 0.6f, 1.4930 * 1.3f); s->setTriggerSynchronizationGap2(1.4930 * 0.6f, 1.4930 * 1.3f);
s->useRiseEdge = false; s->useRiseEdge = false;

2
firmware/controllers/trigger/decoders/trigger_mazda.h
View File

@ -12,7 +12,7 @@
#define MIATA_NA_GAP 1.4930f #define MIATA_NA_GAP 1.4930f
void initializeMazdaMiataNaShape(TriggerShape *s, bool useOnlyRisingEdgeForTrigger); void initializeMazdaMiataNaShape(TriggerShape *s);
void initializeMazdaMiataNb1Shape(TriggerShape *s); void initializeMazdaMiataNb1Shape(TriggerShape *s);
void initializeMazdaMiataNb2Crank(TriggerShape *s); void initializeMazdaMiataNb2Crank(TriggerShape *s);
void initializeMazdaMiataVVtTestShape(TriggerShape *s); void initializeMazdaMiataVVtTestShape(TriggerShape *s);

6
firmware/controllers/trigger/decoders/trigger_structure.cpp
View File

@ -420,7 +420,7 @@ void TriggerShape::initializeTriggerShape(Logging *logger, operation_mode_e oper
break; break;
case TT_MAZDA_MIATA_NA: case TT_MAZDA_MIATA_NA:
initializeMazdaMiataNaShape(this, useOnlyRisingEdgeForTrigger); initializeMazdaMiataNaShape(this);
break; break;
case TT_MAZDA_MIATA_NB1: case TT_MAZDA_MIATA_NB1:
@ -592,6 +592,10 @@ void TriggerShape::initializeTriggerShape(Logging *logger, operation_mode_e oper
shapeDefinitionError = true; shapeDefinitionError = true;
warning(CUSTOM_ERR_NO_SHAPE, "initializeTriggerShape() not implemented: %d", triggerConfig->type); warning(CUSTOM_ERR_NO_SHAPE, "initializeTriggerShape() not implemented: %d", triggerConfig->type);
} }
/**
* Feb 2019 suggestion: it would be an improvement to remove 'expectedEventCount' logic from 'addEvent'
* and move it here, after all events were added.
*/
calculateExpectedEventCounts(useOnlyRisingEdgeForTrigger); calculateExpectedEventCounts(useOnlyRisingEdgeForTrigger);
version++; version++;