diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-22 22:56:17 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-22 22:56:17 +0000 |
| commit | 8bcc52e8341368c73edf094e288a4f514b84028a (patch) | |
| tree | 6344c33d8e82602818bb5f785c3eb740a23bab65 /stm/main.c | |
| parent | b5d13c309f00b0c959c0806c1ab11ba7a07c2cee (diff) | |
| parent | 66db7bf69fdd94f8ff20b30698cffd111058b2bb (diff) | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'stm/main.c')
| -rw-r--r-- | stm/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stm/main.c b/stm/main.c index acb76b012..40831c993 100644 --- a/stm/main.c +++ b/stm/main.c @@ -803,7 +803,7 @@ soft_reset: rt_store_attr(m, MP_QSTR_switch, (mp_obj_t)&pyb_switch_obj); rt_store_attr(m, MP_QSTR_servo, rt_make_function_n(2, pyb_servo_set)); rt_store_attr(m, MP_QSTR_pwm, rt_make_function_n(2, pyb_pwm_set)); -#if BOARD_HAS_MMA7660 +#if MICROPY_HW_HAS_MMA7660 rt_store_attr(m, MP_QSTR_accel, (mp_obj_t)&pyb_mma_read_obj); rt_store_attr(m, MP_QSTR_mma_read, (mp_obj_t)&pyb_mma_read_all_obj); rt_store_attr(m, MP_QSTR_mma_mode, (mp_obj_t)&pyb_mma_write_mode_obj); @@ -925,7 +925,7 @@ soft_reset: //rt_store_name(qstr_from_str("u_c"), rt_make_function_n(0, pyb_usbh_connect)); if (first_soft_reset) { -#if BOARD_HAS_MMA7660 +#if MICROPY_HW_HAS_MMA7660 // MMA: init and reset address to zero mma_init(); #endif @@ -956,7 +956,7 @@ soft_reset: } -#if BOARD_HAS_MMA7660 +#if MICROPY_HW_HAS_MMA7660 // HID example if (0) { uint8_t data[4]; |