diff options
| author | Rachel Dowdall <rjdowdall@gmail.com> | 2014-03-22 12:17:36 +0000 |
|---|---|---|
| committer | Rachel Dowdall <rjdowdall@gmail.com> | 2014-03-22 12:17:36 +0000 |
| commit | 17f45d41fefdb75fb76fca00ce4d7d5e158b6ea5 (patch) | |
| tree | 36077e73d30aa91f94ed74b707facc86b7ed7937 /stmhal/pybmodule.c | |
| parent | 300c8bd4c2c0c6d626a6aaeb873c22a8f8b9fc3f (diff) | |
| parent | da8d21e0dd236ae5e31bfac4ff8d5b73ddd49282 (diff) | |
| download | micropython-17f45d41fefdb75fb76fca00ce4d7d5e158b6ea5.tar.gz micropython-17f45d41fefdb75fb76fca00ce4d7d5e158b6ea5.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'stmhal/pybmodule.c')
| -rw-r--r-- | stmhal/pybmodule.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/stmhal/pybmodule.c b/stmhal/pybmodule.c index b6b269b065..3db23dc6de 100644 --- a/stmhal/pybmodule.c +++ b/stmhal/pybmodule.c @@ -21,10 +21,10 @@ #include "usart.h" #include "storage.h" #include "sdcard.h" +#include "accel.h" #if 0 #include "servo.h" #include "usb.h" -#include "accel.h" #include "i2c.h" #include "adc.h" #include "audio.h" @@ -256,13 +256,13 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_SD), (mp_obj_t)&pyb_sdcard_obj }, #endif -#if 0 #if MICROPY_HW_HAS_MMA7660 { MP_OBJ_NEW_QSTR(MP_QSTR_accel), (mp_obj_t)&pyb_accel_read_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_accel_read), (mp_obj_t)&pyb_accel_read_all_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_accel_mode), (mp_obj_t)&pyb_accel_write_mode_obj }, + //{ MP_OBJ_NEW_QSTR(MP_QSTR_accel_read), (mp_obj_t)&pyb_accel_read_all_obj }, + //{ MP_OBJ_NEW_QSTR(MP_QSTR_accel_mode), (mp_obj_t)&pyb_accel_write_mode_obj }, #endif +#if 0 { MP_OBJ_NEW_QSTR(MP_QSTR_hid), (mp_obj_t)&pyb_hid_send_report_obj }, #endif { MP_OBJ_NEW_QSTR(MP_QSTR_Led), (mp_obj_t)&pyb_Led_obj }, |