summaryrefslogtreecommitdiffstatshomepage
path: root/stmhal/pybmodule.c
diff options
context:
space:
mode:
authorDave Hylands <dhylands@gmail.com>2014-03-14 23:41:28 -0700
committerDave Hylands <dhylands@gmail.com>2014-03-14 23:41:28 -0700
commitca5444e6cd8b566bd4ad78e84162e03ec18e01b6 (patch)
tree64369de8ac0ef6214112340da70c78c474567dc7 /stmhal/pybmodule.c
parent0a64c92a9c3bd7d648c8a0d087fa7e739a5eeaa3 (diff)
downloadmicropython-ca5444e6cd8b566bd4ad78e84162e03ec18e01b6.tar.gz
micropython-ca5444e6cd8b566bd4ad78e84162e03ec18e01b6.zip
stmhal - add pin mapping, gpio, exti, usrsw
Diffstat (limited to 'stmhal/pybmodule.c')
-rw-r--r--stmhal/pybmodule.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/stmhal/pybmodule.c b/stmhal/pybmodule.c
index 2abcb23700..0d2b914ded 100644
--- a/stmhal/pybmodule.c
+++ b/stmhal/pybmodule.c
@@ -16,21 +16,21 @@
#include "systick.h"
#include "pyexec.h"
#include "led.h"
+#include "gpio.h"
+#include "pin.h"
+#include "exti.h"
+#include "usrsw.h"
#if 0
#include "rtc.h"
#include "servo.h"
#include "storage.h"
#include "usb.h"
-#include "usrsw.h"
#include "sdcard.h"
#include "accel.h"
#include "i2c.h"
#include "usart.h"
#include "adc.h"
#include "audio.h"
-#include "pin.h"
-#include "gpio.h"
-#include "exti.h"
#endif
#include "pybmodule.h"
@@ -252,11 +252,13 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_servo), (mp_obj_t)&pyb_servo_set_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_Servo), (mp_obj_t)&pyb_Servo_obj },
#endif
+#endif
#if MICROPY_HW_HAS_SWITCH
{ MP_OBJ_NEW_QSTR(MP_QSTR_switch), (mp_obj_t)&pyb_switch_obj },
#endif
+#if 0
#if MICROPY_HW_HAS_SDCARD
{ MP_OBJ_NEW_QSTR(MP_QSTR_SD), (mp_obj_t)&pyb_sdcard_obj },
#endif
@@ -279,6 +281,7 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = {
#if MICROPY_HW_ENABLE_AUDIO
{ MP_OBJ_NEW_QSTR(MP_QSTR_Audio), (mp_obj_t)&pyb_Audio_obj },
#endif
+#endif
// pin mapper
{ MP_OBJ_NEW_QSTR(MP_QSTR_Pin), (mp_obj_t)&pin_map_obj },
@@ -287,15 +290,14 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_gpio), (mp_obj_t)&pyb_gpio_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_gpio_in), (mp_obj_t)&pyb_gpio_input_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_gpio_out), (mp_obj_t)&pyb_gpio_output_obj },
- { MP_OBJ_NEW_QSTR(MP_QSTR_PULL_NONE), MP_OBJ_NEW_SMALL_INT(GPIO_PuPd_NOPULL) },
- { MP_OBJ_NEW_QSTR(MP_QSTR_PULL_UP), MP_OBJ_NEW_SMALL_INT(GPIO_PuPd_UP) },
- { MP_OBJ_NEW_QSTR(MP_QSTR_PULL_DOWN), MP_OBJ_NEW_SMALL_INT(GPIO_PuPd_DOWN) },
- { MP_OBJ_NEW_QSTR(MP_QSTR_PUSH_PULL), MP_OBJ_NEW_SMALL_INT(GPIO_OType_PP) },
- { MP_OBJ_NEW_QSTR(MP_QSTR_OPEN_DRAIN), MP_OBJ_NEW_SMALL_INT(GPIO_OType_OD) },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_PULL_NONE), MP_OBJ_NEW_SMALL_INT(GPIO_NOPULL) },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_PULL_UP), MP_OBJ_NEW_SMALL_INT(GPIO_PULLUP) },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_PULL_DOWN), MP_OBJ_NEW_SMALL_INT(GPIO_PULLDOWN) },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_PUSH_PULL), MP_OBJ_NEW_SMALL_INT(GPIO_MODE_OUTPUT_PP) },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_OPEN_DRAIN), MP_OBJ_NEW_SMALL_INT(GPIO_MODE_OUTPUT_OD) },
// EXTI bindings
{ MP_OBJ_NEW_QSTR(MP_QSTR_Exti), (mp_obj_t)&exti_obj_type },
-#endif
};
STATIC const mp_map_t pyb_module_globals = {