From b6937c60e7352e6b96e94ab3b85c62c3920d4daa Mon Sep 17 00:00:00 2001
From: maidnl <d.aimo@arduino.cc>
Date: Fri, 7 Jul 2023 10:38:55 +0200
Subject: [PATCH 1/3] Fix odd behavior on RA2A1 micro

---
 cores/arduino/analog.cpp | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/cores/arduino/analog.cpp b/cores/arduino/analog.cpp
index 16283ae8..b0351921 100644
--- a/cores/arduino/analog.cpp
+++ b/cores/arduino/analog.cpp
@@ -479,10 +479,20 @@ static int adcConvert(ADC_Container *_adc,uint16_t cfg_adc) {
     _adc->channel_cfg.scan_mask |= (1 << GET_CHANNEL(cfg_adc));
     
     R_ADC_Open(&(_adc->ctrl), &(_adc->cfg));
+    adc_status_t status;
+
+#ifdef R7FA2A1AB_H
+    fsp_err_t err = R_ADC_Calibrate ( &(_adc->ctrl), &(_adc->cfg_extend));
+    if(err == FSP_SUCCESS) {
+      status.state  = ADC_STATE_SCAN_IN_PROGRESS;
+      while (ADC_STATE_IDLE != status.state) {
+        R_ADC_StatusGet(&(_adc->ctrl), &status);
+      }
+    }
+#endif
+    
     R_ADC_ScanCfg(&(_adc->ctrl), &(_adc->channel_cfg));
     R_ADC_ScanStart(&(_adc->ctrl));
-
-    adc_status_t status;
     status.state = ADC_STATE_SCAN_IN_PROGRESS;
     while (ADC_STATE_SCAN_IN_PROGRESS == status.state)
     {
@@ -492,6 +502,17 @@ static int adcConvert(ADC_Container *_adc,uint16_t cfg_adc) {
     uint16_t result;
     R_ADC_Read(&(_adc->ctrl), (adc_channel_t)GET_CHANNEL(cfg_adc), &result);
     
+#ifdef R7FA2A1AB_H
+    /* this fixes an odd behaviour on RA2A1 microcontroller: although the result
+       of the conversion is expected to be between 0 and 32767 (see pag. 935 of
+       User's manual micro) it sometime returns value around 65535 when the expected
+       value is 0 */
+    int16_t a = (int16_t)result;
+    if(a < 0) {
+      result = 0;
+    }
+#endif    
+    
     result = map(result, 0, (1 << _privateGetHwAnalogResolution()), 0, (1 << _analogRequestedReadResolution));
     return (int)result;
   }
@@ -597,6 +618,16 @@ void analogReadResolution(int bits) {
     /* use a "strange value" to signal something went wrong */
     _analogRequestedReadResolution = 0; 
   }
+
+#ifdef R7FA2A1AB_H
+  /* accept this value only for this micro - used on a Science Kit */
+  if(bits == 9) {
+    _analogRequestedReadResolution = bits;
+  }
+#endif
+
+  
+
   #else
   /* Keep this code that presume R_ADC_Open returns an error when the requested
      resolution is not set to the supported value (requested changes made to Renesas) */
@@ -670,7 +701,11 @@ int _privateGetHwAnalogResolution() {
     read_resolution = 14;
     break;
   case ADC_RESOLUTION_16_BIT:
+    #ifdef R7FA2A1AB_H
+    read_resolution = 15;
+    #else
     read_resolution = 16;
+    #endif
     break;
   case ADC_RESOLUTION_24_BIT:
     read_resolution = 24;

From 57c877b5540d2a7dd5b87641fdd60c17697a136a Mon Sep 17 00:00:00 2001
From: maidnl <d.aimo@arduino.cc>
Date: Fri, 7 Jul 2023 16:09:12 +0200
Subject: [PATCH 2/3] remove calibration, it slow down the conversion

---
 cores/arduino/analog.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/cores/arduino/analog.cpp b/cores/arduino/analog.cpp
index b0351921..072674e7 100644
--- a/cores/arduino/analog.cpp
+++ b/cores/arduino/analog.cpp
@@ -480,16 +480,6 @@ static int adcConvert(ADC_Container *_adc,uint16_t cfg_adc) {
     
     R_ADC_Open(&(_adc->ctrl), &(_adc->cfg));
     adc_status_t status;
-
-#ifdef R7FA2A1AB_H
-    fsp_err_t err = R_ADC_Calibrate ( &(_adc->ctrl), &(_adc->cfg_extend));
-    if(err == FSP_SUCCESS) {
-      status.state  = ADC_STATE_SCAN_IN_PROGRESS;
-      while (ADC_STATE_IDLE != status.state) {
-        R_ADC_StatusGet(&(_adc->ctrl), &status);
-      }
-    }
-#endif
     
     R_ADC_ScanCfg(&(_adc->ctrl), &(_adc->channel_cfg));
     R_ADC_ScanStart(&(_adc->ctrl));

From 970c5b7fb4b2281f71f097e179342871c5c4c39a Mon Sep 17 00:00:00 2001
From: maidnl <d.aimo@arduino.cc>
Date: Tue, 18 Jul 2023 13:23:31 +0200
Subject: [PATCH 3/3] Added define to automatically include patch in Science
 Kit when the PR about ADC will be merged

---
 cores/arduino/Arduino.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 4c3749b7..7aec3838 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -125,4 +125,8 @@ float analogReference();
 #include "pins_arduino.h"
 #include "usb/USB.h"
 
+#ifdef R7FA2A1AB_H
+  #define USE_ADC_FIX_IN_SCIENCE_KIT_REV_3_0
+#endif
+
 #endif //__ARDUINO__H__