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

NB2 trigger shape does not seem to match JimStim #2980 

only first steps of unit test
This commit is contained in:
Andrey 2021-07-17 17:47:13 -04:00
parent 98b90f32d4
commit c9360448cc
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,7 +366,7 @@ void TriggerWaveform::setTriggerSynchronizationGap3(int gapIndex, float syncRati
/** /**
* this method is only used on initialization * this method is only used on initialization
*/ */
uint16_t TriggerWaveform::findAngleIndex(TriggerFormDetails *details, float target) const { uint16_t TriggerWaveform::findAngleIndex(TriggerFormDetails *details, angle_t targetAngle) const {
size_t engineCycleEventCount = getLength(); size_t engineCycleEventCount = getLength();
efiAssert(CUSTOM_ERR_ASSERT, engineCycleEventCount != 0 && engineCycleEventCount <= 0xFFFF, "engineCycleEventCount", 0); efiAssert(CUSTOM_ERR_ASSERT, engineCycleEventCount != 0 && engineCycleEventCount <= 0xFFFF, "engineCycleEventCount", 0);
@ -382,9 +382,9 @@ uint16_t TriggerWaveform::findAngleIndex(TriggerFormDetails *details, float targ
int middle = (left + right) / 2; int middle = (left + right) / 2;
angle_t eventAngle = details->eventAngles[middle]; angle_t eventAngle = details->eventAngles[middle];
if (eventAngle < target) { if (eventAngle < targetAngle) {
left = middle + 1; left = middle + 1;
} else if (eventAngle > target) { } else if (eventAngle > targetAngle) {
right = middle - 1; right = middle - 1;
} else { } else {
// Values are equal // Values are equal

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

@ -276,10 +276,11 @@ public:
const trigger_config_s& triggerConfig const trigger_config_s& triggerConfig
); );
uint16_t findAngleIndex(TriggerFormDetails *details, angle_t angle) const;
private: private:
trigger_shape_helper h; trigger_shape_helper h;
uint16_t findAngleIndex(TriggerFormDetails *details, float angle) const;
/** /**
* Working buffer for 'wave' instance * Working buffer for 'wave' instance

12
unit_tests/tests/trigger/test_symmetrical_crank.cpp
View File

@ -14,6 +14,18 @@ static void postFourEvents(EngineTestHelper *eth, float mult) {
eth->fireRise(mult * 16); eth->fireRise(mult * 16);
} }
TEST(engine, testAngleLogicInSymmetricalCrankIssue2980) {
WITH_ENGINE_TEST_HELPER(MAZDA_MIATA_2003);
TriggerFormDetails *triggerForm = &ENGINE(triggerCentral.triggerFormDetails);
TriggerWaveform * form = &ENGINE(triggerCentral.triggerShape);
ASSERT_EQ(form->findAngleIndex(triggerForm, 10), 1);
ASSERT_EQ(form->findAngleIndex(triggerForm, 310), 5);
ASSERT_EQ(form->findAngleIndex(triggerForm, 710), 15);
}
TEST(engine, testSymmetricalCrank) { TEST(engine, testSymmetricalCrank) {
WITH_ENGINE_TEST_HELPER(MAZDA_MIATA_2003); WITH_ENGINE_TEST_HELPER(MAZDA_MIATA_2003);