From 58388647227aec3aabef23c145ea3b4f8da64d3b Mon Sep 17 00:00:00 2001
From: kurte <kurte@rockisland.com>
Date: Sat, 2 Sep 2023 06:54:16 -0700
Subject: [PATCH] FspTimer does not initialize properly if AGT timer is
 selected.

If the begin method:
```
/* -------------------------------------------------------------------------- */
bool FspTimer::begin(timer_mode_t mode, uint8_t tp, uint8_t channel, float freq_hz, float duty_perc, GPTimerCbk_f cbk /*= nullptr*/ , void *ctx /*= nullptr*/  ) {
/* -------------------------------------------------------------------------- */
```
Is called with the tp=1 (AGT)
It will fail as this method uses the member variable type to decide if it is
working with GPT or AGT.  Problem is that this member is not set until after the code has decided that the parameters are correct and it then calls the begin with the period counts.

So needed to use the passed in parameter tp instead.  Also  this begin
method called set_period_counts to convert the data into the counts.  This method also relied on the member type.  So changed it to pass in the tp parameter.

More details are in the forum thread:
https://forum.arduino.cc/t/fsptimer-using-agt-timer-issues/1164494
---
 cores/arduino/FspTimer.cpp | 16 ++++++++--------
 cores/arduino/FspTimer.h   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cores/arduino/FspTimer.cpp b/cores/arduino/FspTimer.cpp
index 875d5183c..f613d5dcd 100644
--- a/cores/arduino/FspTimer.cpp
+++ b/cores/arduino/FspTimer.cpp
@@ -185,13 +185,13 @@ bool FspTimer::begin(timer_mode_t mode, uint8_t tp, uint8_t channel, float freq_
     
     init_ok = true;
     /* AGT timer is always 16 bit */
-    if(channel < TIMER_16_BIT_OFFSET && type == GPT_TIMER) {
+    if(channel < TIMER_16_BIT_OFFSET && tp == GPT_TIMER) {
         /* timer a 32 BIT */
-        set_period_counts(1.0 / freq_hz, CH32BIT_MAX);
+        set_period_counts(tp, 1.0 / freq_hz, CH32BIT_MAX);
         }
     else {
         /* timer a 16 BIT */
-        set_period_counts(1.0 / freq_hz, CH16BIT_MAX);
+        set_period_counts(tp, 1.0 / freq_hz, CH16BIT_MAX);
     }
 
     if(duty_perc >= 0 && duty_perc <= 100) {
@@ -215,11 +215,11 @@ void FspTimer::set_irq_callback(GPTimerCbk_f cbk , void *ctx /*= nullptr*/ ) {
 }
 
 /* -------------------------------------------------------------------------- */
-void FspTimer::set_period_counts(float period, uint32_t _max) {
+void FspTimer::set_period_counts(uint8_t tp, float period, uint32_t _max) {
 /* -------------------------------------------------------------------------- */    
     
     uint32_t freq_hz = 0;
-    if(type == GPT_TIMER) {
+    if(tp == GPT_TIMER) {
         freq_hz = R_FSP_SystemClockHzGet(FSP_PRIV_CLOCK_PCLKD);
         if(period * (float) freq_hz / 1.0 < _max) {
             _period_counts = (uint32_t) (period * (float) freq_hz / 1.0);
@@ -249,7 +249,7 @@ void FspTimer::set_period_counts(float period, uint32_t _max) {
             init_ok = false;
         }
     }
-    else if(type == AGT_TIMER) {
+    else if(tp == AGT_TIMER) {
         freq_hz = R_FSP_SystemClockHzGet(FSP_PRIV_CLOCK_PCLKB);
         if(period * (float) freq_hz / 1.0 < _max) {
             _period_counts = (uint32_t) (period * (float) freq_hz / 1.0);
@@ -418,11 +418,11 @@ bool FspTimer::set_period_ms(double ms) {
     close();
     if(timer_cfg.channel < TIMER_16_BIT_OFFSET && type == GPT_TIMER) {
         /* timer a 32 BIT */
-        set_period_counts(period_sec, CH32BIT_MAX);
+        set_period_counts(type, period_sec, CH32BIT_MAX);
     }
     else {
         /* timer a 16 BIT */
-        set_period_counts(period_sec, CH16BIT_MAX);
+        set_period_counts(type, period_sec, CH16BIT_MAX);
     }
     
     timer_cfg.period_counts = _period_counts;
diff --git a/cores/arduino/FspTimer.h b/cores/arduino/FspTimer.h
index 031651eee..ffd2c801c 100644
--- a/cores/arduino/FspTimer.h
+++ b/cores/arduino/FspTimer.h
@@ -95,7 +95,7 @@ class FspTimer {
     uint32_t _duty_cycle_counts;
     timer_source_div_t _sd;
     uint8_t type;
-    void set_period_counts(float period, uint32_t max);
+    void set_period_counts(uint8_t tp, float period, uint32_t max);
     TimerIrqCfg_t get_cfg_for_irq();
     static bool force_pwm_reserved;
     static TimerAvail_t gpt_used_channel[GPT_HOWMANY];