summaryrefslogtreecommitdiff
path: root/stmhal/adc.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-09-29 12:18:48 +0100
committerDamien George <damien.p.george@gmail.com>2014-09-29 12:18:48 +0100
commitbf683e6b323b3ebab3be2fd65c24c8a65698124d (patch)
treed0a3eadd0fc0296fa9a9dcd551629794fe88b11c /stmhal/adc.c
parentf90b59e61035c194470b7de589cfc3b44484b1fe (diff)
parent39296b40d49b4b6b9373a80de67e017e540f1408 (diff)
Merge pull request #877 from dhylands/timer-overflow
Fix timer overflow code.
Diffstat (limited to 'stmhal/adc.c')
-rw-r--r--stmhal/adc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/stmhal/adc.c b/stmhal/adc.c
index 3a93c20ab..6044931ec 100644
--- a/stmhal/adc.c
+++ b/stmhal/adc.c
@@ -349,6 +349,7 @@ int adc_read_core_temp(ADC_HandleTypeDef *adcHandle) {
return ((raw_value - CORE_TEMP_V25) / CORE_TEMP_AVG_SLOPE) + 25;
}
+#if MICROPY_PY_BUILTINS_FLOAT
float adc_read_core_vbat(ADC_HandleTypeDef *adcHandle) {
uint32_t raw_value = adc_config_and_read_channel(adcHandle, ADC_CHANNEL_VBAT);
@@ -368,6 +369,7 @@ float adc_read_core_vref(ADC_HandleTypeDef *adcHandle) {
return raw_value * VBAT_DIV / 4096.0f * 3.3f;
}
+#endif
/******************************************************************************/
/* Micro Python bindings : adc_all object */
@@ -399,6 +401,7 @@ STATIC mp_obj_t adc_all_read_core_temp(mp_obj_t self_in) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_temp_obj, adc_all_read_core_temp);
+#if MICROPY_PY_BUILTINS_FLOAT
STATIC mp_obj_t adc_all_read_core_vbat(mp_obj_t self_in) {
pyb_adc_all_obj_t *self = self_in;
float data = adc_read_core_vbat(&self->handle);
@@ -412,12 +415,15 @@ STATIC mp_obj_t adc_all_read_core_vref(mp_obj_t self_in) {
return mp_obj_new_float(data);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_vref_obj, adc_all_read_core_vref);
+#endif
STATIC const mp_map_elem_t adc_all_locals_dict_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_read_channel), (mp_obj_t)&adc_all_read_channel_obj},
{ MP_OBJ_NEW_QSTR(MP_QSTR_read_core_temp), (mp_obj_t)&adc_all_read_core_temp_obj},
+#if MICROPY_PY_BUILTINS_FLOAT
{ MP_OBJ_NEW_QSTR(MP_QSTR_read_core_vbat), (mp_obj_t)&adc_all_read_core_vbat_obj},
{ MP_OBJ_NEW_QSTR(MP_QSTR_read_core_vref), (mp_obj_t)&adc_all_read_core_vref_obj},
+#endif
};
STATIC MP_DEFINE_CONST_DICT(adc_all_locals_dict, adc_all_locals_dict_table);