diff options
| author | mux <freelancer.c@gmail.com> | 2014-01-22 20:34:02 +0200 |
|---|---|---|
| committer | mux <freelancer.c@gmail.com> | 2014-01-22 20:34:02 +0200 |
| commit | 3c7e71fb002c71ba8de30ed377e98dfddd478e67 (patch) | |
| tree | 5df5c32d024e0192695a23bfae424970ef954995 | |
| parent | 630d8ff89f6d2a950915c140cc6e420ab4d952cd (diff) | |
| download | micropython-3c7e71fb002c71ba8de30ed377e98dfddd478e67.tar.gz micropython-3c7e71fb002c71ba8de30ed377e98dfddd478e67.zip | |
Fix Feature Macro Prefix
| -rw-r--r-- | stm/main.c | 6 | ||||
| -rw-r--r-- | stm/mpconfigport.h | 54 |
2 files changed, 30 insertions, 30 deletions
diff --git a/stm/main.c b/stm/main.c index fe363eb715..4a16576f4d 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 HAVE_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); @@ -923,7 +923,7 @@ soft_reset: //pyb_usbh_init(); if (first_soft_reset) { -#if HAVE_MMA7660 +#if MICROPY_HW_HAS_MMA7660 // MMA: init and reset address to zero mma_init(); #endif @@ -954,7 +954,7 @@ soft_reset: } -#if HAVE_MMA7660 +#if MICROPY_HW_HAS_MMA7660 // HID example if (0) { uint8_t data[4]; diff --git a/stm/mpconfigport.h b/stm/mpconfigport.h index 0f11dd7371..4bd7537807 100644 --- a/stm/mpconfigport.h +++ b/stm/mpconfigport.h @@ -28,15 +28,15 @@ machine_float_t machine_sqrt(machine_float_t x); //#define STM32F4DISC #if defined (PYBOARD) - #define HAVE_SWITCH (1) - #define HAVE_SDCARD (1) - #define HAVE_MMA7660 (1) - #define HAVE_LIS3DSH (0) - #define ENABLE_RNG (1) - #define ENABLE_RTC (1) - #define ENABLE_TIMER (1) - #define ENABLE_SERVO (1) - #define ENABLE_AUDIO (0) + #define MICROPY_HW_HAS_SWITCH (1) + #define MICROPY_HW_HAS_SDCARD (1) + #define MICROPY_HW_HAS_MMA7660 (1) + #define MICROPY_HW_HAS_LIS3DSH (0) + #define MICROPY_HW_ENABLE_RNG (1) + #define MICROPY_HW_ENABLE_RTC (1) + #define MICROPY_HW_ENABLE_TIMER (1) + #define MICROPY_HW_ENABLE_SERVO (1) + #define MICROPY_HW_ENABLE_AUDIO (0) #define USRSW_PORT (GPIOA) #define USRSW_PIN (GPIO_Pin_13) @@ -47,15 +47,15 @@ machine_float_t machine_sqrt(machine_float_t x); #define USRSW_EXTI_IRQN (EXTI15_10_IRQn) #define USRSW_EXTI_EDGE (EXTI_Trigger_Rising) #elif defined (PYBOARD4) - #define HAVE_SWITCH (1) - #define HAVE_SDCARD (1) - #define HAVE_MMA7660 (1) - #define HAVE_LIS3DSH (0) - #define ENABLE_RNG (1) - #define ENABLE_RTC (1) - #define ENABLE_TIMER (1) - #define ENABLE_SERVO (1) - #define ENABLE_AUDIO (0) + #define MICROPY_HW_HAS_SWITCH (1) + #define MICROPY_HW_HAS_SDCARD (1) + #define MICROPY_HW_HAS_MMA7660 (1) + #define MICROPY_HW_HAS_LIS3DSH (0) + #define MICROPY_HW_ENABLE_RNG (1) + #define MICROPY_HW_ENABLE_RTC (1) + #define MICROPY_HW_ENABLE_TIMER (1) + #define MICROPY_HW_ENABLE_SERVO (1) + #define MICROPY_HW_ENABLE_AUDIO (0) #define USRSW_PORT (GPIOB) #define USRSW_PIN (GPIO_Pin_3) @@ -66,15 +66,15 @@ machine_float_t machine_sqrt(machine_float_t x); #define USRSW_EXTI_IRQN (EXTI15_10_IRQn) #define USRSW_EXTI_EDGE (EXTI_Trigger_Rising) #elif defined (STM32F4DISC) - #define HAVE_SWITCH (1) - #define HAVE_SDCARD (0) - #define HAVE_MMA7660 (0) - #define HAVE_LIS3DSH (1) - #define ENABLE_RNG (1) - #define ENABLE_RTC (1) - #define ENABLE_TIMER (1) - #define ENABLE_SERVO (0) - #define ENABLE_AUDIO (0) + #define MICROPY_HW_HAS_SWITCH (1) + #define MICROPY_HW_HAS_SDCARD (0) + #define MICROPY_HW_HAS_MMA7660 (0) + #define MICROPY_HW_HAS_LIS3DSH (1) + #define MICROPY_HW_ENABLE_RNG (1) + #define MICROPY_HW_ENABLE_RTC (1) + #define MICROPY_HW_ENABLE_TIMER (1) + #define MICROPY_HW_ENABLE_SERVO (0) + #define MICROPY_HW_ENABLE_AUDIO (0) #define USRSW_PORT (GPIOA) #define USRSW_PIN (GPIO_Pin_0) |