From 74475934e3dba461edee1f3bc1dcf47f31d88b3a Mon Sep 17 00:00:00 2001 From: WangShanpeng Date: Thu, 2 Feb 2017 17:40:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E8=AF=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=BE=93=E5=87=BA=E4=B8=B2=E5=8F=A3=E5=BC=95=E8=84=9A?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/CPU/system_MK60.c | 4 +++ .../app/k60_card.h | 4 ++- .../app/k60_card.h | 4 ++- project/(FatFS SDHC)LPLD_FatFs/app/k60_card.h | 4 ++- .../app/k60_card.h | 4 ++- project/(uCos)LPLD_uCosOSSem/app/k60_card.h | 4 ++- project/(uCos)LPLD_uCosV292/app/k60_card.h | 4 ++- project/01-LPLD_HelloWorld/app/k60_card.h | 4 ++- project/02-(GPIO)LPLD_LedLight/app/k60_card.h | 4 ++- .../app/k60_card.h | 4 ++- .../04-(UART)LPLD_SerialComm/app/k60_card.h | 4 ++- .../app/k60_card.h | 4 ++- .../app/k60_card.h | 4 ++- .../app/k60_card.h | 4 ++- .../app/k60_card.h | 4 ++- .../app/k60_card.h | 4 ++- .../app/k60_card.h | 4 ++- .../app/k60_card.h | 4 ++- .../app/k60_card.h | 4 ++- .../13-(LPTMR)LPLD_PulseAcc/app/k60_card.h | 4 ++- project/14-(LPTMR)LPLD_DelayMs/app/k60_card.h | 4 ++- .../15-(RTC)LPLD_RealTimeClock/app/k60_card.h | 4 ++- .../16-(RTC)LPLD_AlarmClock/app/k60_card.h | 4 ++- .../app/k60_card.h | 4 ++- project/18-(I2C)LPLD_MMA7660/app/k60_card.h | 4 ++- project/19-(I2C)LPLD_MMA8451/app/k60_card.h | 4 ++- project/20-(I2C)LPLD_MAG3110/app/k60_card.h | 4 ++- project/21-(SPI)LPLD_Nrf24L01/app/k60_card.h | 4 ++- .../22-(SPI)LPLD_Touchscreen/app/k60_card.h | 4 ++- project/23-(TSI)LPLD_TouchPad/app/k60_card.h | 4 ++- project/24-(FLEXBUS)LPLD_LCD/app/k60_card.h | 4 ++- project/25-(FLEXBUS)LPLD_SRAM/app/k60_card.h | 29 +++---------------- project/26-(CAN)LPLD_CanComm/app/k60_card.h | 4 ++- project/27-(ENET)LPLD_MacComm/app/k60_card.h | 4 ++- project/28-(SDHC)LPLD_SdCard/app/k60_card.h | 4 ++- project/29-(FLASH)LPLD_Flash/app/k60_card.h | 4 ++- project/30-(WDOG)LPLD_WatchDog/app/k60_card.h | 4 ++- .../app/k60_card.h | 4 ++- .../32-(USB)LPLD_VirtualMouse/app/k60_card.h | 4 ++- project/33-(DMA)LPLD_OV7670/app/k60_card.h | 4 ++- project/34-(NVIC)LPLD_Nvic/app/k60_card.h | 4 ++- project/35-(I2C)LPLD_MPU6050/app/k60_card.h | 4 ++- .../Template/app/k60_card.h | 4 ++- project/LPLD_TestRUSH/app/k60_card.h | 4 ++- 44 files changed, 134 insertions(+), 67 deletions(-) diff --git a/lib/CPU/system_MK60.c b/lib/CPU/system_MK60.c index 61380a9..7175767 100644 --- a/lib/CPU/system_MK60.c +++ b/lib/CPU/system_MK60.c @@ -90,8 +90,12 @@ void SystemInit (void) { //初始化用于打印调试信息的串口模块 //TERM_PORT为UART通道，在k60_card.h中定义 + //TERM_RX_PIN为UART_RX引脚，在k60_card.h中定义 + //TERM_TX_PIN为UART_TX引脚，在k60_card.h中定义 //TERMINAL_BAUD为UART波特率，在k60_card.h中定义 term_port_structure.UART_Uartx = TERM_PORT; + term_port_structure.UART_RxPin = TERM_RX_PIN; + term_port_structure.UART_TxPin = TERM_TX_PIN; term_port_structure.UART_BaudRate = TERMINAL_BAUD; LPLD_UART_Init(term_port_structure); diff --git a/project/(DMA PDB ADC)LPLD_DmaPdbADCx4/app/k60_card.h b/project/(DMA PDB ADC)LPLD_DmaPdbADCx4/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/(DMA PDB ADC)LPLD_DmaPdbADCx4/app/k60_card.h +++ b/project/(DMA PDB ADC)LPLD_DmaPdbADCx4/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/(DMA PDB ADC)LPLD_DmaPdbAnalogSample/app/k60_card.h b/project/(DMA PDB ADC)LPLD_DmaPdbAnalogSample/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/(DMA PDB ADC)LPLD_DmaPdbAnalogSample/app/k60_card.h +++ b/project/(DMA PDB ADC)LPLD_DmaPdbAnalogSample/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/(FatFS SDHC)LPLD_FatFs/app/k60_card.h b/project/(FatFS SDHC)LPLD_FatFs/app/k60_card.h index 69420fb..5730799 100644 --- a/project/(FatFS SDHC)LPLD_FatFs/app/k60_card.h +++ b/project/(FatFS SDHC)LPLD_FatFs/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/(PDB ADC)LPLD_PdbAnalogSample/app/k60_card.h b/project/(PDB ADC)LPLD_PdbAnalogSample/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/(PDB ADC)LPLD_PdbAnalogSample/app/k60_card.h +++ b/project/(PDB ADC)LPLD_PdbAnalogSample/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/(uCos)LPLD_uCosOSSem/app/k60_card.h b/project/(uCos)LPLD_uCosOSSem/app/k60_card.h index de21c11..a389fa7 100644 --- a/project/(uCos)LPLD_uCosOSSem/app/k60_card.h +++ b/project/(uCos)LPLD_uCosOSSem/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/(uCos)LPLD_uCosV292/app/k60_card.h b/project/(uCos)LPLD_uCosV292/app/k60_card.h index de21c11..a389fa7 100644 --- a/project/(uCos)LPLD_uCosV292/app/k60_card.h +++ b/project/(uCos)LPLD_uCosV292/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/01-LPLD_HelloWorld/app/k60_card.h b/project/01-LPLD_HelloWorld/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/01-LPLD_HelloWorld/app/k60_card.h +++ b/project/01-LPLD_HelloWorld/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/02-(GPIO)LPLD_LedLight/app/k60_card.h b/project/02-(GPIO)LPLD_LedLight/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/02-(GPIO)LPLD_LedLight/app/k60_card.h +++ b/project/02-(GPIO)LPLD_LedLight/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/03-(GPIOint)LPLD_ButtonPress/app/k60_card.h b/project/03-(GPIOint)LPLD_ButtonPress/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/03-(GPIOint)LPLD_ButtonPress/app/k60_card.h +++ b/project/03-(GPIOint)LPLD_ButtonPress/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/04-(UART)LPLD_SerialComm/app/k60_card.h b/project/04-(UART)LPLD_SerialComm/app/k60_card.h index d07f996..61ca1bb 100644 --- a/project/04-(UART)LPLD_SerialComm/app/k60_card.h +++ b/project/04-(UART)LPLD_SerialComm/app/k60_card.h @@ -141,9 +141,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/05-(UARTint)LPLD_SerialInterrupt/app/k60_card.h b/project/05-(UARTint)LPLD_SerialInterrupt/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/05-(UARTint)LPLD_SerialInterrupt/app/k60_card.h +++ b/project/05-(UARTint)LPLD_SerialInterrupt/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/06-(ADC)LPLD_AnalogSampleSE/app/k60_card.h b/project/06-(ADC)LPLD_AnalogSampleSE/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/06-(ADC)LPLD_AnalogSampleSE/app/k60_card.h +++ b/project/06-(ADC)LPLD_AnalogSampleSE/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/07-(ADC)LPLD_AnalogSampleDIFF/app/k60_card.h b/project/07-(ADC)LPLD_AnalogSampleDIFF/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/07-(ADC)LPLD_AnalogSampleDIFF/app/k60_card.h +++ b/project/07-(ADC)LPLD_AnalogSampleDIFF/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/08-(DAC)LPLD_AnalogSignalOutput/app/k60_card.h b/project/08-(DAC)LPLD_AnalogSignalOutput/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/08-(DAC)LPLD_AnalogSignalOutput/app/k60_card.h +++ b/project/08-(DAC)LPLD_AnalogSignalOutput/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/09-(PIT)LPLD_PeriodicInterrupt/app/k60_card.h b/project/09-(PIT)LPLD_PeriodicInterrupt/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/09-(PIT)LPLD_PeriodicInterrupt/app/k60_card.h +++ b/project/09-(PIT)LPLD_PeriodicInterrupt/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/10-(FTM_PWM)LPLD_ServoControl/app/k60_card.h b/project/10-(FTM_PWM)LPLD_ServoControl/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/10-(FTM_PWM)LPLD_ServoControl/app/k60_card.h +++ b/project/10-(FTM_PWM)LPLD_ServoControl/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/11-(FTM_IC)LPLD_InputCapture/app/k60_card.h b/project/11-(FTM_IC)LPLD_InputCapture/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/11-(FTM_IC)LPLD_InputCapture/app/k60_card.h +++ b/project/11-(FTM_IC)LPLD_InputCapture/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/12-(FTM_QD)LPLD_QuadratureDecoder/app/k60_card.h b/project/12-(FTM_QD)LPLD_QuadratureDecoder/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/12-(FTM_QD)LPLD_QuadratureDecoder/app/k60_card.h +++ b/project/12-(FTM_QD)LPLD_QuadratureDecoder/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/13-(LPTMR)LPLD_PulseAcc/app/k60_card.h b/project/13-(LPTMR)LPLD_PulseAcc/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/13-(LPTMR)LPLD_PulseAcc/app/k60_card.h +++ b/project/13-(LPTMR)LPLD_PulseAcc/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/14-(LPTMR)LPLD_DelayMs/app/k60_card.h b/project/14-(LPTMR)LPLD_DelayMs/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/14-(LPTMR)LPLD_DelayMs/app/k60_card.h +++ b/project/14-(LPTMR)LPLD_DelayMs/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/15-(RTC)LPLD_RealTimeClock/app/k60_card.h b/project/15-(RTC)LPLD_RealTimeClock/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/15-(RTC)LPLD_RealTimeClock/app/k60_card.h +++ b/project/15-(RTC)LPLD_RealTimeClock/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/16-(RTC)LPLD_AlarmClock/app/k60_card.h b/project/16-(RTC)LPLD_AlarmClock/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/16-(RTC)LPLD_AlarmClock/app/k60_card.h +++ b/project/16-(RTC)LPLD_AlarmClock/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/17-(PDB)LPLD_PdbPeriodicInt/app/k60_card.h b/project/17-(PDB)LPLD_PdbPeriodicInt/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/17-(PDB)LPLD_PdbPeriodicInt/app/k60_card.h +++ b/project/17-(PDB)LPLD_PdbPeriodicInt/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/18-(I2C)LPLD_MMA7660/app/k60_card.h b/project/18-(I2C)LPLD_MMA7660/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/18-(I2C)LPLD_MMA7660/app/k60_card.h +++ b/project/18-(I2C)LPLD_MMA7660/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/19-(I2C)LPLD_MMA8451/app/k60_card.h b/project/19-(I2C)LPLD_MMA8451/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/19-(I2C)LPLD_MMA8451/app/k60_card.h +++ b/project/19-(I2C)LPLD_MMA8451/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/20-(I2C)LPLD_MAG3110/app/k60_card.h b/project/20-(I2C)LPLD_MAG3110/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/20-(I2C)LPLD_MAG3110/app/k60_card.h +++ b/project/20-(I2C)LPLD_MAG3110/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/21-(SPI)LPLD_Nrf24L01/app/k60_card.h b/project/21-(SPI)LPLD_Nrf24L01/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/21-(SPI)LPLD_Nrf24L01/app/k60_card.h +++ b/project/21-(SPI)LPLD_Nrf24L01/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/22-(SPI)LPLD_Touchscreen/app/k60_card.h b/project/22-(SPI)LPLD_Touchscreen/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/22-(SPI)LPLD_Touchscreen/app/k60_card.h +++ b/project/22-(SPI)LPLD_Touchscreen/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/23-(TSI)LPLD_TouchPad/app/k60_card.h b/project/23-(TSI)LPLD_TouchPad/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/23-(TSI)LPLD_TouchPad/app/k60_card.h +++ b/project/23-(TSI)LPLD_TouchPad/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/24-(FLEXBUS)LPLD_LCD/app/k60_card.h b/project/24-(FLEXBUS)LPLD_LCD/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/24-(FLEXBUS)LPLD_LCD/app/k60_card.h +++ b/project/24-(FLEXBUS)LPLD_LCD/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/25-(FLEXBUS)LPLD_SRAM/app/k60_card.h b/project/25-(FLEXBUS)LPLD_SRAM/app/k60_card.h index d07f996..c1a3a6e 100644 --- a/project/25-(FLEXBUS)LPLD_SRAM/app/k60_card.h +++ b/project/25-(FLEXBUS)LPLD_SRAM/app/k60_card.h @@ -47,30 +47,7 @@ 如果晶振选择为无源晶振（CRYSTAL OSC）,定义使用晶振频率，支持无源晶振频率为8Mhz *----------------------------------------------------------------------------*/ #define CRYSTAL_OSC_CLK_HZ 8000000u //外部无源晶振频率，单位Hz - - /*---------------------------------------------------------------------------- - 根据自己设计的单片机外围晶振电路，选择合适的晶振配置,默认为有源晶振 50Mhz - 如果晶振选择为有源晶振（CANNED OSC）,定义OSC_CIRCUIT_TPYE == CANNED_OSC_CIRCUIT - Vcc_ _ - |__| |___ XTAL Pin - |_| - 如果晶振选择为无源晶振（CRYSTAL OSC）,定义OSC_CIRCUIT_TPYE == CRYSTAL_OSC_CIRCUIT - ________XTAL Pin - | | - |_|______EXTAL Pin -*----------------------------------------------------------------------------*/ -#define CRYSTAL_OSC_CIRCUIT (0) -#define CANNED_OSC_CIRCUIT (1) -#define OSC_CIRCUIT_TPYE CANNED_OSC_CIRCUIT -/*---------------------------------------------------------------------------- - 如果晶振选择为有源晶振（CANNED OSC）,定义使用晶振频率，支持有源晶振频率为50Mhz - *----------------------------------------------------------------------------*/ -#define CANNED_OSC_CLK_HZ 50000000u //外部有源晶振频率，单位Hz -/*---------------------------------------------------------------------------- - 如果晶振选择为无源晶振（CRYSTAL OSC）,定义使用晶振频率，支持无源晶振频率为8Mhz - *----------------------------------------------------------------------------*/ -#define CRYSTAL_OSC_CLK_HZ 8000000u //外部无源晶振频率，单位Hz - + /* * 系统主频定义(CORE_CLK_MHZ) * 可选范围: @@ -141,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/26-(CAN)LPLD_CanComm/app/k60_card.h b/project/26-(CAN)LPLD_CanComm/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/26-(CAN)LPLD_CanComm/app/k60_card.h +++ b/project/26-(CAN)LPLD_CanComm/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/27-(ENET)LPLD_MacComm/app/k60_card.h b/project/27-(ENET)LPLD_MacComm/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/27-(ENET)LPLD_MacComm/app/k60_card.h +++ b/project/27-(ENET)LPLD_MacComm/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/28-(SDHC)LPLD_SdCard/app/k60_card.h b/project/28-(SDHC)LPLD_SdCard/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/28-(SDHC)LPLD_SdCard/app/k60_card.h +++ b/project/28-(SDHC)LPLD_SdCard/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/29-(FLASH)LPLD_Flash/app/k60_card.h b/project/29-(FLASH)LPLD_Flash/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/29-(FLASH)LPLD_Flash/app/k60_card.h +++ b/project/29-(FLASH)LPLD_Flash/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/30-(WDOG)LPLD_WatchDog/app/k60_card.h b/project/30-(WDOG)LPLD_WatchDog/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/30-(WDOG)LPLD_WatchDog/app/k60_card.h +++ b/project/30-(WDOG)LPLD_WatchDog/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/31-(USB)LPLD_VirtualSerialComm/app/k60_card.h b/project/31-(USB)LPLD_VirtualSerialComm/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/31-(USB)LPLD_VirtualSerialComm/app/k60_card.h +++ b/project/31-(USB)LPLD_VirtualSerialComm/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/32-(USB)LPLD_VirtualMouse/app/k60_card.h b/project/32-(USB)LPLD_VirtualMouse/app/k60_card.h index 4b46471..e4e831a 100644 --- a/project/32-(USB)LPLD_VirtualMouse/app/k60_card.h +++ b/project/32-(USB)LPLD_VirtualMouse/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/33-(DMA)LPLD_OV7670/app/k60_card.h b/project/33-(DMA)LPLD_OV7670/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/33-(DMA)LPLD_OV7670/app/k60_card.h +++ b/project/33-(DMA)LPLD_OV7670/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/34-(NVIC)LPLD_Nvic/app/k60_card.h b/project/34-(NVIC)LPLD_Nvic/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/34-(NVIC)LPLD_Nvic/app/k60_card.h +++ b/project/34-(NVIC)LPLD_Nvic/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/35-(I2C)LPLD_MPU6050/app/k60_card.h b/project/35-(I2C)LPLD_MPU6050/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/35-(I2C)LPLD_MPU6050/app/k60_card.h +++ b/project/35-(I2C)LPLD_MPU6050/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/LPLD_Project_Template/Template/app/k60_card.h b/project/LPLD_Project_Template/Template/app/k60_card.h index 46e6528..47b1cfc 100644 --- a/project/LPLD_Project_Template/Template/app/k60_card.h +++ b/project/LPLD_Project_Template/Template/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /* diff --git a/project/LPLD_TestRUSH/app/k60_card.h b/project/LPLD_TestRUSH/app/k60_card.h index 69420fb..5730799 100644 --- a/project/LPLD_TestRUSH/app/k60_card.h +++ b/project/LPLD_TestRUSH/app/k60_card.h @@ -118,9 +118,11 @@ /* - * 选择调试信息输出所有的串口号和波特率 + * 选择调试信息输出所有的串口号、引脚和波特率 */ #define TERM_PORT UART5 +#define TERM_RX_PIN PTE9 +#define TERM_TX_PIN PTE8 #define TERMINAL_BAUD 115200 /*