From 7d8cfef8665afa12dc9d3f70f0fbcb1cb6691e2d Mon Sep 17 00:00:00 2001 From: ze9hyr Date: Thu, 9 Sep 2021 18:38:43 +0800 Subject: 删除driver中的led相应文件改成直接使用pin操作 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/acm32f0x0-nucleo/applications/main.c | 27 +--- bsp/acm32f0x0-nucleo/drivers/board.h | 1 - bsp/acm32f0x0-nucleo/drivers/led.c | 67 ---------- bsp/acm32f0x0-nucleo/drivers/led.h | 21 --- bsp/acm32f0x0-nucleo/project.uvoptx | 222 +++++++++++++++---------------- bsp/acm32f0x0-nucleo/project.uvprojx | 141 ++++++++++---------- 6 files changed, 179 insertions(+), 300 deletions(-) delete mode 100644 bsp/acm32f0x0-nucleo/drivers/led.c delete mode 100644 bsp/acm32f0x0-nucleo/drivers/led.h diff --git a/bsp/acm32f0x0-nucleo/applications/main.c b/bsp/acm32f0x0-nucleo/applications/main.c index 77e1ab1538..2e827e89f2 100644 --- a/bsp/acm32f0x0-nucleo/applications/main.c +++ b/bsp/acm32f0x0-nucleo/applications/main.c @@ -11,34 +11,19 @@ #include #include #include "board.h" +#include -/******************************************************************************* -* Function Name : assert_failed -* Description : Reports the name of the source file and the source line number -* where the assert error has occurred. -* Input : - file: pointer to the source file name -* - line: assert error line source number -* Output : None -* Return : None -*******************************************************************************/ - -void assert_failed(uint8_t *file, uint32_t line) -{ - rt_kprintf("\n\r Wrong parameter value detected on\r\n"); - rt_kprintf(" file %s\r\n", file); - rt_kprintf(" line %d\r\n", line); - - while (1) ; -} +#define LED_PIN_NUM 1 /* PA1 */ int main(void) { - rt_hw_led_init(); + rt_pin_mode(LED_PIN_NUM, PIN_MODE_OUTPUT); + while(1) { - rt_hw_led_on(0); + rt_pin_write(LED_PIN_NUM, PIN_LOW); rt_thread_delay(RT_TICK_PER_SECOND/2); - rt_hw_led_off(0); + rt_pin_write(LED_PIN_NUM, PIN_HIGH); rt_thread_delay(RT_TICK_PER_SECOND/2); } } diff --git a/bsp/acm32f0x0-nucleo/drivers/board.h b/bsp/acm32f0x0-nucleo/drivers/board.h index 6a37b544fd..39032064cb 100644 --- a/bsp/acm32f0x0-nucleo/drivers/board.h +++ b/bsp/acm32f0x0-nucleo/drivers/board.h @@ -13,7 +13,6 @@ #include #include "ACM32Fxx_HAL.h" -#include "led.h" /*-------------------------- UART CONFIG BEGIN --------------------------*/ diff --git a/bsp/acm32f0x0-nucleo/drivers/led.c b/bsp/acm32f0x0-nucleo/drivers/led.c deleted file mode 100644 index 6574d3fad0..0000000000 --- a/bsp/acm32f0x0-nucleo/drivers/led.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2006-2021, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2021-08-23 AisinoChip first implementation - */ - -#include -#include "board.h" - -#define led1_gpio GPIOA -#define led1_pin (GPIO_PIN_1) - -void rt_hw_led_init(void) -{ - GPIO_InitTypeDef GPIO_Handle; - - GPIO_Handle.Mode = GPIO_MODE_OUTPUT_PP; - GPIO_Handle.Pull = GPIO_PULLUP; - GPIO_Handle.Alternate = GPIO_FUNCTION_0; - - GPIO_Handle.Pin = led1_pin; - HAL_GPIO_Init(led1_gpio, &GPIO_Handle); -} - -void rt_hw_led_on(rt_uint32_t n) -{ - switch (n) - { - case 0: - HAL_GPIO_WritePin(led1_gpio, led1_pin, GPIO_PIN_SET); - break; - default: - break; - } -} - -void rt_hw_led_off(rt_uint32_t n) -{ - switch (n) - { - case 0: - HAL_GPIO_WritePin(led1_gpio, led1_pin, GPIO_PIN_CLEAR); - break; - default: - break; - } -} - -void rt_hw_led_toggle(rt_uint32_t n) -{ - static rt_bool_t stat = RT_TRUE; - - if (stat == RT_TRUE) - { - rt_hw_led_on(n); - stat = RT_FALSE; - } - else - { - rt_hw_led_off(n); - stat = RT_TRUE; - } -} diff --git a/bsp/acm32f0x0-nucleo/drivers/led.h b/bsp/acm32f0x0-nucleo/drivers/led.h deleted file mode 100644 index 5322e45877..0000000000 --- a/bsp/acm32f0x0-nucleo/drivers/led.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2006-2021, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2021-08-25 AisinoChip the first version - */ - -#ifndef __LED_H__ -#define __LED_H__ - -#include - -void rt_hw_led_init(void); -void rt_hw_led_on(rt_uint32_t led); -void rt_hw_led_off(rt_uint32_t led); -void rt_hw_led_toggle(rt_uint32_t led); - -#endif diff --git a/bsp/acm32f0x0-nucleo/project.uvoptx b/bsp/acm32f0x0-nucleo/project.uvoptx index 2cf8502141..72665569be 100644 --- a/bsp/acm32f0x0-nucleo/project.uvoptx +++ b/bsp/acm32f0x0-nucleo/project.uvoptx @@ -73,7 +73,7 @@ 0 - 1 + 0 0 1 @@ -181,7 +181,7 @@ ACM32_HAL - 1 + 0 0 0 0 @@ -204,8 +204,8 @@ 0 0 0 - libraries\HAL_Driver\Src\HAL_Uart.c - HAL_Uart.c + libraries\HAL_Driver\Src\HAL_UART.c + HAL_UART.c 0 0 @@ -309,7 +309,7 @@ Applications - 1 + 0 0 0 0 @@ -340,8 +340,8 @@ 0 0 0 - ..\..\libcpu\arm\common\backtrace.c - backtrace.c + ..\..\libcpu\arm\common\div0.c + div0.c 0 0 @@ -352,8 +352,8 @@ 0 0 0 - ..\..\libcpu\arm\common\div0.c - div0.c + ..\..\libcpu\arm\common\backtrace.c + backtrace.c 0 0 @@ -372,24 +372,24 @@ 3 15 - 1 + 2 0 0 0 - ..\..\libcpu\arm\cortex-m0\cpuport.c - cpuport.c + ..\..\libcpu\arm\cortex-m0\context_rvds.S + context_rvds.S 0 0 3 16 - 2 + 1 0 0 0 - ..\..\libcpu\arm\cortex-m0\context_rvds.S - context_rvds.S + ..\..\libcpu\arm\cortex-m0\cpuport.c + cpuport.c 0 0 @@ -456,8 +456,8 @@ 0 0 0 - ..\..\components\drivers\src\waitqueue.c - waitqueue.c + ..\..\components\drivers\src\workqueue.c + workqueue.c 0 0 @@ -468,8 +468,8 @@ 0 0 0 - ..\..\components\drivers\src\workqueue.c - workqueue.c + ..\..\components\drivers\src\completion.c + completion.c 0 0 @@ -480,8 +480,8 @@ 0 0 0 - ..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + ..\..\components\drivers\src\waitqueue.c + waitqueue.c 0 0 @@ -492,8 +492,8 @@ 0 0 0 - ..\..\components\drivers\src\dataqueue.c - dataqueue.c + ..\..\components\drivers\src\ringblk_buf.c + ringblk_buf.c 0 0 @@ -504,8 +504,8 @@ 0 0 0 - ..\..\components\drivers\src\pipe.c - pipe.c + ..\..\components\drivers\src\dataqueue.c + dataqueue.c 0 0 @@ -516,8 +516,8 @@ 0 0 0 - ..\..\components\drivers\src\completion.c - completion.c + ..\..\components\drivers\src\ringbuffer.c + ringbuffer.c 0 0 @@ -528,8 +528,8 @@ 0 0 0 - ..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + ..\..\components\drivers\src\pipe.c + pipe.c 0 0 @@ -549,7 +549,7 @@ Drivers - 1 + 0 0 0 0 @@ -560,8 +560,8 @@ 0 0 0 - drivers\drv_gpio.c - drv_gpio.c + drivers\board.c + board.c 0 0 @@ -572,8 +572,8 @@ 0 0 0 - drivers\board.c - board.c + drivers\drv_wdt.c + drv_wdt.c 0 0 @@ -584,8 +584,8 @@ 0 0 0 - drivers\drv_adc.c - drv_adc.c + drivers\drv_hwtimer.c + drv_hwtimer.c 0 0 @@ -608,8 +608,8 @@ 0 0 0 - drivers\drv_hwtimer.c - drv_hwtimer.c + drivers\drv_adc.c + drv_adc.c 0 0 @@ -620,20 +620,8 @@ 0 0 0 - drivers\led.c - led.c - 0 - 0 - - - 5 - 35 - 1 - 0 - 0 - 0 - drivers\drv_wdt.c - drv_wdt.c + drivers\drv_gpio.c + drv_gpio.c 0 0 @@ -647,7 +635,7 @@ 0 6 - 36 + 35 1 0 0 @@ -659,7 +647,7 @@ 6 - 37 + 36 1 0 0 @@ -671,7 +659,7 @@ 6 - 38 + 37 1 0 0 @@ -683,7 +671,7 @@ 6 - 39 + 38 1 0 0 @@ -695,7 +683,7 @@ 6 - 40 + 39 1 0 0 @@ -707,19 +695,7 @@ 6 - 41 - 1 - 0 - 0 - 0 - ..\..\components\finsh\finsh_token.c - finsh_token.c - 0 - 0 - - - 6 - 42 + 40 1 0 0 @@ -731,7 +707,7 @@ 6 - 43 + 41 1 0 0 @@ -743,7 +719,7 @@ 6 - 44 + 42 1 0 0 @@ -755,7 +731,7 @@ 6 - 45 + 43 1 0 0 @@ -767,7 +743,7 @@ 6 - 46 + 44 1 0 0 @@ -779,19 +755,19 @@ 6 - 47 + 45 1 0 0 0 - ..\..\components\finsh\msh.c - msh.c + ..\..\components\finsh\finsh_token.c + finsh_token.c 0 0 6 - 48 + 46 1 0 0 @@ -801,6 +777,18 @@ 0 0 + + 6 + 47 + 1 + 0 + 0 + 0 + ..\..\components\finsh\msh.c + msh.c + 0 + 0 + @@ -809,6 +797,18 @@ 0 0 0 + + 7 + 48 + 1 + 0 + 0 + 0 + ..\..\src\components.c + components.c + 0 + 0 + 7 49 @@ -816,8 +816,8 @@ 0 0 0 - ..\..\src\scheduler.c - scheduler.c + ..\..\src\timer.c + timer.c 0 0 @@ -840,8 +840,8 @@ 0 0 0 - ..\..\src\irq.c - irq.c + ..\..\src\idle.c + idle.c 0 0 @@ -852,8 +852,8 @@ 0 0 0 - ..\..\src\device.c - device.c + ..\..\src\scheduler.c + scheduler.c 0 0 @@ -864,8 +864,8 @@ 0 0 0 - ..\..\src\timer.c - timer.c + ..\..\src\thread.c + thread.c 0 0 @@ -876,8 +876,8 @@ 0 0 0 - ..\..\src\mempool.c - mempool.c + ..\..\src\irq.c + irq.c 0 0 @@ -888,8 +888,8 @@ 0 0 0 - ..\..\src\clock.c - clock.c + ..\..\src\object.c + object.c 0 0 @@ -900,8 +900,8 @@ 0 0 0 - ..\..\src\components.c - components.c + ..\..\src\kservice.c + kservice.c 0 0 @@ -912,8 +912,8 @@ 0 0 0 - ..\..\src\mem.c - mem.c + ..\..\src\mempool.c + mempool.c 0 0 @@ -924,8 +924,8 @@ 0 0 0 - ..\..\src\thread.c - thread.c + ..\..\src\mem.c + mem.c 0 0 @@ -936,8 +936,8 @@ 0 0 0 - ..\..\src\kservice.c - kservice.c + ..\..\src\clock.c + clock.c 0 0 @@ -948,20 +948,8 @@ 0 0 0 - ..\..\src\idle.c - idle.c - 0 - 0 - - - 7 - 61 - 1 - 0 - 0 - 0 - ..\..\src\object.c - object.c + ..\..\src\device.c + device.c 0 0 @@ -975,7 +963,7 @@ 0 8 - 62 + 61 1 0 0 @@ -987,7 +975,7 @@ 8 - 63 + 62 1 0 0 @@ -999,7 +987,7 @@ 8 - 64 + 63 1 0 0 @@ -1011,7 +999,7 @@ 8 - 65 + 64 1 0 0 @@ -1023,7 +1011,7 @@ 8 - 66 + 65 1 0 0 diff --git a/bsp/acm32f0x0-nucleo/project.uvprojx b/bsp/acm32f0x0-nucleo/project.uvprojx index 6c37e5fbb5..19b89df9c9 100644 --- a/bsp/acm32f0x0-nucleo/project.uvprojx +++ b/bsp/acm32f0x0-nucleo/project.uvprojx @@ -389,9 +389,9 @@ libraries\HAL_Driver\Src\HAL_IWDT.c - HAL_Uart.c + HAL_UART.c 1 - libraries\HAL_Driver\Src\HAL_Uart.c + libraries\HAL_Driver\Src\HAL_UART.c HAL_EXTI.c @@ -448,31 +448,31 @@ CPU - - backtrace.c - 1 - ..\..\libcpu\arm\common\backtrace.c - div0.c 1 ..\..\libcpu\arm\common\div0.c - showmem.c + backtrace.c 1 - ..\..\libcpu\arm\common\showmem.c + ..\..\libcpu\arm\common\backtrace.c - cpuport.c + showmem.c 1 - ..\..\libcpu\arm\cortex-m0\cpuport.c + ..\..\libcpu\arm\common\showmem.c context_rvds.S 2 ..\..\libcpu\arm\cortex-m0\context_rvds.S + + cpuport.c + 1 + ..\..\libcpu\arm\cortex-m0\cpuport.c + @@ -499,39 +499,39 @@ ..\..\components\drivers\serial\serial.c - waitqueue.c + workqueue.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\drivers\src\workqueue.c - workqueue.c + completion.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\completion.c - ringbuffer.c + waitqueue.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\drivers\src\waitqueue.c - dataqueue.c + ringblk_buf.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\ringblk_buf.c - pipe.c + dataqueue.c 1 - ..\..\components\drivers\src\pipe.c + ..\..\components\drivers\src\dataqueue.c - completion.c + ringbuffer.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\ringbuffer.c - ringblk_buf.c + pipe.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\pipe.c watchdog.c @@ -543,40 +543,35 @@ Drivers - - drv_gpio.c - 1 - drivers\drv_gpio.c - board.c 1 drivers\board.c - drv_adc.c + drv_wdt.c 1 - drivers\drv_adc.c + drivers\drv_wdt.c - drv_uart.c + drv_hwtimer.c 1 - drivers\drv_uart.c + drivers\drv_hwtimer.c - drv_hwtimer.c + drv_uart.c 1 - drivers\drv_hwtimer.c + drivers\drv_uart.c - led.c + drv_adc.c 1 - drivers\led.c + drivers\drv_adc.c - drv_wdt.c + drv_gpio.c 1 - drivers\drv_wdt.c + drivers\drv_gpio.c @@ -608,11 +603,6 @@ 1 ..\..\components\finsh\shell.c - - finsh_token.c - 1 - ..\..\components\finsh\finsh_token.c - finsh_var.c 1 @@ -639,84 +629,89 @@ ..\..\components\finsh\finsh_error.c - msh.c + finsh_token.c 1 - ..\..\components\finsh\msh.c + ..\..\components\finsh\finsh_token.c finsh_init.c 1 ..\..\components\finsh\finsh_init.c + + msh.c + 1 + ..\..\components\finsh\msh.c + Kernel - scheduler.c + components.c 1 - ..\..\src\scheduler.c + ..\..\src\components.c - ipc.c + timer.c 1 - ..\..\src\ipc.c + ..\..\src\timer.c - irq.c + ipc.c 1 - ..\..\src\irq.c + ..\..\src\ipc.c - device.c + idle.c 1 - ..\..\src\device.c + ..\..\src\idle.c - timer.c + scheduler.c 1 - ..\..\src\timer.c + ..\..\src\scheduler.c - mempool.c + thread.c 1 - ..\..\src\mempool.c + ..\..\src\thread.c - clock.c + irq.c 1 - ..\..\src\clock.c + ..\..\src\irq.c - components.c + object.c 1 - ..\..\src\components.c + ..\..\src\object.c - mem.c + kservice.c 1 - ..\..\src\mem.c + ..\..\src\kservice.c - thread.c + mempool.c 1 - ..\..\src\thread.c + ..\..\src\mempool.c - kservice.c + mem.c 1 - ..\..\src\kservice.c + ..\..\src\mem.c - idle.c + clock.c 1 - ..\..\src\idle.c + ..\..\src\clock.c - object.c + device.c 1 - ..\..\src\object.c + ..\..\src\device.c -- cgit v1.3.1