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

Enable secondary trigger on non-seq missing tooth when VVT is enabled. See #1213

This commit is contained in:
Josh Stewart 2024-05-29 13:27:53 +10:00
parent bff1beca5d
commit 0258f641ee
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
speeduino/decoders.cpp
View File

@ -479,7 +479,7 @@ void triggerSetup_missingTooth(void)
toothOneMinusOneTime = 0; toothOneMinusOneTime = 0;
MAX_STALL_TIME = ((MICROS_PER_DEG_1_RPM/50U) * triggerToothAngle * (configPage4.triggerMissingTeeth + 1U)); //Minimum 50rpm. (3333uS is the time per degree at 50rpm) MAX_STALL_TIME = ((MICROS_PER_DEG_1_RPM/50U) * triggerToothAngle * (configPage4.triggerMissingTeeth + 1U)); //Minimum 50rpm. (3333uS is the time per degree at 50rpm)
if( (configPage4.TrigSpeed == CRANK_SPEED) && ( (configPage4.sparkMode == IGN_MODE_SEQUENTIAL) || (configPage2.injLayout == INJ_SEQUENTIAL) ) ) { BIT_SET(decoderState, BIT_DECODER_HAS_SECONDARY); } if( (configPage4.TrigSpeed == CRANK_SPEED) && ( (configPage4.sparkMode == IGN_MODE_SEQUENTIAL) || (configPage2.injLayout == INJ_SEQUENTIAL) || (configPage6.vvtEnabled > 0)) ) { BIT_SET(decoderState, BIT_DECODER_HAS_SECONDARY); }
else { BIT_CLEAR(decoderState, BIT_DECODER_HAS_SECONDARY); } else { BIT_CLEAR(decoderState, BIT_DECODER_HAS_SECONDARY); }
#ifdef USE_LIBDIVIDE #ifdef USE_LIBDIVIDE
divTriggerToothAngle = libdivide::libdivide_s16_gen(triggerToothAngle); divTriggerToothAngle = libdivide::libdivide_s16_gen(triggerToothAngle);
@ -639,8 +639,9 @@ void triggerSec_missingTooth(void)
break; break;
case SEC_TRIGGER_POLL: case SEC_TRIGGER_POLL:
//Poll is effectively the same as SEC_TRIGGER_SINGLE, however we do not reset revolutionOne or change the filter //Poll is effectively the same as SEC_TRIGGER_SINGLE, however we do not reset revolutionOne
//We do still need to record the angle for VVT though //We do still need to record the angle for VVT though
triggerSecFilterTime = curGap2 >> 1; //Next secondary filter is half the current gap
triggerRecordVVT1Angle(); triggerRecordVVT1Angle();
break; break;