WebSVN – chibiosIgnition – Diff – /trunk/src/timer2.c

 #include "ch.h"  // needs for all ChibiOS programs
 #include "hal.h" // hardware abstraction layer header
 #include "timer2.h"
-#define  MICROSECS_PULSE 1
+#define  MICROSECS_PULSE 4
 // with a dwell angle of 45 degrees , 4 cylinders and a maximum RPM of 5000
 // freq = 5000/60 * 2 = 166Hz. Because the breaker might bounce , we accept the
 // first pulse longer than 1/300 of a second as being a proper closure .
 // the TIM2 counter counts in 1uS increments,
 #define BREAKER_COUNT_MIN (1E6/(MICROSECS_PULSE * 300))
 #define COUNT_FROM_RPM(RPM) ((1E6/(MICROSECS_PULSE * 30 / (RPM ) )))
 int16_t nominal = 0;
 uint16_t halfRot;
 int16_t phase10 = 100; // 10 degrees
 volatile uint16_t sampleVar;
 volatile uint16_t sampleRef;
 volatile uint16_t lastSampleRef = 0;
 volatile uint8_t refCount = 0;
 volatile uint8_t varCount = 0;
-volatile uint16_t samplePeriod = 0 ;
+volatile uint16_t samplePeriod = 0;
 static signed phaseSamp = 0;
 static uint8_t validPhaseSamp = 0;
-int gainControl = 1000 ;
+int gainControl = 1000;
 uint16_t rpm;
 signed count;
 signed delta;
+void
-void recalcPhase()
+recalcPhase ()
+{
-        nominal = halfRot * (long) (phase10)/ 3600;
+  nominal = halfRot * (long) (phase10) / 3600;
+}
+void
-void adjustRPM(void)
+adjustRPM (void)
+{
-        if(rpm < 600)
+  if (rpm < 600)
-                rpm = 600;
+    rpm = 600;
-        if(rpm >  5000)
+  if (rpm > 5000)
-                rpm = 5000;
+    rpm = 5000;
+}
+uint16_t
-uint16_t setRPM(uint16_t rpm_ )
+setRPM (uint16_t rpm_)
+{
-        if(rpm_ >= 600 && rpm_ < 6000)
+  if (rpm_ >= 600 && rpm_ < 6000)
-        {
+    {
-          rpm = rpm_;
+      rpm = rpm_;
-          adjustRPM();
+      adjustRPM ();
-        }
+    }
-          return halfRot;
+  return halfRot;
+}
+uint16_t
-uint16_t getRPM(void)
+getRPM (void)
+{
-        return rpm;
+  return rpm;
+}
+signed
-signed getDelta(void)
+getDelta (void)
+{
-        return delta;
+  return delta;
+}
+signed
-signed getCount(void)
+getCount (void)
+{
-        return  count;
+  return count;
+}
+void
-void setGain(int gain)
+setGain (int gain)
+{
-        gainControl = gain;
+  gainControl = gain;
+}
+void
-void processPhase ( void )
+processPhase (void)
+{
-    // lpcl
+  // lpcl
-        chSysLock();
-        const signed pdClip = 10000;
+  const signed pdClip = 10000;
-        static signed pd;
+  static signed pd;
-        if(validPhaseSamp)
+  if (validPhaseSamp)
-        {
-         pd =   phaseSamp - nominal;
-     validPhaseSamp = 0;
-        if(pd > pdClip)
-        pd = pdClip;
-        if(pd < -pdClip)
-                pd = -pdClip;
-   }
+    {
-     chSysUnlock();
+      chSysLock ();
-     delta = pd;
-     static int sampleAverage = 0;
-     static int phaseAverage  = 0;
-     const int freqScale = 6;
-     const int phaseScale = 50;
-     sampleAverage = sampleAverage + (samplePeriod - sampleAverage/freqScale);
+      pd = phaseSamp - nominal;
+      validPhaseSamp = 0;
+      chSysUnlock ();
+      if (pd > pdClip)
+        pd = pdClip;
+      if (pd < -pdClip)
+        pd = -pdClip;
+    }
+  else
+    return;
+  delta = pd;
-     int32_t arr;
+  static int sampleAverage = 0;
+  static int phaseAverage = 0;
-   //   if(lock)
+  const int freqScale =  16;
+  const int periodScale= 4;  // 1/periodScale  of difference between period measured and average is added to period.
-       int intSample = sampleAverage / freqScale;
+  const int phaseScale = 50;
+  // measure sample period devi
+  sampleAverage = sampleAverage + (samplePeriod *freqScale  - sampleAverage) / periodScale;
+  int32_t arr;
-       int deltaPd= pd/ phaseScale;
+  //    if(lock)
+  int intSample = sampleAverage / freqScale;
-       if(deltaPd == 0)
-       {
-       if(pd > 0)
-           deltaPd =1;
+  int deltaPd = pd / phaseScale;
-       if(pd<  0)
+  if (deltaPd == 0)
+    {
-           deltaPd =-1;
+      if (pd > 0)
-       }
+        deltaPd = 1;
-           arr =  intSample + deltaPd;
+      if (pd < 0)
+        deltaPd = -1;
+    }
+  arr = intSample + deltaPd;
 // clamp values
+  if (arr > 65535)
+    arr = 65535;
+  if (arr < 1000)
+    arr = 1000;
-    if(arr > 65535)
-        arr = 65535;
-    if(arr < 1000)
-        arr = 1000;
-     count = arr;
+  count = arr;
-    TIM2->ARR = arr -1;
-    nominal = intSample * (long) (phase10)/ 3600;
+  TIM2->ARR = arr - 1;
-    float nomRPM = 30E6 / (MICROSECS_PULSE * arr);
+  nominal = intSample * (long) (phase10) / 3600;
-        rpm =  nomRPM ;
-        adjustRPM();
-    }
+  float nomRPM = 30E6 / (MICROSECS_PULSE * arr);
+  rpm = nomRPM;
+  adjustRPM ();
+}
 // set the timing advance from reference in 0.1 degrees units
+void
-void setAdvance(int16_t deg10)
+setAdvance (int16_t deg10)
+{
-    phase10 = deg10;
+  phase10 = deg10;
+}
 // specialist timer setup :
 // timer 2 is a reloading counter with a cycle period controlled by its ARR register.
 // Just before terminal count it produces a pulse of 200 microseconds using its CCR1 count compare register,
 // used to drive the strobe LED.
 // Timer 3 is then used to count the time of the reload of Timer 2 via its Trigger Out being selected as reload.
 // The time is latched in TIM3  CCR2
 // and ignition pulses are latched on TIM3 CCR1, to allow it to be used in a PLL.
 //
+void
-void initTimers()
+initTimers ()
+{
-        rccEnableTIM2(FALSE);
+  rccEnableTIM2 (FALSE);
-        rccResetTIM2();
+  rccResetTIM2 ();
-        TIM2->PSC = 72*MICROSECS_PULSE;
-        TIM2->ARR = 60000;
-        TIM2->CR1 = ~TIM_CR1_CKD  & (TIM_CR1_CEN |
-                        TIM_CR1_ARPE );
-        /// pulse width 200 uS
-        TIM2->CCR1 = 200/MICROSECS_PULSE;
-    TIM2->CCER =  TIM_CCER_CC1E | TIM_CCER_CC1P  ; //enabled and active high
-    TIM2->CCMR1 = TIM_CCMR1_OC1M_0 | TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2 |
-                           TIM_CCMR1_OC1PE ;
-    TIM2->CR2 = TIM_CR2_MMS_1 ; // trigger out is 010 = update
+  TIM2->PSC = 72 * MICROSECS_PULSE;
+  TIM2->ARR = 60000;
+  TIM2->CR1 = ~TIM_CR1_CKD & (TIM_CR1_CEN | TIM_CR1_ARPE);
-    rccEnableTIM3(FALSE);
+  /// pulse width 200 uS
-        rccResetTIM3();
-        // TIM3 on the PA6 ... pins : remap code 00
-        AFIO->MAPR &= ~ AFIO_MAPR_TIM3_REMAP;
+  TIM2->CCR1 = 200 / MICROSECS_PULSE;
-        TIM3->PSC = 72*MICROSECS_PULSE;
+  TIM2->CCER = TIM_CCER_CC1E | TIM_CCER_CC1P; //enabled and active high
-        TIM3->ARR = 0xFFFF;
+  TIM2->CCMR1 = TIM_CCMR1_OC1M_0 | TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2
+      | TIM_CCMR1_OC1PE;
-        TIM3->CCMR1 = TIM_CCMR1_CC1S_0 /* | TIM_CCMR1_IC1F_0 | TIM_CCMR1_IC1F_1 | TIM_CCMR1_IC1F_2 */ ;  // filter 16, input
+  TIM2->CR2 = TIM_CR2_MMS_1; // trigger out is 010 = update
+  rccEnableTIM3 (FALSE);
+  rccResetTIM3 ();
+  // TIM3 on the PA6 ... pins : remap code 00
+  AFIO->MAPR &= ~AFIO_MAPR_TIM3_REMAP;
-    // link TIM3 ITR2 to TIM2 reload
+  TIM3->PSC = 72 * MICROSECS_PULSE;
-    // use TS = 001 to make TRC from Tim2 TRIGGER
-        TIM3->SMCR  &= ~(TIM_SMCR_TS_Msk );
+  TIM3->ARR = 0xFFFF;
-        TIM3->SMCR  |=  TIM_SMCR_TS_0; // select ITR2 as trigger source TRC
+  TIM3->CCMR1 =
-    TIM3->CCMR1 |=  TIM_CCMR1_CC2S_1 |  TIM_CCMR1_CC2S_0 ; //  The CC2S bits are 11, use TRC
+      TIM_CCMR1_CC1S_0 /* | TIM_CCMR1_IC1F_0 | TIM_CCMR1_IC1F_1 | TIM_CCMR1_IC1F_2 */; // filter 16, input
+  // link TIM3 ITR2 to TIM2 reload
+  // use TS = 001 to make TRC from Tim2 TRIGGER
-        TIM3->CCER = TIM_CCER_CC1E | TIM_CCER_CC2E;
+  TIM3->SMCR &= ~(TIM_SMCR_TS_Msk);
+  TIM3->SMCR |= TIM_SMCR_TS_0; // select ITR2 as trigger source TRC
-        TIM3->CR1 = ~TIM_CR1_CKD  & (TIM_CR1_CEN | TIM_CR1_ARPE );
+  TIM3->CCMR1 |= TIM_CCMR1_CC2S_1 | TIM_CCMR1_CC2S_0; //  The CC2S bits are 11, use TRC
+  TIM3->CCER = TIM_CCER_CC1E | TIM_CCER_CC2E;
-    nvicEnableVector(TIM3_IRQn,
+  TIM3->CR1 = ~TIM_CR1_CKD & (TIM_CR1_CEN | TIM_CR1_ARPE);
-);
+  nvicEnableVector (TIM3_IRQn, 4);
-    TIM3->DIER |= TIM_DIER_CC1IE  | TIM_DIER_CC2IE;
+  TIM3->DIER |= TIM_DIER_CC1IE | TIM_DIER_CC2IE;
+}
 // timer 3 interrupt
+void
-void VectorB4(void)
+VectorB4 (void)
+{
-        if(TIM3->SR & TIM_SR_CC1IF)
+  if (TIM3->SR & TIM_SR_CC1IF)
-        {
+    {
-                uint16_t sample = TIM3->CCR1;
+      uint16_t sample = TIM3->CCR1;
 //              if(sample-lastSampleRef >  1000 /*BREAKER_COUNT_MIN */)
-                {
+        {
-                samplePeriod = sample-sampleRef;
-                sampleRef = sample;
+          samplePeriod = sample - sampleRef;
-                        ++refCount;
-                }
-                lastSampleRef= sample;
+          sampleRef = sample;
+          ++refCount;
+        }
-        if(TIM3->SR & TIM_SR_CC2IF)
-        {
-                 sampleVar  = TIM3->CCR2;
+      lastSampleRef = sample;
-                 ++varCount;
-        }
+    }
-    if(refCount == 1 && varCount == 1)
+  if (TIM3->SR & TIM_SR_CC2IF)
+    {
-        if(sampleRef == sampleVar)
+      sampleVar = TIM3->CCR2;
-                phaseSamp = 0;
+      ++varCount;
-        else
-        {
+    }
-        uint16_t refToVar = sampleRef - sampleVar;
+  if (refCount == 1 && varCount == 1)
+    {
-        uint16_t varToRef = sampleVar - sampleRef;
+      if (sampleRef == sampleVar)
+        phaseSamp = 0;
+      else
+        {
-        if(refToVar < varToRef)
+          uint16_t refToVar = sampleRef - sampleVar;
-                phaseSamp = refToVar;
-        else if(varToRef <= refToVar)
+          uint16_t varToRef = sampleVar - sampleRef;
-                phaseSamp = -varToRef;
+          if (refToVar < varToRef)
-        }
+            phaseSamp = refToVar;
+          else if (varToRef <= refToVar)
+            phaseSamp = -varToRef;
+        }
-        validPhaseSamp = 1;
+      validPhaseSamp = 1;
-        refCount=0;
+      refCount = 0;
-        varCount=0;
+      varCount = 0;
+    }
-    // frequency error, should deal with by direct period measurement
+  // frequency error, should deal with by direct period measurement
-    if(refCount > 1 || varCount > 1  )
+  if (refCount > 1 || varCount > 1)
+    {
-        refCount = 0;
+      refCount = 0;
-        varCount = 0;
+      varCount = 0;
+    }
+}

Subversion Repositories chibiosIgnition

(root)/trunk/src/timer2.c – Rev 21 → 23