stmhal - fixed up adc stuff

Added support for the ADC channels and mappings to make_pins.py I'm not sure if the hal properly deals with the channel 16/18 differences between the 40x and 42x. It seems to deal with it partially. This particular aspect will need testing on a 42x or 43x.
chrish42 · Mar 24, 2014 · 1403298 · 1403298
1 parent 6609d63
commit 1403298
Show file tree

Hide file tree

Showing 9 changed files with 424 additions and 43 deletions.
diff --git a/stmhal/Makefile b/stmhal/Makefile
@@ -93,10 +93,10 @@ SRC_C = \
 	accel.c \
 	servo.c \
 	dac.c \
+	adc.c \
 
 #	timer.c \
 #	i2c.c \
-#	adc.c \
 #	pybwlan.c \
 
 SRC_S = \
@@ -105,6 +105,8 @@ SRC_S = \
 
 SRC_HAL = $(addprefix $(HAL_DIR)/src/,\
 	stm32f4xx_hal.c \
+	stm32f4xx_hal_adc.c \
+	stm32f4xx_hal_adc_ex.c \
 	stm32f4xx_hal_cortex.c \
 	stm32f4xx_hal_dac.c \
 	stm32f4xx_hal_dac_ex.c \

diff --git a/stmhal/adc.c b/stmhal/adc.c
@@ -0,0 +1,322 @@
+#include <stdio.h>
+#include <stm32f4xx_hal.h>
+#include <string.h>
+
+#include "misc.h"
+#include "nlr.h"
+#include "mpconfig.h"
+#include "qstr.h"
+#include "obj.h"
+#include "adc.h"
+#include "pin.h"
+#include "build/pins.h"
+
+// Usage Model:
+//
+// adc = pyb.ADC(pin)
+// val = adc.read()
+//
+// adc = pyb.ADC_all(resolution)
+// val = adc.read_channel(channel)
+// val = adc.read_core_temp()
+// val = adc.read_core_vbat()
+// val = adc.read_core_vref()
+
+/* ADC defintions */
+#define ADCx                    (ADC1)
+#define ADCx_CLK_ENABLE         __ADC1_CLK_ENABLE
+#define ADC_NUM_CHANNELS        (19)
+#define ADC_NUM_GPIO_CHANNELS   (16)
+
+#if defined(STM32F405xx) || defined(STM32F415xx) || \
+    defined(STM32F407xx) || defined(STM32F417xx) || \
+    defined(STM32F401xC) || defined(STM32F401xE)
+#define VBAT_DIV (2)
+#elif defined(STM32F427xx) || defined(STM32F429xx) || \
+      defined(STM32F437xx) || defined(STM32F439xx)
+#define VBAT_DIV (4)
+#endif
+
+/* Core temperature sensor definitions */
+#define CORE_TEMP_V25          (943)  /* (0.76v/3.3v)*(2^ADC resoultion) */
+#define CORE_TEMP_AVG_SLOPE    (3)    /* (2.5mv/3.3v)*(2^ADC resoultion) */
+
+typedef struct _pyb_obj_adc_t {
+    mp_obj_base_t base;
+    mp_obj_t pin_name;
+    int channel;
+    ADC_HandleTypeDef handle;
+} pyb_obj_adc_t;
+
+void adc_init_single(pyb_obj_adc_t *adc_obj) {
+    if (!IS_ADC_CHANNEL(adc_obj->channel)) {
+        return;
+    }
+
+    if (adc_obj->channel < ADC_NUM_GPIO_CHANNELS) {
+      // Channels 0-16 correspond to real pins. Configure the GPIO pin in
+      // ADC mode.
+      const pin_obj_t *pin = pin_adc1[adc_obj->channel];
+      GPIO_InitTypeDef GPIO_InitStructure;
+      GPIO_InitStructure.Pin = pin->pin_mask;
+      GPIO_InitStructure.Mode = GPIO_MODE_ANALOG;
+      GPIO_InitStructure.Pull = GPIO_NOPULL;
+      HAL_GPIO_Init(pin->gpio, &GPIO_InitStructure);
+    }
+
+    ADCx_CLK_ENABLE();
+
+    ADC_HandleTypeDef *adcHandle = &adc_obj->handle;
+    adcHandle->Instance                   = ADCx;
+    adcHandle->Init.ClockPrescaler        = ADC_CLOCKPRESCALER_PCLK_DIV2;
+    adcHandle->Init.Resolution            = ADC_RESOLUTION12b;
+    adcHandle->Init.ScanConvMode          = DISABLE;
+    adcHandle->Init.ContinuousConvMode    = DISABLE;
+    adcHandle->Init.DiscontinuousConvMode = DISABLE;
+    adcHandle->Init.NbrOfDiscConversion   = 0;
+    adcHandle->Init.ExternalTrigConvEdge  = ADC_EXTERNALTRIGCONVEDGE_NONE;
+    adcHandle->Init.ExternalTrigConv      = ADC_EXTERNALTRIGCONV_T1_CC1;
+    adcHandle->Init.DataAlign             = ADC_DATAALIGN_RIGHT;
+    adcHandle->Init.NbrOfConversion       = 1;
+    adcHandle->Init.DMAContinuousRequests = DISABLE;
+    adcHandle->Init.EOCSelection          = DISABLE;
+
+    HAL_ADC_Init(adcHandle);
+
+    ADC_ChannelConfTypeDef sConfig;
+
+    sConfig.Channel = adc_obj->channel;
+    sConfig.Rank = 1;
+    sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES;
+    sConfig.Offset = 0;
+
+    HAL_ADC_ConfigChannel(adcHandle, &sConfig);
+}
+
+uint32_t adc_read_channel(ADC_HandleTypeDef *adcHandle)
+{
+    uint32_t rawValue = 0;
+
+    HAL_ADC_Start(adcHandle);
+    if (HAL_ADC_PollForConversion(adcHandle, 10) == HAL_OK) \
+    &&  HAL_ADC_GetState(adcHandle) == HAL_ADC_STATE_EOC_REG) {
+        rawValue = HAL_ADC_GetValue(adcHandle);
+    }
+    HAL_ADC_Stop(adcHandle);
+
+    return rawValue;
+}
+
+/******************************************************************************/
+/* Micro Python bindings : adc object (single channel)                        */
+
+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 on ");
+    mp_obj_print_helper(print, env, self->pin_name, PRINT_STR);
+    print(env, " channel=%lu>", self->channel);
+}
+
+static mp_obj_t adc_read(mp_obj_t self_in) {
+    pyb_obj_adc_t *self = self_in;
+
+    uint32_t data = adc_read_channel(&self->handle);
+    return mp_obj_new_int(data);
+}
+
+static MP_DEFINE_CONST_FUN_OBJ_1(adc_read_obj, adc_read);
+
+static const mp_method_t adc_methods[] = {
+    { "read", &adc_read_obj},
+    { NULL, NULL },
+};
+
+static const mp_obj_type_t adc_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ADC,
+    .print = adc_print,
+    .methods = adc_methods,
+};
+
+mp_obj_t pyb_ADC(mp_obj_t pin_obj) {
+
+    uint32_t channel;
+
+    if (MP_OBJ_IS_INT(pin_obj)) {
+        channel = mp_obj_get_int(pin_obj);
+    } else {
+        const pin_obj_t *pin = pin_map_user_obj(pin_obj);
+        if ((pin->adc_num & PIN_ADC1) == 0) {
+            // No ADC1 function on that pin
+            nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "pin %s does not have ADC capabilities", pin->name));
+        }
+        channel = pin->adc_channel;
+    }
+
+    if (!IS_ADC_CHANNEL(channel)) {
+        nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Not a valid ADC Channel: %d", channel));
+    }
+    if (pin_adc1[channel] == NULL) {
+        nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Channel %d not available on this board", channel));
+    }
+
+    pyb_obj_adc_t *o = m_new_obj(pyb_obj_adc_t);
+    memset(o, 0, sizeof(*o));
+    o->base.type = &adc_type;
+    o->pin_name = pin_obj;
+    o->channel = channel;
+    adc_init_single(o);
+
+    return o;
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(pyb_ADC_obj, pyb_ADC);
+
+/******************************************************************************/
+/* adc all object                                                             */
+
+typedef struct _pyb_obj_adc_all_t {
+    mp_obj_base_t base;
+    ADC_HandleTypeDef handle;
+} pyb_obj_adc_all_t;
+
+void adc_init_all(pyb_obj_adc_all_t *adc_all, uint32_t resolution) {
+
+    switch (resolution) {
+        case 6:     resolution = ADC_RESOLUTION6b;  break;
+        case 8:     resolution = ADC_RESOLUTION8b;  break;
+        case 10:    resolution = ADC_RESOLUTION10b; break;
+        case 12:    resolution = ADC_RESOLUTION12b; break;
+        default:
+            nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
+                "resolution %d not supported", resolution));
+    }
+
+    for (uint32_t channel = 0; channel < ADC_NUM_GPIO_CHANNELS; channel++) {
+        // Channels 0-16 correspond to real pins. Configure the GPIO pin in
+        // ADC mode.
+        const pin_obj_t *pin = pin_adc1[channel];
+        GPIO_InitTypeDef GPIO_InitStructure;
+        GPIO_InitStructure.Pin = pin->pin_mask;
+        GPIO_InitStructure.Mode = GPIO_MODE_ANALOG;
+        GPIO_InitStructure.Pull = GPIO_NOPULL;
+        HAL_GPIO_Init(pin->gpio, &GPIO_InitStructure);
+    }
+
+    ADCx_CLK_ENABLE();
+
+    ADC_HandleTypeDef *adcHandle = &adc_all->handle;
+    adcHandle->Instance = ADCx;
+    adcHandle->Init.ClockPrescaler        = ADC_CLOCKPRESCALER_PCLK_DIV2;
+    adcHandle->Init.Resolution            = resolution;
+    adcHandle->Init.ScanConvMode          = DISABLE;
+    adcHandle->Init.ContinuousConvMode    = DISABLE;
+    adcHandle->Init.DiscontinuousConvMode = DISABLE;
+    adcHandle->Init.NbrOfDiscConversion   = 0;
+    adcHandle->Init.ExternalTrigConvEdge  = ADC_EXTERNALTRIGCONVEDGE_NONE;
+    adcHandle->Init.ExternalTrigConv      = ADC_EXTERNALTRIGCONV_T1_CC1;
+    adcHandle->Init.DataAlign             = ADC_DATAALIGN_RIGHT;
+    adcHandle->Init.NbrOfConversion       = 1;
+    adcHandle->Init.DMAContinuousRequests = DISABLE;
+    adcHandle->Init.EOCSelection          = DISABLE;
+
+    HAL_ADC_Init(adcHandle);
+}
+
+uint32_t adc_config_and_read_channel(ADC_HandleTypeDef *adcHandle, uint32_t channel)
+{
+    ADC_ChannelConfTypeDef sConfig;
+    sConfig.Channel = channel;
+    sConfig.Rank = 1;
+    sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES;
+    sConfig.Offset = 0;
+    HAL_ADC_ConfigChannel(adcHandle, &sConfig);
+
+    return adc_read_channel(adcHandle);
+}
+
+int adc_read_core_temp(ADC_HandleTypeDef *adcHandle)
+{
+    int32_t raw_value = adc_config_and_read_channel(adcHandle, ADC_CHANNEL_TEMPSENSOR);
+
+    return ((raw_value - CORE_TEMP_V25) / CORE_TEMP_AVG_SLOPE) + 25;
+}
+
+float adc_read_core_vbat(ADC_HandleTypeDef *adcHandle)
+{
+    uint32_t raw_value = adc_config_and_read_channel(adcHandle, ADC_CHANNEL_VBAT);
+
+    return raw_value * VBAT_DIV / 4096.0f * 3.3f;
+}
+
+float adc_read_core_vref(ADC_HandleTypeDef *adcHandle)
+{
+    uint32_t raw_value = adc_config_and_read_channel(adcHandle, ADC_CHANNEL_VREFINT);
+
+    return raw_value * VBAT_DIV / 4096.0f * 3.3f;
+}
+
+/******************************************************************************/
+/* Micro Python bindings : adc_all object                                     */
+
+static void adc_all_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
+    print(env, "<ADC all>");
+}
+
+static mp_obj_t adc_all_read_channel(mp_obj_t self_in, mp_obj_t channel) {
+    pyb_obj_adc_all_t *self = self_in;
+
+    uint32_t chan = mp_obj_get_int(channel);
+    uint32_t data = adc_config_and_read_channel(&self->handle, chan);
+    return mp_obj_new_int(data);
+}
+
+static mp_obj_t adc_all_read_core_temp(mp_obj_t self_in) {
+    pyb_obj_adc_all_t *self = self_in;
+
+    int data  = adc_read_core_temp(&self->handle);
+    return mp_obj_new_int(data);
+}
+
+static mp_obj_t adc_all_read_core_vbat(mp_obj_t self_in) {
+    pyb_obj_adc_all_t *self = self_in;
+
+    float data = adc_read_core_vbat(&self->handle);
+    return mp_obj_new_float(data);
+}
+
+static mp_obj_t adc_all_read_core_vref(mp_obj_t self_in) {
+    pyb_obj_adc_all_t *self = self_in;
+
+    float data  = adc_read_core_vref(&self->handle);
+    return mp_obj_new_float(data);
+}
+
+static MP_DEFINE_CONST_FUN_OBJ_2(adc_all_read_channel_obj, adc_all_read_channel);
+static MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_temp_obj, adc_all_read_core_temp);
+static MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_vbat_obj, adc_all_read_core_vbat);
+static MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_vref_obj, adc_all_read_core_vref);
+
+static const mp_method_t adc_all_methods[] = {
+    { "read_channel",   &adc_all_read_channel_obj},
+    { "read_core_temp", &adc_all_read_core_temp_obj},
+    { "read_core_vbat", &adc_all_read_core_vbat_obj},
+    { "read_core_vref", &adc_all_read_core_vref_obj},
+    { NULL, NULL },
+};
+
+static const mp_obj_type_t adc_all_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ADC,
+    .print = adc_all_print,
+    .methods = adc_all_methods,
+};
+
+mp_obj_t pyb_ADC_all(mp_obj_t resolution) {
+    pyb_obj_adc_all_t *o = m_new_obj(pyb_obj_adc_all_t);
+    o->base.type = &adc_all_type;
+    adc_init_all(o, mp_obj_get_int(resolution));
+    return o;
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(pyb_ADC_all_obj, pyb_ADC_all);
diff --git a/stmhal/adc.h b/stmhal/adc.h
@@ -0,0 +1,2 @@
+MP_DECLARE_CONST_FUN_OBJ(pyb_ADC_all_obj);
+MP_DECLARE_CONST_FUN_OBJ(pyb_ADC_obj);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		MP_DECLARE_CONST_FUN_OBJ(pyb_ADC_all_obj);
		MP_DECLARE_CONST_FUN_OBJ(pyb_ADC_obj);