cc3200: Add ADC module.

cc3200/application.mk

@@ -89,6 +89,7 @@ APP_MODS_SRC_C = $(addprefix mods/,\
 	modusocket.c \
 	modutime.c \
 	modwlan.c \
+	pybadc.c \
 	pybextint.c \
 	pybi2c.c \
 	pybpin.c \

cc3200/mods/modpyb.c

@@ -62,6 +62,7 @@
 #include "mpexception.h"
 #include "random.h"
 #include "pybextint.h"
+#include "pybadc.h"
 #include "pybi2c.h"
 #include "utils.h"
 
@@ -313,6 +314,7 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = {
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_Pin),                 (mp_obj_t)&pin_type },
     { MP_OBJ_NEW_QSTR(MP_QSTR_ExtInt),              (mp_obj_t)&extint_type },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_ADC),                 (mp_obj_t)&pyb_adc_type },
     { MP_OBJ_NEW_QSTR(MP_QSTR_I2C),                 (mp_obj_t)&pyb_i2c_type },
     { MP_OBJ_NEW_QSTR(MP_QSTR_UART),                (mp_obj_t)&pyb_uart_type },
 };

cc3200/mods/pybadc.c

+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "mpconfig.h"
+#include MICROPY_HAL_H
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/binary.h"
+#include "py/gc.h"
+#include "bufhelper.h"
+#include "inc/hw_types.h"
+#include "inc/hw_adc.h"
+#include "inc/hw_ints.h"
+#include "inc/hw_memmap.h"
+#include "rom_map.h"
+#include "interrupt.h"
+#include "pin.h"
+#include "prcm.h"
+#include "adc.h"
+#include "pybadc.h"
+#include "pybpin.h"
+#include "pins.h"
+#include "mpexception.h"
+
+
+/// \moduleref pyb
+/// \class ADC - analog to digital conversion: read analog values on a pin
+///
+/// Usage:
+///
+///     adc = pyb.ADC(channel)                # create an adc object on the given channel (0 to 3)
+///     adc.read()                            # read channel value
+///
+///     The sample rate is fixed to 62.5KHz and the resolution to 12 bits.
+
+typedef struct _pyb_obj_adc_t {
+    mp_obj_base_t base;
+    byte channel;
+    byte num;
+} pyb_obj_adc_t;
+
+
+/******************************************************************************/
+/* Micro Python bindings : adc object                                         */
+
+STATIC void adc_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
+    pyb_obj_adc_t *self = self_in;
+    print(env, "<ADC, channel=%u>", self->num);
+}
+
+/// \classmethod \constructor(channel)
+/// Create an ADC object associated with the given channel.
+/// This allows you to then read analog values on that pin.
+STATIC mp_obj_t adc_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
+    // check number of arguments
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+
+    // the first argument is the channel number
+    uint num = mp_obj_get_int(args[0]);
+    const pin_obj_t *pin;
+    uint channel;
+    switch (num) {
+    case 0:
+        channel = ADC_CH_0;
+        pin = &pin_GPIO2;
+        break;
+    case 1:
+        channel = ADC_CH_1;
+        pin = &pin_GPIO3;
+        break;
+    case 2:
+        channel = ADC_CH_2;
+        pin = &pin_GPIO4;
+        break;
+    case 3:
+        channel = ADC_CH_3;
+        pin = &pin_GPIO5;
+        break;
+    default:
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
+        break;
+    }
+
+    // disable the callback before re-configuring
+    pyb_obj_adc_t *self = m_new_obj(pyb_obj_adc_t);
+    self->base.type = &pyb_adc_type;
+    self->channel = channel;
+    self->num = num;
+
+    // configure the pin in analog mode
+    pin_config (pin, 0, 0, PIN_TYPE_ANALOG, PIN_STRENGTH_2MA);
+
+    // enable the ADC channel
+    MAP_ADCChannelEnable(ADC_BASE, channel);
+    // enable and configure the timer
+    MAP_ADCTimerConfig(ADC_BASE, (1 << 17) - 1);
+    MAP_ADCTimerEnable(ADC_BASE);
+    // enable the ADC peripheral
+    MAP_ADCEnable(ADC_BASE);
+
+    return self;
+}
+
+/// \method read()
+/// Read the value on the analog pin and return it.  The returned value
+/// will be between 0 and 4095.
+STATIC mp_obj_t adc_read(mp_obj_t self_in) {
+    pyb_obj_adc_t *self = self_in;
+    uint32_t sample;
+
+    // wait until a new value is available
+    while (!MAP_ADCFIFOLvlGet(ADC_BASE, self->channel));
+    // read the sample
+    sample = MAP_ADCFIFORead(ADC_BASE, self->channel);
+    // the 12 bit sampled value is stored in bits [13:2]
+    return MP_OBJ_NEW_SMALL_INT((sample & 0x3FFF) >> 2);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_read_obj, adc_read);
+
+/// \method enable()
+/// Enable the adc channel
+STATIC mp_obj_t adc_enable(mp_obj_t self_in) {
+    pyb_obj_adc_t *self = self_in;
+
+    MAP_ADCChannelEnable(ADC_BASE, self->channel);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_enable_obj, adc_enable);
+
+/// \method disable()
+/// Disable the adc channel
+STATIC mp_obj_t adc_disable(mp_obj_t self_in) {
+    pyb_obj_adc_t *self = self_in;
+
+    MAP_ADCChannelDisable(ADC_BASE, self->channel);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_disable_obj, adc_disable);
+
+STATIC const mp_map_elem_t adc_locals_dict_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR___del__),             (mp_obj_t)&adc_disable_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_read),                (mp_obj_t)&adc_read_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_enable),              (mp_obj_t)&adc_enable_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_disable),             (mp_obj_t)&adc_disable_obj },
+};
+
+STATIC MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
+
+const mp_obj_type_t pyb_adc_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ADC,
+    .print = adc_print,
+    .make_new = adc_make_new,
+    .locals_dict = (mp_obj_t)&adc_locals_dict,
+};
+

cc3200/mods/pybadc.h

+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef PYBADC_H_
+#define PYBADC_H_
+
+extern const mp_obj_type_t pyb_adc_type;
+
+#endif /* PYBADC_H_ */

cc3200/mods/pybpin.c

@@ -29,7 +29,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/mpstate.h"
 #include "mpconfig.h"
 #include MICROPY_HAL_H
 #include "nlr.h"
@@ -115,31 +114,33 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
 }
 
 void pin_config(const pin_obj_t *self, uint af, uint mode, uint type, uint strength) {
-    // PIN_MODE_0 means it stays as a Pin, else, another peripheral will take control of it
-    if (af == PIN_MODE_0) {
-        // enable the peripheral clock for the GPIO port of this pin
-        switch (self->port) {
-        case PORT_A0:
-            MAP_PRCMPeripheralClkEnable(PRCM_GPIOA0, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
-            break;
-        case PORT_A1:
-            MAP_PRCMPeripheralClkEnable(PRCM_GPIOA1, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
-            break;
-        case PORT_A2:
-            MAP_PRCMPeripheralClkEnable(PRCM_GPIOA2, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
-            break;
-        case PORT_A3:
-            MAP_PRCMPeripheralClkEnable(PRCM_GPIOA3, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
-            break;
-        default:
-            break;
+    // Skip all this if the pin is to be used in analog mode
+    if (type != PIN_TYPE_ANALOG) {
+        // PIN_MODE_0 means it stays as a Pin, else, another peripheral will take control of it
+        if (af == PIN_MODE_0) {
+            // enable the peripheral clock for the GPIO port of this pin
+            switch (self->port) {
+            case PORT_A0:
+                MAP_PRCMPeripheralClkEnable(PRCM_GPIOA0, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+                break;
+            case PORT_A1:
+                MAP_PRCMPeripheralClkEnable(PRCM_GPIOA1, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+                break;
+            case PORT_A2:
+                MAP_PRCMPeripheralClkEnable(PRCM_GPIOA2, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+                break;
+            case PORT_A3:
+                MAP_PRCMPeripheralClkEnable(PRCM_GPIOA3, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+                break;
+            default:
+                break;
+            }
+            // configure the direction
+            MAP_GPIODirModeSet(self->port, self->bit, mode);
         }
-        // configure the direction
-        MAP_GPIODirModeSet(self->port, self->bit, mode);
+        // now set the alternate function, strenght and type
+        MAP_PinModeSet (self->pin_num, af);
     }
-
-    // now set the alternate function, strenght and type
-    MAP_PinModeSet (self->pin_num, af);
     MAP_PinConfigSet(self->pin_num, strength, type);
 }
 
@@ -433,7 +434,7 @@ STATIC const mp_map_elem_t pin_locals_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_OD),          MP_OBJ_NEW_SMALL_INT(PIN_TYPE_OD) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_OD_PU),       MP_OBJ_NEW_SMALL_INT(PIN_TYPE_OD_PU) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_OD_PD),       MP_OBJ_NEW_SMALL_INT(PIN_TYPE_OD_PD) },
-    
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_S2MA),        MP_OBJ_NEW_SMALL_INT(PIN_STRENGTH_2MA) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_S4MA),        MP_OBJ_NEW_SMALL_INT(PIN_STRENGTH_4MA) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_S6MA),        MP_OBJ_NEW_SMALL_INT(PIN_STRENGTH_6MA) },

cc3200/qstrdefsport.h

@@ -156,6 +156,12 @@ Q(mem_write)
 Q(MASTER)
 Q(SLAVE)
 
+// for ADC class
+Q(ADC)
+Q(read)
+Q(enable)
+Q(disable)
+
 // for RTC class
 Q(RTC)
 Q(datetime)