Commit 30216325 authored by Damien George's avatar Damien George
Browse files

stmhal: Shuffle around some init functions in main().

parent 6cfda308
extern I2C_HandleTypeDef I2cHandle;
extern const mp_obj_type_t pyb_accel_type; extern const mp_obj_type_t pyb_accel_type;
void accel_init(void); void accel_init(void);
...@@ -26,12 +26,12 @@ ...@@ -26,12 +26,12 @@
#include "exti.h" #include "exti.h"
#include "usrsw.h" #include "usrsw.h"
#include "usb.h" #include "usb.h"
#include "rng.h"
#include "rtc.h" #include "rtc.h"
#include "storage.h" #include "storage.h"
#include "sdcard.h" #include "sdcard.h"
#include "ff.h" #include "ff.h"
#include "lcd.h" #include "lcd.h"
#include "rng.h"
#include "i2c.h" #include "i2c.h"
#include "accel.h" #include "accel.h"
#include "servo.h" #include "servo.h"
...@@ -221,28 +221,6 @@ soft_reset: ...@@ -221,28 +221,6 @@ soft_reset:
lcd_init(); lcd_init();
#endif #endif
#if MICROPY_HW_ENABLE_RNG
// RNG
rng_init();
#endif
#if MICROPY_HW_ENABLE_SERVO
// servo
servo_init();
#endif
#if 0
#if MICROPY_HW_ENABLE_TIMER
// timer
timer_init();
#endif
#endif
#if MICROPY_HW_ENABLE_DAC
// DAC
dac_init();
#endif
pin_map_init(); pin_map_init();
// check if user switch held (initiates reset of filesystem) // check if user switch held (initiates reset of filesystem)
...@@ -376,6 +354,12 @@ soft_reset: ...@@ -376,6 +354,12 @@ soft_reset:
pyb_usb_dev_init(USBD_DEVICE_CDC_MSC, usbd_medium_kind); pyb_usb_dev_init(USBD_DEVICE_CDC_MSC, usbd_medium_kind);
#endif #endif
#if MICROPY_HW_ENABLE_RNG
// RNG
rng_init();
#endif
// I2C
i2c_init(); i2c_init();
#if MICROPY_HW_HAS_MMA7660 #if MICROPY_HW_HAS_MMA7660
...@@ -383,6 +367,23 @@ soft_reset: ...@@ -383,6 +367,23 @@ soft_reset:
accel_init(); accel_init();
#endif #endif
#if MICROPY_HW_ENABLE_SERVO
// servo
servo_init();
#endif
#if 0
#if MICROPY_HW_ENABLE_TIMER
// timer
timer_init();
#endif
#endif
#if MICROPY_HW_ENABLE_DAC
// DAC
dac_init();
#endif
// run main script // run main script
{ {
vstr_t *vstr = vstr_new(); vstr_t *vstr = vstr_new();
......
...@@ -253,13 +253,6 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = { ...@@ -253,13 +253,6 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_SD), (mp_obj_t)&pyb_sdcard_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_SD), (mp_obj_t)&pyb_sdcard_obj },
#endif #endif
#if MICROPY_HW_HAS_MMA7660
{ MP_OBJ_NEW_QSTR(MP_QSTR_Accel), (mp_obj_t)&pyb_accel_type },
#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_type }, { MP_OBJ_NEW_QSTR(MP_QSTR_Led), (mp_obj_t)&pyb_led_type },
{ MP_OBJ_NEW_QSTR(MP_QSTR_I2C), (mp_obj_t)&pyb_i2c_type }, { MP_OBJ_NEW_QSTR(MP_QSTR_I2C), (mp_obj_t)&pyb_i2c_type },
{ MP_OBJ_NEW_QSTR(MP_QSTR_Usart), (mp_obj_t)&pyb_Usart_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_Usart), (mp_obj_t)&pyb_Usart_obj },
...@@ -271,6 +264,14 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = { ...@@ -271,6 +264,14 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_DAC), (mp_obj_t)&pyb_dac_type }, { MP_OBJ_NEW_QSTR(MP_QSTR_DAC), (mp_obj_t)&pyb_dac_type },
#endif #endif
#if MICROPY_HW_HAS_MMA7660
{ MP_OBJ_NEW_QSTR(MP_QSTR_Accel), (mp_obj_t)&pyb_accel_type },
#endif
#if 0
{ MP_OBJ_NEW_QSTR(MP_QSTR_hid), (mp_obj_t)&pyb_hid_send_report_obj },
#endif
// input // input
{ MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&pyb_input_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&pyb_input_obj },
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment