FMF-ART / mbed-dev-lib

Fork of mbed-dev by mbed official

Committer:
mbed_official
Date:
Thu Nov 05 09:00:10 2015 +0000
Revision:
17:0b20abc991ca
Parent:
13:da2ea05f91cf
Child:
144:ef7eb2e8f9f7
Synchronized with git revision c7fe39e4bcf7ba034b03db7a59d164b8b2d706b2

Full URL: https://github.com/mbedmicro/mbed/commit/c7fe39e4bcf7ba034b03db7a59d164b8b2d706b2/

Fix analogin checking the wrong flag for completion

Who changed what in which revision?

UserRevisionLine numberNew contents of line
bogdanm 0:9b334a45a8ff 1 /* mbed Microcontroller Library
bogdanm 0:9b334a45a8ff 2 * Copyright (c) 2006-2013 ARM Limited
bogdanm 0:9b334a45a8ff 3 *
bogdanm 0:9b334a45a8ff 4 * Licensed under the Apache License, Version 2.0 (the "License");
bogdanm 0:9b334a45a8ff 5 * you may not use this file except in compliance with the License.
bogdanm 0:9b334a45a8ff 6 * You may obtain a copy of the License at
bogdanm 0:9b334a45a8ff 7 *
bogdanm 0:9b334a45a8ff 8 * http://www.apache.org/licenses/LICENSE-2.0
bogdanm 0:9b334a45a8ff 9 *
bogdanm 0:9b334a45a8ff 10 * Unless required by applicable law or agreed to in writing, software
bogdanm 0:9b334a45a8ff 11 * distributed under the License is distributed on an "AS IS" BASIS,
bogdanm 0:9b334a45a8ff 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
bogdanm 0:9b334a45a8ff 13 * See the License for the specific language governing permissions and
bogdanm 0:9b334a45a8ff 14 * limitations under the License.
bogdanm 0:9b334a45a8ff 15 */
bogdanm 0:9b334a45a8ff 16 #include "mbed_assert.h"
bogdanm 0:9b334a45a8ff 17 #include "analogin_api.h"
bogdanm 0:9b334a45a8ff 18 #include "cmsis.h"
bogdanm 0:9b334a45a8ff 19 #include "pinmap.h"
bogdanm 0:9b334a45a8ff 20
bogdanm 0:9b334a45a8ff 21 #define ANALOGIN_MEDIAN_FILTER 1
bogdanm 0:9b334a45a8ff 22 #define ADC_10BIT_RANGE 0x3FF
bogdanm 0:9b334a45a8ff 23 #define ADC_RANGE ADC_10BIT_RANGE
bogdanm 0:9b334a45a8ff 24
bogdanm 0:9b334a45a8ff 25 static const PinMap PinMap_ADC[] = {
bogdanm 0:9b334a45a8ff 26 {p1, ADC0_0, 4},
bogdanm 0:9b334a45a8ff 27 {p2, ADC0_0, 8},
bogdanm 0:9b334a45a8ff 28 {p3, ADC0_0, 16},
bogdanm 0:9b334a45a8ff 29 {p4, ADC0_0, 32},
bogdanm 0:9b334a45a8ff 30 {p5, ADC0_0, 64},
bogdanm 0:9b334a45a8ff 31 {p6, ADC0_0, 128},
mbed_official 13:da2ea05f91cf 32 #ifndef TARGET_NRF51_DONGLE
mbed_official 3:457d224d8af1 33 {p26, ADC0_0, 1},
mbed_official 13:da2ea05f91cf 34 {p27, ADC0_0, 2},
mbed_official 13:da2ea05f91cf 35 #endif
bogdanm 0:9b334a45a8ff 36 {NC, NC, 0}
bogdanm 0:9b334a45a8ff 37 };
bogdanm 0:9b334a45a8ff 38
bogdanm 0:9b334a45a8ff 39 void analogin_init(analogin_t *obj, PinName pin)
bogdanm 0:9b334a45a8ff 40 {
bogdanm 0:9b334a45a8ff 41 int analogInputPin = 0;
bogdanm 0:9b334a45a8ff 42 const PinMap *map = PinMap_ADC;
bogdanm 0:9b334a45a8ff 43
bogdanm 0:9b334a45a8ff 44 obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); //(NRF_ADC_Type *)
bogdanm 0:9b334a45a8ff 45 MBED_ASSERT(obj->adc != (ADCName)NC);
bogdanm 0:9b334a45a8ff 46
bogdanm 0:9b334a45a8ff 47 while (map->pin != NC) {
bogdanm 0:9b334a45a8ff 48 if (map->pin == pin) {
bogdanm 0:9b334a45a8ff 49 analogInputPin = map->function;
bogdanm 0:9b334a45a8ff 50 break;
bogdanm 0:9b334a45a8ff 51 }
bogdanm 0:9b334a45a8ff 52 map++;
bogdanm 0:9b334a45a8ff 53 }
bogdanm 0:9b334a45a8ff 54 obj->adc_pin = (uint8_t)analogInputPin;
bogdanm 0:9b334a45a8ff 55
bogdanm 0:9b334a45a8ff 56 NRF_ADC->ENABLE = ADC_ENABLE_ENABLE_Enabled;
bogdanm 0:9b334a45a8ff 57 NRF_ADC->CONFIG = (ADC_CONFIG_RES_10bit << ADC_CONFIG_RES_Pos) |
bogdanm 0:9b334a45a8ff 58 (ADC_CONFIG_INPSEL_AnalogInputOneThirdPrescaling << ADC_CONFIG_INPSEL_Pos) |
bogdanm 0:9b334a45a8ff 59 (ADC_CONFIG_REFSEL_SupplyOneThirdPrescaling << ADC_CONFIG_REFSEL_Pos) |
bogdanm 0:9b334a45a8ff 60 (analogInputPin << ADC_CONFIG_PSEL_Pos) |
bogdanm 0:9b334a45a8ff 61 (ADC_CONFIG_EXTREFSEL_None << ADC_CONFIG_EXTREFSEL_Pos);
bogdanm 0:9b334a45a8ff 62 }
bogdanm 0:9b334a45a8ff 63
bogdanm 0:9b334a45a8ff 64 uint16_t analogin_read_u16(analogin_t *obj)
bogdanm 0:9b334a45a8ff 65 {
bogdanm 0:9b334a45a8ff 66 NRF_ADC->CONFIG &= ~ADC_CONFIG_PSEL_Msk;
bogdanm 0:9b334a45a8ff 67 NRF_ADC->CONFIG |= obj->adc_pin << ADC_CONFIG_PSEL_Pos;
mbed_official 17:0b20abc991ca 68 NRF_ADC->EVENTS_END = 0;
bogdanm 0:9b334a45a8ff 69 NRF_ADC->TASKS_START = 1;
mbed_official 17:0b20abc991ca 70
mbed_official 17:0b20abc991ca 71 while (!NRF_ADC->EVENTS_END) {
bogdanm 0:9b334a45a8ff 72 }
bogdanm 0:9b334a45a8ff 73
bogdanm 0:9b334a45a8ff 74 return (uint16_t)NRF_ADC->RESULT; // 10 bit
bogdanm 0:9b334a45a8ff 75 }
bogdanm 0:9b334a45a8ff 76
bogdanm 0:9b334a45a8ff 77 float analogin_read(analogin_t *obj)
bogdanm 0:9b334a45a8ff 78 {
bogdanm 0:9b334a45a8ff 79 uint16_t value = analogin_read_u16(obj);
bogdanm 0:9b334a45a8ff 80 return (float)value * (1.0f / (float)ADC_RANGE);
bogdanm 0:9b334a45a8ff 81 }