mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
Merge pull request #4148 from LudwigKnuepfer/pr/nrf51-adc
cpu/nrf51 + boards: add ADC implementation
This commit is contained in:
commit
59e2fd8a22
@ -1,4 +1,5 @@
|
||||
# Put defined MCU peripherals here (in alphabetical order)
|
||||
FEATURES_PROVIDED += periph_adc
|
||||
FEATURES_PROVIDED += periph_cpuid
|
||||
FEATURES_PROVIDED += periph_gpio
|
||||
FEATURES_PROVIDED += periph_random
|
||||
|
@ -123,6 +123,22 @@
|
||||
#define SPI_0_PIN_SCK 15
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* @name ADC configuration
|
||||
* @{
|
||||
*/
|
||||
#define ADC_NUMOF (1U)
|
||||
#define ADC_0_EN 1
|
||||
#define ADC_MAX_CHANNELS 4
|
||||
|
||||
/* ADC 0 device configuration */
|
||||
#define ADC_0_CHANNELS 4
|
||||
#define ADC_0_CH0 ADC_CONFIG_PSEL_AnalogInput3
|
||||
#define ADC_0_CH1 ADC_CONFIG_PSEL_AnalogInput4
|
||||
#define ADC_0_CH2 ADC_CONFIG_PSEL_AnalogInput5
|
||||
#define ADC_0_CH3 ADC_CONFIG_PSEL_AnalogInput6
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* @name Radio device configuration
|
||||
*
|
||||
|
@ -1,4 +1,5 @@
|
||||
# Put defined MCU peripherals here (in alphabetical order)
|
||||
FEATURES_PROVIDED += periph_adc
|
||||
FEATURES_PROVIDED += periph_cpuid
|
||||
FEATURES_PROVIDED += periph_gpio
|
||||
FEATURES_PROVIDED += periph_random
|
||||
|
@ -130,6 +130,22 @@ extern "C" {
|
||||
#define SPI_1_PIN_SCK 22
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* @name ADC configuration
|
||||
* @{
|
||||
*/
|
||||
#define ADC_NUMOF (1U)
|
||||
#define ADC_0_EN 1
|
||||
#define ADC_MAX_CHANNELS 4
|
||||
|
||||
/* ADC 0 device configuration */
|
||||
#define ADC_0_CHANNELS 4
|
||||
#define ADC_0_CH0 ADC_CONFIG_PSEL_AnalogInput0
|
||||
#define ADC_0_CH1 ADC_CONFIG_PSEL_AnalogInput1
|
||||
#define ADC_0_CH2 ADC_CONFIG_PSEL_AnalogInput2
|
||||
#define ADC_0_CH3 ADC_CONFIG_PSEL_AnalogInput3
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* @name Radio device configuration
|
||||
*
|
||||
|
@ -1,4 +1,5 @@
|
||||
# Put defined MCU peripherals here (in alphabetical order)
|
||||
FEATURES_PROVIDED += periph_adc
|
||||
FEATURES_PROVIDED += periph_cpuid
|
||||
FEATURES_PROVIDED += periph_gpio
|
||||
FEATURES_PROVIDED += periph_random
|
||||
|
@ -128,6 +128,22 @@ extern "C" {
|
||||
#define SPI_1_PIN_SCK 22
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* @name ADC configuration
|
||||
* @{
|
||||
*/
|
||||
#define ADC_NUMOF (1U)
|
||||
#define ADC_0_EN 1
|
||||
#define ADC_MAX_CHANNELS 4
|
||||
|
||||
/* ADC 0 device configuration */
|
||||
#define ADC_0_CHANNELS 4
|
||||
#define ADC_0_CH0 ADC_CONFIG_PSEL_AnalogInput4
|
||||
#define ADC_0_CH1 ADC_CONFIG_PSEL_AnalogInput5
|
||||
#define ADC_0_CH2 ADC_CONFIG_PSEL_AnalogInput6
|
||||
#define ADC_0_CH3 ADC_CONFIG_PSEL_AnalogInput7
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* @name Radio device configuration
|
||||
*
|
||||
|
133
cpu/nrf51/periph/adc.c
Normal file
133
cpu/nrf51/periph/adc.c
Normal file
@ -0,0 +1,133 @@
|
||||
/*
|
||||
* Copyright (C) 2014 Freie Universität Berlin
|
||||
* Copyright (C) 2015 Ludwig Knüpfer
|
||||
*
|
||||
* This file is subject to the terms and conditions of the GNU Lesser General
|
||||
* Public License v2.1. See the file LICENSE in the top level directory for more
|
||||
* details.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @ingroup cpu_nrf51822
|
||||
* @{
|
||||
*
|
||||
* @file
|
||||
* @brief Low-level UART driver implementation
|
||||
*
|
||||
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
|
||||
* @author Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
|
||||
*
|
||||
* @}
|
||||
*/
|
||||
|
||||
#include "cpu.h"
|
||||
#include "periph/adc.h"
|
||||
#include "periph_conf.h"
|
||||
|
||||
/* guard file in case no ADC device is defined */
|
||||
#if ADC_NUMOF
|
||||
|
||||
/* save the maximum value configured for the ADC */
|
||||
int adc_max_value;
|
||||
|
||||
int adc_init(adc_t dev, adc_precision_t precision)
|
||||
{
|
||||
/* the NRF51822 only supports one ADC... */
|
||||
if (dev != ADC_0) {
|
||||
return -2;
|
||||
}
|
||||
|
||||
/* power on ADC */
|
||||
NRF_ADC->POWER = 1;
|
||||
|
||||
/* disable ADC interrupts */
|
||||
NRF_ADC->INTENSET = (ADC_INTENSET_END_Disabled << ADC_INTENSET_END_Pos);
|
||||
|
||||
/* configure ADC, set precision, internal reference to VBG */
|
||||
switch (precision) {
|
||||
case ADC_RES_8BIT:
|
||||
adc_max_value = 255;
|
||||
NRF_ADC->CONFIG = (ADC_CONFIG_RES_8bit << ADC_CONFIG_RES_Pos);
|
||||
break;
|
||||
case ADC_RES_10BIT:
|
||||
adc_max_value = 1023;
|
||||
NRF_ADC->CONFIG = (ADC_CONFIG_RES_10bit << ADC_CONFIG_RES_Pos);
|
||||
break;
|
||||
default:
|
||||
NRF_ADC->POWER = 0;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* select the reference voltage / prescaler */
|
||||
NRF_ADC->CONFIG |= (ADC_CONFIG_EXTREFSEL_None << ADC_CONFIG_EXTREFSEL_Pos);
|
||||
NRF_ADC->CONFIG |= (ADC_CONFIG_REFSEL_VBG << ADC_CONFIG_REFSEL_Pos);
|
||||
NRF_ADC->CONFIG |= (ADC_CONFIG_INPSEL_AnalogInputOneThirdPrescaling << ADC_CONFIG_INPSEL_Pos);
|
||||
|
||||
/* enable the ADC */
|
||||
NRF_ADC->ENABLE = (ADC_ENABLE_ENABLE_Enabled << ADC_ENABLE_ENABLE_Pos);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int adc_sample(adc_t dev, int channel)
|
||||
{
|
||||
if (dev != ADC_0) {
|
||||
return -2;
|
||||
}
|
||||
|
||||
/* set channel */
|
||||
NRF_ADC->CONFIG &= ~(ADC_CONFIG_PSEL_Msk);
|
||||
NRF_ADC->CONFIG |= (ADC_CONFIG_PSEL_Disabled << ADC_CONFIG_PSEL_Pos);
|
||||
switch (channel) {
|
||||
case 0:
|
||||
NRF_ADC->CONFIG |= (ADC_0_CH0 << ADC_CONFIG_PSEL_Pos);
|
||||
break;
|
||||
case 1:
|
||||
NRF_ADC->CONFIG |= (ADC_0_CH1 << ADC_CONFIG_PSEL_Pos);
|
||||
break;
|
||||
case 2:
|
||||
NRF_ADC->CONFIG |= (ADC_0_CH2 << ADC_CONFIG_PSEL_Pos);
|
||||
break;
|
||||
case 3:
|
||||
NRF_ADC->CONFIG |= (ADC_0_CH3 << ADC_CONFIG_PSEL_Pos);
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* start conversion */
|
||||
NRF_ADC->TASKS_START = 1;
|
||||
|
||||
/* wait for conversion to be complete */
|
||||
while (((NRF_ADC->BUSY & ADC_BUSY_BUSY_Msk) >> ADC_BUSY_BUSY_Pos) == ADC_BUSY_BUSY_Busy);
|
||||
NRF_ADC->EVENTS_END = 1;
|
||||
|
||||
/* return result */
|
||||
return (int)NRF_ADC->RESULT;
|
||||
}
|
||||
|
||||
void adc_poweron(adc_t dev)
|
||||
{
|
||||
if (dev == ADC_0) {
|
||||
NRF_ADC->POWER = 1;
|
||||
}
|
||||
}
|
||||
|
||||
void adc_poweroff(adc_t dev)
|
||||
{
|
||||
if (dev == ADC_0) {
|
||||
NRF_ADC->POWER = 0;
|
||||
}
|
||||
}
|
||||
|
||||
int adc_map(adc_t dev, int value, int min, int max)
|
||||
{
|
||||
return (int)adc_mapf(dev, value, (float)min, (float)max);
|
||||
}
|
||||
|
||||
float adc_mapf(adc_t dev, int value, float min, float max)
|
||||
{
|
||||
return ((max - min) / ((float)adc_max_value)) * value;
|
||||
}
|
||||
|
||||
#endif /* ADC_NUMOF */
|
Loading…
Reference in New Issue
Block a user