Skip to content

Commit

Permalink
1、【增加】基于RTT自带设备及定时器框架的从机,降低软件的移植难度。
Browse files Browse the repository at this point in the history
Signed-off-by: armink <[email protected]>
  • Loading branch information
armink committed Nov 7, 2014
1 parent 75cac11 commit 8a913c8
Show file tree
Hide file tree
Showing 29 changed files with 4,666 additions and 3,103 deletions.
4 changes: 2 additions & 2 deletions .cproject
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="RT-Thread-1.2.2/components/drivers/usb|RT-Thread-1.2.2/components/drivers/spi|RT-Thread-1.2.2/components/drivers/serial|RT-Thread-1.2.2/components/drivers/sdio|RT-Thread-1.2.2/components/drivers/rtc|RT-Thread-1.2.2/components/drivers/mtd|RT-Thread-1.2.2/components/drivers/i2c|RT-Thread-1.2.2/libcpu/arm/sep4020|RT-Thread-1.2.2/libcpu/arm/s3c44b0|RT-Thread-1.2.2/libcpu/arm/s3c24x0|RT-Thread-1.2.2/libcpu/arm/lpc24xx|RT-Thread-1.2.2/libcpu/arm/lpc214x|RT-Thread-1.2.2/libcpu/arm/cortex-r4|RT-Thread-1.2.2/libcpu/arm/cortex-m4|RT-Thread-1.2.2/libcpu/arm/cortex-m0|RT-Thread-1.2.2/libcpu/arm/common|RT-Thread-1.2.2/libcpu/arm/AT91SAM7X|RT-Thread-1.2.2/libcpu/arm/AT91SAM7S|RT-Thread-1.2.2/libcpu/arm/arm926|RT-Thread-1.2.2/libcpu/arm/am335x|RT-Thread-1.2.2/components/utilities|RT-Thread-1.2.2/components/pthreads|RT-Thread-1.2.2/components/libdl|RT-Thread-1.2.2/components/libc|RT-Thread-1.2.2/components/init|RT-Thread-1.2.2/components/finsh|RT-Thread-1.2.2/components/CMSIS|RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.2.2/libcpu/xilinx|RT-Thread-1.2.2/libcpu/v850|RT-Thread-1.2.2/libcpu/unicore32|RT-Thread-1.2.2/libcpu/sim|RT-Thread-1.2.2/libcpu/ppc|RT-Thread-1.2.2/libcpu/nios|RT-Thread-1.2.2/libcpu/mips|RT-Thread-1.2.2/libcpu/m16c|RT-Thread-1.2.2/libcpu/ia32|RT-Thread-1.2.2/libcpu/blackfin|RT-Thread-1.2.2/libcpu/avr32|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s|RVMDK|EWARM|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.1.1/libcpu/arm/sep4020|RT-Thread-1.1.1/libcpu/arm/s3c44b0|RT-Thread-1.1.1/libcpu/arm/s3c24x0|RT-Thread-1.1.1/libcpu/arm/lpc24xx|RT-Thread-1.1.1/libcpu/arm/lpc214x|RT-Thread-1.1.1/libcpu/arm/lpc122x|RT-Thread-1.1.1/libcpu/arm/cortex-m4|RT-Thread-1.1.1/libcpu/arm/cortex-m0|RT-Thread-1.1.1/libcpu/arm/common|RT-Thread-1.1.1/libcpu/arm/at91sam926x|RT-Thread-1.1.1/libcpu/arm/AT91SAM7X|RT-Thread-1.1.1/libcpu/arm/AT91SAM7S|RT-Thread-1.1.1/libcpu/xilinx|RT-Thread-1.1.1/libcpu/v850|RT-Thread-1.1.1/libcpu/sim|RT-Thread-1.1.1/libcpu/ppc|RT-Thread-1.1.1/libcpu/nios|RT-Thread-1.1.1/libcpu/mips|RT-Thread-1.1.1/libcpu/m16c|RT-Thread-1.1.1/libcpu/ia32|RT-Thread-1.1.1/libcpu/blackfin|RT-Thread-1.1.1/libcpu/avr32|RT-Thread-1.1.1/components|Libaries/USB-FS-Device_Driver|Libaries/CMSIS_MDK" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="RT-Thread-1.2.2/components/drivers/usb|RT-Thread-1.2.2/components/drivers/spi|RT-Thread-1.2.2/components/drivers/sdio|RT-Thread-1.2.2/components/drivers/rtc|RT-Thread-1.2.2/components/drivers/mtd|RT-Thread-1.2.2/components/drivers/i2c|RT-Thread-1.2.2/libcpu/arm/sep4020|RT-Thread-1.2.2/libcpu/arm/s3c44b0|RT-Thread-1.2.2/libcpu/arm/s3c24x0|RT-Thread-1.2.2/libcpu/arm/lpc24xx|RT-Thread-1.2.2/libcpu/arm/lpc214x|RT-Thread-1.2.2/libcpu/arm/cortex-r4|RT-Thread-1.2.2/libcpu/arm/cortex-m4|RT-Thread-1.2.2/libcpu/arm/cortex-m0|RT-Thread-1.2.2/libcpu/arm/common|RT-Thread-1.2.2/libcpu/arm/AT91SAM7X|RT-Thread-1.2.2/libcpu/arm/AT91SAM7S|RT-Thread-1.2.2/libcpu/arm/arm926|RT-Thread-1.2.2/libcpu/arm/am335x|RT-Thread-1.2.2/components/utilities|RT-Thread-1.2.2/components/pthreads|RT-Thread-1.2.2/components/libdl|RT-Thread-1.2.2/components/libc|RT-Thread-1.2.2/components/init|RT-Thread-1.2.2/components/finsh|RT-Thread-1.2.2/components/CMSIS|RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.2.2/libcpu/xilinx|RT-Thread-1.2.2/libcpu/v850|RT-Thread-1.2.2/libcpu/unicore32|RT-Thread-1.2.2/libcpu/sim|RT-Thread-1.2.2/libcpu/ppc|RT-Thread-1.2.2/libcpu/nios|RT-Thread-1.2.2/libcpu/mips|RT-Thread-1.2.2/libcpu/m16c|RT-Thread-1.2.2/libcpu/ia32|RT-Thread-1.2.2/libcpu/blackfin|RT-Thread-1.2.2/libcpu/avr32|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s|RVMDK|EWARM|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.1.1/libcpu/arm/sep4020|RT-Thread-1.1.1/libcpu/arm/s3c44b0|RT-Thread-1.1.1/libcpu/arm/s3c24x0|RT-Thread-1.1.1/libcpu/arm/lpc24xx|RT-Thread-1.1.1/libcpu/arm/lpc214x|RT-Thread-1.1.1/libcpu/arm/lpc122x|RT-Thread-1.1.1/libcpu/arm/cortex-m4|RT-Thread-1.1.1/libcpu/arm/cortex-m0|RT-Thread-1.1.1/libcpu/arm/common|RT-Thread-1.1.1/libcpu/arm/at91sam926x|RT-Thread-1.1.1/libcpu/arm/AT91SAM7X|RT-Thread-1.1.1/libcpu/arm/AT91SAM7S|RT-Thread-1.1.1/libcpu/xilinx|RT-Thread-1.1.1/libcpu/v850|RT-Thread-1.1.1/libcpu/sim|RT-Thread-1.1.1/libcpu/ppc|RT-Thread-1.1.1/libcpu/nios|RT-Thread-1.1.1/libcpu/mips|RT-Thread-1.1.1/libcpu/m16c|RT-Thread-1.1.1/libcpu/ia32|RT-Thread-1.1.1/libcpu/blackfin|RT-Thread-1.1.1/libcpu/avr32|RT-Thread-1.1.1/components|Libaries/USB-FS-Device_Driver|Libaries/CMSIS_MDK" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
Expand Down Expand Up @@ -175,7 +175,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="RT-Thread-1.2.2/components/drivers/usb|RT-Thread-1.2.2/components/drivers/spi|RT-Thread-1.2.2/components/drivers/serial|RT-Thread-1.2.2/components/drivers/sdio|RT-Thread-1.2.2/components/drivers/rtc|RT-Thread-1.2.2/components/drivers/mtd|RT-Thread-1.2.2/components/drivers/i2c|RT-Thread-1.2.2/libcpu/arm/sep4020|RT-Thread-1.2.2/libcpu/arm/s3c44b0|RT-Thread-1.2.2/libcpu/arm/s3c24x0|RT-Thread-1.2.2/libcpu/arm/lpc24xx|RT-Thread-1.2.2/libcpu/arm/lpc214x|RT-Thread-1.2.2/libcpu/arm/cortex-r4|RT-Thread-1.2.2/libcpu/arm/cortex-m4|RT-Thread-1.2.2/libcpu/arm/cortex-m0|RT-Thread-1.2.2/libcpu/arm/common|RT-Thread-1.2.2/libcpu/arm/AT91SAM7X|RT-Thread-1.2.2/libcpu/arm/AT91SAM7S|RT-Thread-1.2.2/libcpu/arm/arm926|RT-Thread-1.2.2/libcpu/arm/am335x|RT-Thread-1.2.2/components/utilities|RT-Thread-1.2.2/components/pthreads|RT-Thread-1.2.2/components/libdl|RT-Thread-1.2.2/components/libc|RT-Thread-1.2.2/components/init|RT-Thread-1.2.2/components/finsh|RT-Thread-1.2.2/components/CMSIS|RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.2.2/libcpu/xilinx|RT-Thread-1.2.2/libcpu/v850|RT-Thread-1.2.2/libcpu/unicore32|RT-Thread-1.2.2/libcpu/sim|RT-Thread-1.2.2/libcpu/ppc|RT-Thread-1.2.2/libcpu/nios|RT-Thread-1.2.2/libcpu/mips|RT-Thread-1.2.2/libcpu/m16c|RT-Thread-1.2.2/libcpu/ia32|RT-Thread-1.2.2/libcpu/blackfin|RT-Thread-1.2.2/libcpu/avr32|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s|RVMDK|EWARM|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.1.1/libcpu/arm/sep4020|RT-Thread-1.1.1/libcpu/arm/s3c44b0|RT-Thread-1.1.1/libcpu/arm/s3c24x0|RT-Thread-1.1.1/libcpu/arm/lpc24xx|RT-Thread-1.1.1/libcpu/arm/lpc214x|RT-Thread-1.1.1/libcpu/arm/lpc122x|RT-Thread-1.1.1/libcpu/arm/cortex-m4|RT-Thread-1.1.1/libcpu/arm/cortex-m0|RT-Thread-1.1.1/libcpu/arm/common|RT-Thread-1.1.1/libcpu/arm/at91sam926x|RT-Thread-1.1.1/libcpu/arm/AT91SAM7X|RT-Thread-1.1.1/libcpu/arm/AT91SAM7S|RT-Thread-1.1.1/libcpu/xilinx|RT-Thread-1.1.1/libcpu/v850|RT-Thread-1.1.1/libcpu/sim|RT-Thread-1.1.1/libcpu/ppc|RT-Thread-1.1.1/libcpu/nios|RT-Thread-1.1.1/libcpu/mips|RT-Thread-1.1.1/libcpu/m16c|RT-Thread-1.1.1/libcpu/ia32|RT-Thread-1.1.1/libcpu/blackfin|RT-Thread-1.1.1/libcpu/avr32|RT-Thread-1.1.1/components|Libaries/USB-FS-Device_Driver|Libaries/CMSIS_MDK" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="RT-Thread-1.2.2/components/drivers/usb|RT-Thread-1.2.2/components/drivers/spi|RT-Thread-1.2.2/components/drivers/sdio|RT-Thread-1.2.2/components/drivers/rtc|RT-Thread-1.2.2/components/drivers/mtd|RT-Thread-1.2.2/components/drivers/i2c|RT-Thread-1.2.2/libcpu/arm/sep4020|RT-Thread-1.2.2/libcpu/arm/s3c44b0|RT-Thread-1.2.2/libcpu/arm/s3c24x0|RT-Thread-1.2.2/libcpu/arm/lpc24xx|RT-Thread-1.2.2/libcpu/arm/lpc214x|RT-Thread-1.2.2/libcpu/arm/cortex-r4|RT-Thread-1.2.2/libcpu/arm/cortex-m4|RT-Thread-1.2.2/libcpu/arm/cortex-m0|RT-Thread-1.2.2/libcpu/arm/common|RT-Thread-1.2.2/libcpu/arm/AT91SAM7X|RT-Thread-1.2.2/libcpu/arm/AT91SAM7S|RT-Thread-1.2.2/libcpu/arm/arm926|RT-Thread-1.2.2/libcpu/arm/am335x|RT-Thread-1.2.2/components/utilities|RT-Thread-1.2.2/components/pthreads|RT-Thread-1.2.2/components/libdl|RT-Thread-1.2.2/components/libc|RT-Thread-1.2.2/components/init|RT-Thread-1.2.2/components/finsh|RT-Thread-1.2.2/components/CMSIS|RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.2.2/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.2.2/libcpu/xilinx|RT-Thread-1.2.2/libcpu/v850|RT-Thread-1.2.2/libcpu/unicore32|RT-Thread-1.2.2/libcpu/sim|RT-Thread-1.2.2/libcpu/ppc|RT-Thread-1.2.2/libcpu/nios|RT-Thread-1.2.2/libcpu/mips|RT-Thread-1.2.2/libcpu/m16c|RT-Thread-1.2.2/libcpu/ia32|RT-Thread-1.2.2/libcpu/blackfin|RT-Thread-1.2.2/libcpu/avr32|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s|Libaries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s|RVMDK|EWARM|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_rvds.S|RT-Thread-1.1.1/libcpu/arm/cortex-m3/context_gcc.S|RT-Thread-1.1.1/libcpu/arm/sep4020|RT-Thread-1.1.1/libcpu/arm/s3c44b0|RT-Thread-1.1.1/libcpu/arm/s3c24x0|RT-Thread-1.1.1/libcpu/arm/lpc24xx|RT-Thread-1.1.1/libcpu/arm/lpc214x|RT-Thread-1.1.1/libcpu/arm/lpc122x|RT-Thread-1.1.1/libcpu/arm/cortex-m4|RT-Thread-1.1.1/libcpu/arm/cortex-m0|RT-Thread-1.1.1/libcpu/arm/common|RT-Thread-1.1.1/libcpu/arm/at91sam926x|RT-Thread-1.1.1/libcpu/arm/AT91SAM7X|RT-Thread-1.1.1/libcpu/arm/AT91SAM7S|RT-Thread-1.1.1/libcpu/xilinx|RT-Thread-1.1.1/libcpu/v850|RT-Thread-1.1.1/libcpu/sim|RT-Thread-1.1.1/libcpu/ppc|RT-Thread-1.1.1/libcpu/nios|RT-Thread-1.1.1/libcpu/mips|RT-Thread-1.1.1/libcpu/m16c|RT-Thread-1.1.1/libcpu/ia32|RT-Thread-1.1.1/libcpu/blackfin|RT-Thread-1.1.1/libcpu/avr32|RT-Thread-1.1.1/components|Libaries/USB-FS-Device_Driver|Libaries/CMSIS_MDK" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
Expand Down
5 changes: 4 additions & 1 deletion APP/inc/rtconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@
/* SECTION: Device System */
/* Using Device System */
#define RT_USING_DEVICE
//#define RT_USING_UART1
// <bool name="RT_USING_DEVICE_IPC" description="Using device communication" default="true" />
#define RT_USING_DEVICE_IPC
// <bool name="RT_USING_SERIAL" description="Using Serial" default="true" />
#define RT_USING_SERIAL

/* SECTION: Console options */
/* the buffer size of console*/
Expand Down
10 changes: 4 additions & 6 deletions BSP/inc/bsp.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
#define STM32_SRAM_SIZE 20
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)

/* RT_USING_UART */
#define RT_USING_UART3
#define RT_USING_UART1
#define RT_UART_RX_BUFFER_SIZE 64

#define LED_LED1_ON GPIO_SetBits (GPIOA,GPIO_Pin_11) //LED1
#define LED_LED1_OFF GPIO_ResetBits(GPIOA,GPIO_Pin_11) //LED1
Expand Down Expand Up @@ -94,13 +98,7 @@ void IWDG_Feed(void);
void BSP_Init(void);

void rt_hw_board_init(void);
static void RCC_Configuration(void);
static void NVIC_Configuration(void);
static void GPIO_Configuration(void);
static void USART1_Configuration(void);
static void IWDG_Configuration(void);
void IWDG_Feed(void);
static void SysTick_Configuration(void);
void rt_hw_timer_handler(void);

uint8_t AvoidTimeout(uint32_t TimeOfTimeout,uint32_t Period,uint8_t (*DetectCondition)(),uint8_t ConditionValue);
Expand Down
26 changes: 26 additions & 0 deletions BSP/inc/usart.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* File : usart.h
* This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2009, RT-Thread Development Team
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http:https://www.rt-thread.org/license/LICENSE
*
* Change Logs:
* Date Author Notes
* 2009-01-05 Bernard the first version
*/

#ifndef __USART_H__
#define __USART_H__

#include <rthw.h>
#include <rtthread.h>

#define UART_ENABLE_IRQ(n) NVIC_EnableIRQ((n))
#define UART_DISABLE_IRQ(n) NVIC_DisableIRQ((n))

void rt_hw_usart_init(void);

#endif
2 changes: 2 additions & 0 deletions BSP/src/bsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <bsp.h>
#include <rthw.h>
#include <rtthread.h>
#include "usart.h"
/*
*********************************************************************************************************
* LOCAL TABLES
Expand All @@ -46,6 +47,7 @@
void rt_hw_board_init()
{
BSP_Init();
rt_hw_usart_init();
}

/*******************************************************************************
Expand Down
Loading

0 comments on commit 8a913c8

Please sign in to comment.