Completed non-360 degree decoder

decoders.ino

@@ -1198,7 +1198,7 @@ Note: There can be no missing teeth on the primary wheel
 */
 void triggerSetup_non360()
 {
-  triggerToothAngle = 360 / configPage2.triggerTeeth; //The number of degrees that passes from tooth to tooth
+  triggerToothAngle = (360 * configPage2.TrigAngMul) / configPage2.triggerTeeth; //The number of degrees that passes from tooth to tooth multiplied by the additional multiplier
   toothCurrentCount = 255; //Default value
   triggerFilterTime = (int)(1000000 / (MAX_RPM / 60 * configPage2.triggerTeeth)); //Trigger filter time is the shortest possible time (in uS) that there can be between crank teeth (ie at max RPM). Any pulses that occur faster than this time will be disgarded as noise
   triggerSecFilterTime = (int)(1000000 / (MAX_RPM / 60 * 2)) / 2; //Same as above, but fixed at 2 teeth on the secondary input and divided by 2 (for cam speed)
@@ -1210,47 +1210,12 @@ void triggerSetup_non360()
 
 void triggerPri_non360()
 { 
-   curTime = micros();
+  //This is not used, the trigger is identical to the dual wheel one, so that is used instead.
-   curGap = curTime - toothLastToothTime;
-   if ( curGap < triggerFilterTime ) { return; } //Pulses should never be less than triggerFilterTime, so if they are it means a false trigger.
-   toothCurrentCount++; //Increment the tooth counter
-   addToothLogEntry(curGap);
-
-   toothLastMinusOneToothTime = toothLastToothTime;
-   toothLastToothTime = curTime;
-   
-   if ( !currentStatus.hasSync ) { return; }
-   
-   if ( toothCurrentCount == 1 || toothCurrentCount > configPage2.triggerTeeth )
-   { 
-     toothCurrentCount = 1; 
-     toothOneMinusOneTime = toothOneTime;
-     toothOneTime = curTime;
-     startRevolutions++; //Counter
-     //if ((startRevolutions & 63) == 1) { currentStatus.hasSync = false; } //Every 64 revolutions, force a resync with the cam
-   }
-
-   setFilter(curGap); //Recalc the new filter value
-   
-
 }
 
 void triggerSec_non360()
 { 
-  curTime2 = micros();
+  //This is not used, the trigger is identical to the dual wheel one, so that is used instead.
-  curGap2 = curTime2 - toothLastSecToothTime;
-  if ( curGap2 < triggerSecFilterTime ) { return; } 
-  toothLastSecToothTime = curTime2;
-  
-  if(!currentStatus.hasSync)
-  {
-    toothCurrentCount = 0;
-
-    toothLastToothTime = micros();
-    toothLastMinusOneToothTime = (toothOneTime - 6000000) / configPage2.triggerTeeth; //Fixes RPM at 10rpm until a full revolution has taken place
-    
-    currentStatus.hasSync = true;
-  }
 } 
 
 int getRPM_non360()
@@ -1273,14 +1238,16 @@ int getCrankAngle_non360(int timePerDegree)
     
     //Handle case where the secondary tooth was the last one seen
     if(tempToothCurrentCount == 0) { tempToothCurrentCount = configPage2.triggerTeeth; }
+
+    //Number of teeth that have passed since tooth 1, multiplied by the angle each tooth represents, plus the angle that tooth 1 is ATDC. This gives accuracy only to the nearest tooth.
+    int crankAngle = (tempToothCurrentCount - 1) * triggerToothAngle;
+    crankAngle = (crankAngle / configPage2.TrigAngMul) + configPage2.triggerAngle; //Have to divide by the multiplier to get back to actual crank angle. 
     
-    int crankAngle = (tempToothCurrentCount - 1) * triggerToothAngle + configPage2.triggerAngle; //Number of teeth that have passed since tooth 1, multiplied by the angle each tooth represents, plus the angle that tooth 1 is ATDC. This gives accuracy only to the nearest tooth.
     //Estimate the number of degrees travelled since the last tooth}
     long elapsedTime = micros() - tempToothLastToothTime;
     if(elapsedTime < SHRT_MAX ) { crankAngle += div((int)elapsedTime, timePerDegree).quot; } //This option is much faster, but only available for smaller values of elapsedTime
     else { crankAngle += ldiv(elapsedTime, timePerDegree).quot; }
     
-    
     if (crankAngle >= 720) { crankAngle -= 720; } 
     if (crankAngle > CRANK_ANGLE_MAX) { crankAngle -= CRANK_ANGLE_MAX; }
     if (crankAngle < 0) { crankAngle += 360; }

reference/speeduino.ini

@@ -234,7 +234,7 @@ page = 4
       TrigAng    = scalar, S16,      0,         "Deg",       1,        0,     -360,     360,        0
       FixAng     = scalar, U08,      2,         "Deg",       1,        0,     0,   80,         0
       CrankAng   = scalar, U08,      3,         "Deg",       1,        0,   -10,   80,         0
-      TrigAngMul = scalar, U08,      4,         "",          1,        0,     0,     100,        0 ; Multiplier for tooth counts that don't evenly divide into 360
+      TrigAngMul = scalar, U08,      4,         "",          1,        0,     0,     88,        0 ; Multiplier for tooth counts that don't evenly divide into 360
       TrigEdge   = bits,   U08,      5[0:0],    "Leading", "Trailing"
       TrigSpeed  = bits,   U08,      5[1:1],    "Crank Speed", "Cam Speed"
       IgInv      = bits,   U08,      5[2:2],    "Going Low",        "Going High"

speeduino.ino

@@ -427,13 +427,13 @@ void setup()
 
     case 11:
       triggerSetup_non360();
-      trigger = triggerPri_non360;
+      trigger = triggerPri_DualWheel; //Is identical to the dual wheel decoder, so that is used. Same goes for the secondary below
       getRPM = getRPM_non360;
       getCrankAngle = getCrankAngle_non360;
       
       if(configPage2.TrigEdge == 0) { attachInterrupt(triggerInterrupt, trigger, RISING); } // Attach the crank trigger wheel interrupt (Hall sensor drags to ground when triggering)
-      else { attachInterrupt(triggerInterrupt, trigger, FALLING); } // Primary trigger connects to 
+      else { attachInterrupt(triggerInterrupt, trigger, FALLING); } 
-      attachInterrupt(triggerInterrupt2, triggerSec_non360, FALLING);
+      attachInterrupt(triggerInterrupt2, triggerSec_DualWheel, FALLING); //Note the use of the Dual Wheel trigger function here. No point in having the same code in twice. 
       break;
       
     default: