Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix odd behavior on RA2A1 micro #37

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix odd behavior on RA2A1 micro #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6937c6
Fix odd behavior on RA2A1 micro
maidnl Jul 7, 2023
57c877b
remove calibration, it slow down the conversion
maidnl Jul 7, 2023
970c5b7
Added define to automatically include patch in Science Kit when the P…
maidnl Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cores/arduino/Arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__
29 changes: 27 additions & 2 deletions cores/arduino/analog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,10 @@ 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;

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)
{
Expand All @@ -492,6 +492,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;
}
Expand Down Expand Up @@ -597,6 +608,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) */
Expand Down Expand Up @@ -670,7 +691,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;
Expand Down