ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

CR of AnalogIn

pull/2234/head
Andrzej Puzdrowski 2016-06-30 09:32:48 +02:00
parent 9d137c834c
commit adf15c8117
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/analogin_api.c
View File

@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "mbed_assert.h"
#include "analogin_api.h"
#include "cmsis.h"
@ -57,27 +58,15 @@ void analogin_init(analogin_t *obj, PinName pin)
MBED_ASSERT(ret_code == NRF_SUCCESS);
}
/**
* NRF52 SAR ADC module provides measurement with sign.
* Already mbed API dosn't support readout of signed integer value.
*/
static int16_t analogin_read_i16(analogin_t *obj)
uint16_t analogin_read_u16(analogin_t *obj)
{
nrf_saadc_value_t adc_value;
int16_t adc_value;
ret_code_t ret_code;
ret_code = nrf_drv_saadc_sample_convert(obj->adc_pin, &adc_value);
MBED_ASSERT(ret_code == NRF_SUCCESS);
return adc_value;
}
uint16_t analogin_read_u16(analogin_t *obj)
{
int16_t adc_value;
adc_value = analogin_read_i16(obj);
if (adc_value < 0)
{
// Even in the single ended mode measured value can be {-0}. Saturation for avoid casting to a big integer.
@ -91,7 +80,7 @@ uint16_t analogin_read_u16(analogin_t *obj)
float analogin_read(analogin_t *obj)
{
int16_t value = analogin_read_i16(obj);
uint16_t value = analogin_read_u16(obj);
return (float)value * (1.0f / (float)ADC_RANGE);
}