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

'triggerEventAngle' not really needed

This commit is contained in:
rusefi 2019-11-23 17:44:44 -05:00
parent 3bf29b6963
commit f0c4817e1b
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,7 +373,6 @@ void TriggerShape::findTriggerPosition(event_trigger_position_s *position,
}
position->triggerEventIndex = triggerEventIndex;
position->triggerEventAngle = triggerEventAngle;
position->angleOffsetFromTriggerEvent = angle - triggerEventAngle;
}

5
firmware/controllers/trigger/decoders/trigger_structure.h
View File

@ -47,11 +47,6 @@
class event_trigger_position_s {
public:
uint32_t triggerEventIndex = 0;
/**
* angle of that 'triggerEventIndex' event
* todo: Technically we can simply take angle of trigger event from trigger shape by 'triggerEventIndex'?
*/
angle_t triggerEventAngle = 0;
angle_t angleOffsetFromTriggerEvent = 0;
};

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

@ -283,7 +283,7 @@ static ALWAYS_INLINE void handleSparkEvent(bool limitedSpark, uint32_t trgEventI
#if EFI_UNIT_TEST
if (verboseMode) {
printf("spark dwell@ %d/%d spark@ %d/%d id=%d\r\n", iEvent->dwellPosition.triggerEventIndex, (int)iEvent->dwellPosition.angleOffsetFromTriggerEvent,
iEvent->sparkPosition.triggerEventAngle, (int)iEvent->sparkPosition.angleOffsetFromTriggerEvent,
iEvent->sparkPosition.triggerEventIndex, (int)iEvent->sparkPosition.angleOffsetFromTriggerEvent,
iEvent->sparkId);
}
#endif

2
unit_tests/tests/test_trigger_decoder.cpp
View File

@ -351,7 +351,7 @@ TEST(misc, testRpmCalculator) {
assertEqualsM("fuel #2", 4.5450, engine->injectionDuration);
assertEqualsM("one degree", 111.1111, engine->rpmCalculator.oneDegreeUs);
ASSERT_EQ( 1, ilist->isReady) << "size #2";
ASSERT_EQ( 0, ilist->elements[0].dwellPosition.triggerEventAngle) << "dwell angle";
ASSERT_EQ( 0, ilist->elements[0].dwellPosition.triggerEventIndex) << "dwell @ index";
assertEqualsM("dwell offset", 8.5, ilist->elements[0].dwellPosition.angleOffsetFromTriggerEvent);
ASSERT_EQ( 0, eth.engine.triggerCentral.triggerState.getCurrentIndex()) << "index #2";