diff --git a/app/User/main.c b/app/User/main.c index 5e3614b..19c0cab 100644 --- a/app/User/main.c +++ b/app/User/main.c @@ -23,7 +23,8 @@ #include "./SYSTEM/delay/delay.h" #include "./SYSTEM/sys/sys.h" #include "./SYSTEM/usart/usart.h" -#include "freertos_demo.h" + +#define HARDWARE_TEST 1 int main(void) { HAL_Init(); /* 初始化HAL库 */ @@ -34,5 +35,13 @@ int main(void) { led_init(); /* 初始化LED */ key_init(); /* 初始化按键 */ - freertos_demo(); /* 创建lwIP的任务函数 */ +#if !HARDWARE_TEST + extern void user_main(); + user_main(); +#endif + +#if HARDWARE_TEST + extern void hardware_main(); + hardware_main(); +#endif } diff --git a/src/hardware_main.c b/src/hardware_main.c index e953bc0..8f4948d 100644 --- a/src/hardware_main.c +++ b/src/hardware_main.c @@ -5,15 +5,15 @@ #include "config.h" #include "encoder_acquistion_service.h" -//#include "iwdg.h" -//#include +// #include "iwdg.h" +// #include +#include "lwip/api.h" #include "lwip/opt.h" #include "lwip/sys.h" -#include "lwip/api.h" #include "main.h" #include "protocol.h" -//#include "src/demosrc/freertos_demo.h" -//#include "usart.h" +#include "freertos_demo.h" +// #include "usart.h" #include "zboard.h" #include "zport.h" // @@ -22,13 +22,7 @@ #define TAG "HARDWARE_MAIN" void hardware_main() { -// sram_init(); /* SRAM初始化 */ - -// my_mem_init(SRAMIN); /* 初始化内部SRAM内存池 */ -// my_mem_init(SRAMEX); /* 初始化外部SRAM内存池 */ -// my_mem_init(SRAMCCM); /* 初始化内部CCM内存池 */ - -// freertos_demo(); + freertos_demo(); /* 创建lwIP的任务函数 */ // ZLOGI(TAG, "start hardware test"); // while (1) {