Merge pull request #1535 from Ralim/testing-fix-for-timer-slot-miss

Change timing scheduler to only run main timer once ADC is done

source/Core/BSP/Pinecilv2/IRQ.cpp

@@ -17,15 +17,18 @@ extern "C" {
 #include "bl702_pwm.h"
 #include "bl702_timer.h"
 }
+void start_PWM_output(void);
 
 #define ADC_Filter_Smooth 4
 history<uint16_t, ADC_Filter_Smooth> ADC_Vin;
 history<uint16_t, ADC_Filter_Smooth> ADC_Temp;
 history<uint16_t, ADC_Filter_Smooth> ADC_Tip;
+volatile uint8_t                     ADCBurstCounter = 0;
 void                                 adc_fifo_irq(void) {
   if (ADC_GetIntStatus(ADC_INT_FIFO_READY) == SET) {
     // Read out all entries in the fifo
     while (ADC_Get_FIFO_Count()) {
+      ADCBurstCounter++;
       volatile uint32_t reading = ADC_Read_FIFO();
       // As per manual, 26 bit reading; lowest 16 are the ADC
       uint16_t sample = reading & 0xFFFF;
@@ -46,12 +49,17 @@ void                                 adc_fifo_irq(void) {
       }
     }
 
-    // unblock the PID controller thread
+    if (ADCBurstCounter >= 8) {
-    if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
+      ADCBurstCounter = 0;
-      BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+      start_PWM_output();
-      if (pidTaskNotification) {
+
-        vTaskNotifyGiveFromISR(pidTaskNotification, &xHigherPriorityTaskWoken);
+      // unblock the PID controller thread
-        portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+      if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
+        BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+        if (pidTaskNotification) {
+          vTaskNotifyGiveFromISR(pidTaskNotification, &xHigherPriorityTaskWoken);
+          portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+        }
       }
     }
   }
@@ -66,12 +74,8 @@ volatile uint16_t PWMSafetyTimer    = 0;
 volatile uint8_t  pendingPWM        = 0;
 volatile bool     lastPeriodWasFast = false;
 
-// Timer 0 is used to co-ordinate the ADC and the output PWM
+void start_PWM_output(void) {
-void timer0_comp0_callback(void) { ADC_Start(); }
-void timer0_comp1_callback(void) { PWM_Channel_Disable(PWM_Channel); }
-void timer0_comp2_callback(void) {
 
-  // This occurs at timer rollover, so if we want to turn on the output PWM; we do so
   if (PWMSafetyTimer) {
     PWMSafetyTimer--;
     if (lastPeriodWasFast != fastPWM) {
@@ -93,8 +97,16 @@ void timer0_comp2_callback(void) {
   } else {
     PWM_Channel_Disable(PWM_Channel);
   }
+  TIMER_Enable(TIMER_CH0);
 }
 
+// Timer 0 is used to co-ordinate the ADC and the output PWM
+void timer0_comp0_callback(void) {
+  TIMER_Disable(TIMER_CH0);
+  ADC_Start();
+}
+void timer0_comp1_callback(void) { PWM_Channel_Disable(PWM_Channel); } // Trigged at end of output cycle; turn off the tip PWM
+
 void switchToFastPWM(void) {
   fastPWM  = true;
   totalPWM = powerPWM + tempMeasureTicks + holdoffTicks;

source/Core/BSP/Pinecilv2/Setup.cpp

@@ -62,10 +62,10 @@ void hardware_init() {
   setup_timer_scheduler();
   setup_adc();
   setup_pwm();
-  I2C_SetSclSync(I2C0_ID,1);
+  I2C_SetSclSync(I2C0_ID, 1);
-  I2C_SetDeglitchCount(I2C0_ID,1); // Turn on de-glitch
+  I2C_SetDeglitchCount(I2C0_ID, 1); // Turn on de-glitch
-  //Note on I2C clock rate @ 100Khz the screen update == 20ms which is too long for USB-PD to work
+  // Note on I2C clock rate @ 100Khz the screen update == 20ms which is too long for USB-PD to work
-  //200kHz and above works
+  // 200kHz and above works
   I2C_ClockSet(I2C0_ID, 300000); // Sets clock to around 25 kHz less than set here
   TIMER_SetCompValue(TIMER_CH0, TIMER_COMP_ID_1, 0);
 }
@@ -139,32 +139,28 @@ void setup_timer_scheduler() {
   TIMER_Disable(TIMER_CH0);
 
   TIMER_CFG_Type cfg = {
-      TIMER_CH0,                                              // Channel
+      TIMER_CH0,                           // Channel
-      TIMER_CLKSRC_32K,                                       // Clock source
+      TIMER_CLKSRC_32K,                    // Clock source
-      TIMER_PRELOAD_TRIG_COMP2,                               // Trigger
+      TIMER_PRELOAD_TRIG_COMP0,            // Trigger; reset after trigger 0
-      TIMER_COUNT_PRELOAD,                                    // Counter mode
+      TIMER_COUNT_PRELOAD,                 // Counter mode
-      22,                                                     // Clock div
+      22,                                  // Clock div
-      (uint16_t)(powerPWM + holdoffTicks),                    // CH0 compare (adc)
+      (uint16_t)(powerPWM + holdoffTicks), // CH0 compare (adc)
-      0,                                                      // CH1 compare (pwm out)
+      0,                                   // CH1 compare (pwm out)
-      (uint16_t)(powerPWM + tempMeasureTicks + holdoffTicks), // CH2 comapre (total period)
+      0,                                   // CH2 compare not used
-      0,                                                      // Preload
+      0,                                   // Preload
   };
   TIMER_Init(&cfg);
 
   Timer_Int_Callback_Install(TIMER_CH0, TIMER_INT_COMP_0, timer0_comp0_callback);
   Timer_Int_Callback_Install(TIMER_CH0, TIMER_INT_COMP_1, timer0_comp1_callback);
-  Timer_Int_Callback_Install(TIMER_CH0, TIMER_INT_COMP_2, timer0_comp2_callback);
 
   TIMER_ClearIntStatus(TIMER_CH0, TIMER_COMP_ID_0);
   TIMER_ClearIntStatus(TIMER_CH0, TIMER_COMP_ID_1);
-  TIMER_ClearIntStatus(TIMER_CH0, TIMER_COMP_ID_2);
 
   TIMER_IntMask(TIMER_CH0, TIMER_INT_COMP_0, UNMASK);
   TIMER_IntMask(TIMER_CH0, TIMER_INT_COMP_1, UNMASK);
-  TIMER_IntMask(TIMER_CH0, TIMER_INT_COMP_2, UNMASK);
   CPU_Interrupt_Enable(TIMER_CH0_IRQn);
   TIMER_Enable(TIMER_CH0);
-  // switchToSlowPWM();
 }
 
 void setupFUSBIRQ() {