From 075f79708af2019c7087766ef2ed7d6ed4fc12e5 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Sun, 27 Apr 2014 10:02:52 +0800 Subject: [PATCH] [bsp/stm32f40x] code cleanup. --- bsp/stm32f40x/applications/application.c | 138 ++--------------------- 1 file changed, 7 insertions(+), 131 deletions(-) diff --git a/bsp/stm32f40x/applications/application.c b/bsp/stm32f40x/applications/application.c index 27f91da29..d4ad72f64 100644 --- a/bsp/stm32f40x/applications/application.c +++ b/bsp/stm32f40x/applications/application.c @@ -10,16 +10,9 @@ * Change Logs: * Date Author Notes * 2009-01-05 Bernard the first version + * 2014-04-27 Bernard make code cleanup. */ -/** - * @addtogroup STM32 - */ -/*@{*/ - -#include - -#include "stm32f4xx.h" #include #include @@ -49,135 +42,18 @@ void rt_init_thread_entry(void* parameter) rt_kprintf("TCP/IP initialized!\n"); } #endif - -//FS - -//GUI -} - -float f_var1; -float f_var2; -float f_var3; -float f_var4; - -ALIGN(RT_ALIGN_SIZE) -static char thread_led1_stack[1024]; -struct rt_thread thread_led1; -static void rt_thread_entry_led1(void* parameter) -{ - GPIO_InitTypeDef GPIO_InitStructure; - - /* GPIOD Periph clock enable */ - RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOD, ENABLE); - - /* Configure PD12, PD13, PD14 and PD15 in output pushpull mode */ - GPIO_InitStructure.GPIO_Pin = GPIO_Pin_12 | GPIO_Pin_13| GPIO_Pin_14| GPIO_Pin_15; - GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT; - GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz; - GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL; - GPIO_Init(GPIOD, &GPIO_InitStructure); - - f_var1 = 3.141592653; - f_var2 = 123.456; - f_var3 = 0.123456789; - f_var4 = 1.00001; - - while (1) - { - /* PD12 to be toggled */ - GPIO_SetBits(GPIOD, GPIO_Pin_12); - - /* Insert delay */ - rt_thread_delay(RT_TICK_PER_SECOND/2); - f_var3 += f_var4; - f_var4 = f_var4 * f_var4; - - /* PD13 to be toggled */ - GPIO_SetBits(GPIOD, GPIO_Pin_13); - - /* Insert delay */ - rt_thread_delay(RT_TICK_PER_SECOND/2); - f_var3 += f_var4; - f_var4 = f_var4 * f_var4; - - /* PD14 to be toggled */ - GPIO_SetBits(GPIOD, GPIO_Pin_14); - - /* Insert delay */ - rt_thread_delay(RT_TICK_PER_SECOND/2); - f_var3 += f_var4; - f_var4 = f_var4 * f_var4; - - /* PD15 to be toggled */ - GPIO_SetBits(GPIOD, GPIO_Pin_15); - - /* Insert delay */ - rt_thread_delay(RT_TICK_PER_SECOND*2); - f_var3 += f_var4; - f_var4 = f_var4 * f_var4; - - GPIO_ResetBits(GPIOD, GPIO_Pin_12|GPIO_Pin_13|GPIO_Pin_14|GPIO_Pin_15); - - /* Insert delay */ - rt_thread_delay(RT_TICK_PER_SECOND); - f_var3 += f_var4; - f_var4 = f_var4 * f_var4; - } -} - - -ALIGN(RT_ALIGN_SIZE) -static char thread_led2_stack[1024]; -struct rt_thread thread_led2; -static void rt_thread_entry_led2(void* parameter) -{ - float f_var_me; - - char str_buffer[256]; - while(1) - { - f_var_me = f_var1 * f_var2 + f_var3; - sprintf(str_buffer, "%f", f_var_me); - rt_kprintf("thread1 %s\r\n", str_buffer); - rt_thread_delay(RT_TICK_PER_SECOND); - } } int rt_application_init() { - rt_thread_t init_thread; - -#if (RT_THREAD_PRIORITY_MAX == 32) - init_thread = rt_thread_create("init", - rt_init_thread_entry, RT_NULL, - 2048, 8, 20); -#else - init_thread = rt_thread_create("init", - rt_init_thread_entry, RT_NULL, - 2048, 80, 20); -#endif - - if (init_thread != RT_NULL) - rt_thread_startup(init_thread); + rt_thread_t tid; - //------- init led1 thread - rt_thread_init(&thread_led1, - "led1", - rt_thread_entry_led1, - RT_NULL, - &thread_led1_stack[0], - sizeof(thread_led1_stack),11,5); - rt_thread_startup(&thread_led1); + tid = rt_thread_create("init", + rt_init_thread_entry, RT_NULL, + 2048, RT_THREAD_PRIORITY_MAX/3, 20); - //------- init led2 thread - rt_thread_init(&thread_led2, - "led2", - rt_thread_entry_led2, - RT_NULL, - &thread_led2_stack[0], - sizeof(thread_led2_stack),11,5); - rt_thread_startup(&thread_led2); + if (tid != RT_NULL) + rt_thread_startup(tid); return 0; } -- GitLab