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

Fix for fuel pump priming never ending on 4g63 and Miata9905 patterns

This commit is contained in:
Josh Stewart 2017-09-16 16:45:40 +10:00
parent a1fa406cdd
commit 7d3ffa5941
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
speeduino/decoders.ino
View File

@ -640,7 +640,7 @@ void triggerSetup_4G63()
secondDerivEnabled = false;
decoderIsSequential = true;
MAX_STALL_TIME = 366667UL; //Minimum 50rpm based on the 110 degree tooth spacing
toothLastToothTime = micros(); //Set a startup value here to avoid filter errors when starting
if(initialisationComplete == false) { toothLastToothTime = micros(); } //Set a startup value here to avoid filter errors when starting. This MUST have the initi check to prevent the fuel pump just staying on all the time
//decoderIsLowRes = true;
//Note that these angles are for every rising and falling edge
@ -1358,7 +1358,7 @@ void triggerSetup_Miata9905()
decoderIsSequential = true;
triggerActualTeeth = 8;
secondaryToothCount = 0;
toothLastToothTime = micros(); //Set a startup value here to avoid filter errors when starting
if(initialisationComplete == false) { toothLastToothTime = micros(); } //Set a startup value here to avoid filter errors when starting. This MUST have the initi check to prevent the fuel pump just staying on all the time
toothLastMinusOneToothTime = 0;
//Note that these angles are for every rising and falling edge
@ -2302,7 +2302,7 @@ void triggerSetup_Harley()
secondDerivEnabled = false;
decoderIsSequential = false;
MAX_STALL_TIME = (3333UL * 60); //Minimum 50rpm. (3333uS is the time per degree at 50rpm)
toothLastToothTime = micros();
if(initialisationComplete == false) { toothLastToothTime = micros(); } //Set a startup value here to avoid filter errors when starting. This MUST have the initi check to prevent the fuel pump just staying on all the time
triggerFilterTime = 1500;
}

5
speeduino/utils.ino
View File

@ -270,7 +270,7 @@ void setPinMapping(byte boardID)
pinCoil1 = 39; //Pin for coil 1
pinCoil2 = 41; //Pin for coil 2
pinCoil3 = 35; //Pin for coil 3
pinCoil4 = 37; //Pin for coil 4
pinCoil4 = 33; //Pin for coil 4
pinCoil5 = 34; //Pin for coil 5 PLACEHOLDER value for now
pinTrigger = 19; //The CAS pin
pinTrigger2 = 18; //The Cam Sensor pin
@ -432,6 +432,7 @@ void setPinMapping(byte boardID)
}
//Setup any devices that are using selectable pins
if ( (configPage3.launchPin != 0) && (configPage3.launchPin < BOARD_NR_GPIO_PINS) ) { pinLaunch = configPage3.launchPin; }
if ( (configPage2.ignBypassPin != 0) && (configPage2.ignBypassPin < BOARD_NR_GPIO_PINS) ) { pinIgnBypass = configPage2.ignBypassPin; }
if ( (configPage1.tachoPin != 0) && (configPage1.tachoPin < BOARD_NR_GPIO_PINS) ) { pinTachOut = configPage1.tachoPin; }
@ -544,6 +545,7 @@ void initialiseTriggers()
{
byte triggerInterrupt = 0; // By default, use the first interrupt
byte triggerInterrupt2 = 1;
#if defined(CORE_AVR)
switch (pinTrigger) {
//Arduino Mega 2560 mapping
@ -587,6 +589,7 @@ void initialiseTriggers()
#else
triggerInterrupt2 = pinTrigger2;
#endif
pinMode(pinTrigger, INPUT);
pinMode(pinTrigger2, INPUT);
pinMode(pinTrigger3, INPUT);