PWM: properly handle A/B channel cohexistence

Author: facchinm

cores/arduino/FspTimer.cpp

@@ -39,23 +39,25 @@ void FspTimer::end() {
 bool FspTimer::begin_pwm(uint8_t tp, uint8_t channel, TimerPWMChannel_t pwm_channel) {
 /* -------------------------------------------------------------------------- */    
     init_ok = true;
-    
+
     init_ok = begin(TIMER_MODE_PWM,tp,channel, STANDARD_PWM_FREQ_HZ ,STANDARD_DUTY_CYCLE_PERC);
-    
+
     if(tp == GPT_TIMER) {
         add_pwm_extended_cfg();
     }
-    
+
     enable_pwm_channel(pwm_channel);
 
     if(init_ok) {
         init_ok &= open();
         init_ok &= start();
     }
-       
+
     return init_ok;
 }
 
+extern FspTimer* __get_timer_for_channel(int channel);
+
 /* begin function RAW mode */
 /* -------------------------------------------------------------------------- */
 bool FspTimer::begin(timer_mode_t mode, uint8_t tp, uint8_t channel, uint32_t period_counts, uint32_t pulse_counts, timer_source_div_t sd, GPTimerCbk_f cbk /*= nullptr*/ , void *ctx /*= nullptr*/ ) {
@@ -72,7 +74,6 @@ bool FspTimer::begin(timer_mode_t mode, uint8_t tp, uint8_t channel, uint32_t pe
     timer_cfg.cycle_end_ipl                         = (BSP_IRQ_DISABLED);
     timer_cfg.cycle_end_irq                         = FSP_INVALID_VECTOR;
 
-
     if(tp == GPT_TIMER) {
         type = GPT_TIMER;
         gpt_timer = new GPTimer(timer_cfg);
@@ -83,6 +84,12 @@ bool FspTimer::begin(timer_mode_t mode, uint8_t tp, uint8_t channel, uint32_t pe
                     timer_cfg.channel = channel;
                     gpt_used_channel[channel] = TIMER_USED;
                     init_ok = true;
+                } else if (mode == TIMER_USED) {
+                    // check if compatible PWM on another channel
+                    timer_cfg.channel = channel;
+                    memcpy(&(gpt_timer->ext_cfg), __get_timer_for_channel(channel)->get_cfg()->p_extend, sizeof(gpt_extended_cfg_t));
+                    timer_cfg.duty_cycle_counts = __get_timer_for_channel(channel)->get_duty_cycle();
+                    init_ok = true;
                 }
             }
             else {
@@ -551,7 +558,8 @@ bool FspTimer::start() {
 
 /* -------------------------------------------------------------------------- */
 bool FspTimer::set_duty_cycle(uint32_t const duty_cycle_counts, TimerPWMChannel_t pwm_ch) {
-/* -------------------------------------------------------------------------- */    
+/* -------------------------------------------------------------------------- */
+    _duty_cycle_counts = duty_cycle_counts;
     if(type == GPT_TIMER && gpt_timer != nullptr) {
         uint32_t pin = (pwm_ch == CHANNEL_A) ?  GPT_IO_PIN_GTIOCA : GPT_IO_PIN_GTIOCB;   
         if (R_GPT_DutyCycleSet(&(gpt_timer->ctrl), duty_cycle_counts, pin) != FSP_SUCCESS) {

cores/arduino/FspTimer.h

@@ -115,6 +115,7 @@ class FspTimer {
     void enable_pwm_channel(TimerPWMChannel_t pwm_channel);
     uint32_t get_counter();
     uint32_t get_freq_hz();
+    uint32_t get_duty_cycle() { return _duty_cycle_counts; };
     uint32_t get_channel();
 
     static void set_timer_is_used(uint8_t type, int index) {

cores/arduino/analog.cpp

@@ -765,6 +765,16 @@ class PwmArray {
     }
     return nullptr;
   }
+  PwmOut *get_from_channel(int channel) {
+    size_t i = 0;
+    while (i < last_index) {
+      if (pwm_outs[i]->get_timer()->get_cfg()->channel == channel) {
+        return pwm_outs[i];
+      }
+      i++;
+    }
+    return nullptr;
+  }
   bool set(int pinNumber, PwmOut *p) {
     if (last_index < sizeof(chans)/sizeof(chans[0]) && p != nullptr) {
       chans[last_index] = pinNumber;
@@ -801,7 +811,7 @@ void analogWrite(pin_size_t pinNumber, int value)
     bool added = pwms.set(pinNumber, ptr);
     if(!added || !ptr->begin()) {
       delete ptr;
-      return;
+      ptr = nullptr;
     }
   }
 
@@ -810,3 +820,6 @@ void analogWrite(pin_size_t pinNumber, int value)
   }
 }
 
+FspTimer* __get_timer_for_channel(int channel) {
+  return  pwms.get_from_channel(channel)->get_timer();
+}

cores/arduino/pwm.cpp

@@ -15,9 +15,6 @@ PwmOut::PwmOut(int pinNumber) :
 PwmOut::~PwmOut() {
 }
 
-
-
-
 bool PwmOut::cfg_pin(int max_index) {
   /* verify index are good */
   if(_pin < 0 || _pin >= max_index) {
@@ -26,20 +23,20 @@ bool PwmOut::cfg_pin(int max_index) {
   /* getting configuration from table */
   const uint16_t *cfg = g_pin_cfg[_pin].list;
   uint16_t pin_cgf = getPinCfg(cfg, PIN_CFG_REQ_PWM,false);
-  
+
   /* verify configuration are good */
   if(pin_cgf == 0) {
     return false;
   }
-  
+
   timer_channel = GET_CHANNEL(pin_cgf);
 
-  _is_gtp = IS_PIN_GPT_PWM(pin_cgf);
+  _is_agt = IS_PIN_AGT_PWM(pin_cgf);
 
   _pwm_channel = IS_PWM_ON_A(pin_cgf) ? CHANNEL_A : CHANNEL_B;
 
   /* actually configuring PIN function */
-  R_IOPORT_PinCfg(&g_ioport_ctrl, g_pin_cfg[_pin].pin, (uint32_t) (IOPORT_CFG_PERIPHERAL_PIN | IOPORT_PERIPHERAL_GPT1));
+  R_IOPORT_PinCfg(&g_ioport_ctrl, g_pin_cfg[_pin].pin, (uint32_t) (IOPORT_CFG_PERIPHERAL_PIN | (_is_agt ? IOPORT_PERIPHERAL_AGT : IOPORT_PERIPHERAL_GPT1)));
   return true;
 
 }
@@ -49,14 +46,14 @@ bool PwmOut::begin() {
   bool rv = true;
   int max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
   rv &= cfg_pin(max_index);
-  
+
   if(rv) {
     /* extended PWM CFG*/
-    if(_is_gtp) {
-      rv &= timer.begin_pwm(GPT_TIMER, timer_channel, _pwm_channel);    
+    if(_is_agt) {
+      rv &= timer.begin_pwm(AGT_TIMER, timer_channel, _pwm_channel);
     }
     else {
-      rv &= timer.begin_pwm(AGT_TIMER, timer_channel, _pwm_channel);  
+      rv &= timer.begin_pwm(GPT_TIMER, timer_channel, _pwm_channel);
     }
   }
   _enabled = rv;
@@ -76,13 +73,13 @@ bool PwmOut::begin(uint32_t period_width, uint32_t pulse_width, bool raw /*= fal
 
   if(_enabled) {
     if(raw) {
-      _enabled &= timer.begin(TIMER_MODE_PWM, (_is_gtp) ? GPT_TIMER : AGT_TIMER , timer_channel,  period_width, pulse_width, sd);
+      _enabled &= timer.begin(TIMER_MODE_PWM, (_is_agt) ? AGT_TIMER : GPT_TIMER, timer_channel,  period_width, pulse_width, sd);
     }
     else {
       /* NOTE: I suppose period and pulse are expressed in us */
       float freq_hz = (1000000.0 / (float)period_width);
       float duty_perc = ((float)pulse_width * 100.0 / (float)period_width);
-      _enabled &= timer.begin(TIMER_MODE_PWM, (_is_gtp) ? GPT_TIMER : AGT_TIMER , timer_channel, freq_hz, duty_perc);
+      _enabled &= timer.begin(TIMER_MODE_PWM, (_is_agt) ? AGT_TIMER : GPT_TIMER, timer_channel, freq_hz, duty_perc);
     }
 
     timer.add_pwm_extended_cfg();

cores/arduino/pwm.h

@@ -39,7 +39,7 @@ class PwmOut {
     bool cfg_pin(int max_index);
     int _pin;
     bool _enabled;
-    bool _is_gtp;
+    bool _is_agt;
     TimerPWMChannel_t _pwm_channel;
 
     uint8_t timer_channel;