diff --git a/Software/BSR_TestUART/Program/Modules/module_rs232.c b/Software/BSR_TestUART/Program/Modules/module_rs232.c index 2efd070..6dddfc6 100644 --- a/Software/BSR_TestUART/Program/Modules/module_rs232.c +++ b/Software/BSR_TestUART/Program/Modules/module_rs232.c @@ -1,5 +1,7 @@ /*====================================================================================================*/ /*====================================================================================================*/ +#include + #include "stm32f1_system.h" #include "stm32f1_usart.h" #include "module_rs232.h" @@ -57,12 +59,39 @@ void RS232_Config( void ) USART_InitStruct.USART_HardwareFlowControl = USARTx_HARDWARECTRL; USART_InitStruct.USART_Mode = USART_Mode_Rx | USART_Mode_Tx; USART_Init(USARTx, &USART_InitStruct); + USART_Cmd(USARTx, ENABLE); USART_ClearFlag(USARTx, USART_FLAG_TC); } /*====================================================================================================*/ /*====================================================================================================* +**函數 : RS232_SendByte +**功能 : Send Byte +**輸入 : *pWord +**輸出 : None +**使用 : RS232_SendByte('A'); +**====================================================================================================*/ +/*====================================================================================================*/ +void RS232_SendByte( int8_t SendByte ) +{ + UART_SendByte(USARTx, &SendByte); +} +/*====================================================================================================*/ +/*====================================================================================================* +**函數 : RS232_SendData +**功能 : 發送資料 +**輸入 : *SendData, DataLen +**輸出 : None +**使用 : RS232_SendData(SendData, DataLen); +**====================================================================================================*/ +/*====================================================================================================*/ +void RS232_SendData( int8_t *SendData, uint16_t DataLen ) +{ + UART_SendData(USARTx, SendData, DataLen); +} +/*====================================================================================================*/ +/*====================================================================================================* **函數 : RS232_SendStr **功能 : 發送字串 **輸入 : *pWord @@ -100,16 +129,44 @@ void RS232_SendNum( StrType Type, uint8_t NumLen, int32_t SendData ) } /*====================================================================================================*/ /*====================================================================================================* -**函數 : RS232_SendData -**功能 : 發送資料 -**輸入 : *SendData, DataLen +**函數 : RS232_RecvByte +**功能 : Recv Byte +**輸入 : None +**輸出 : RecvByte +**使用 : RecvByte = RS232_RecvByte(); +**====================================================================================================*/ +/*====================================================================================================*/ +int8_t RS232_RecvByte( void ) +{ + int8_t RecvByte = 0; + UART_RecvByte(USARTx, &RecvByte); + return RecvByte; +} +/*====================================================================================================*/ +/*====================================================================================================* +**函數 : RS232_RecvData +**功能 : 接收資料 +**輸入 : *RecvData, DataLen **輸出 : None -**使用 : RS232_SendData(SendData, DataLen); +**使用 : RS232_RecvData(RecvData, DataLen); **====================================================================================================*/ /*====================================================================================================*/ -void RS232_SendData( int8_t *SendData, uint16_t DataLen ) +void RS232_RecvData( int8_t *RecvData, uint16_t DataLen ) { - UART_SendData(USARTx, SendData, DataLen); + UART_RecvData(USARTx, RecvData, DataLen); +} +/*====================================================================================================*/ +/*====================================================================================================* +**函數 : RS232_RecvDataWTO +**功能 : 接收資料, 並加入 Timeout 功能 +**輸入 : *RecvData, DataLen, TimeoutMs +**輸出 : State +**使用 : RS232_RecvDataWTO(RecvData, DataLen, 200); +**====================================================================================================*/ +/*====================================================================================================*/ +int8_t RS232_RecvDataWTO( int8_t *RecvData, uint16_t DataLen, int32_t TimeoutMs ) +{ + return UART_RecvDataWTO(USARTx, RecvData, DataLen, TimeoutMs); } /*====================================================================================================*/ /*====================================================================================================* @@ -150,30 +207,12 @@ int8_t RS232_RecvStrWTO( int8_t *pWord, int32_t TimeoutMs ) return SUCCESS; } /*====================================================================================================*/ -/*====================================================================================================* -**函數 : RS232_RecvData -**功能 : 接收資料 -**輸入 : *RecvData, DataLen -**輸出 : None -**使用 : RS232_RecvData(RecvData, DataLen); -**====================================================================================================*/ -/*====================================================================================================*/ -void RS232_RecvData( int8_t *RecvData, uint16_t DataLen ) -{ - UART_RecvData(USARTx, RecvData, DataLen); -} -/*====================================================================================================*/ -/*====================================================================================================* -**函數 : RS232_RecvDataWTO -**功能 : 接收資料, 並加入 Timeout 功能 -**輸入 : *RecvData, DataLen, TimeoutMs -**輸出 : State -**使用 : RS232_RecvDataWTO(RecvData, DataLen, 200); -**====================================================================================================*/ /*====================================================================================================*/ -int8_t RS232_RecvDataWTO( int8_t *RecvData, uint16_t DataLen, int32_t TimeoutMs ) +int fputc( int ch, FILE *f ) { - return UART_RecvDataWTO(USARTx, RecvData, DataLen, TimeoutMs); + USARTx->DR = ((uint8_t)ch & (uint16_t)0x00FF); + while(!(USART1->SR & USART_FLAG_TXE)); + return (ch); } /*====================================================================================================*/ /*====================================================================================================*/ diff --git a/Software/BSR_TestUART/Program/Modules/module_rs232.h b/Software/BSR_TestUART/Program/Modules/module_rs232.h index 6ceea3f..f2b5c01 100644 --- a/Software/BSR_TestUART/Program/Modules/module_rs232.h +++ b/Software/BSR_TestUART/Program/Modules/module_rs232.h @@ -8,13 +8,15 @@ /*====================================================================================================*/ /*====================================================================================================*/ void RS232_Config( void ); +void RS232_SendByte( int8_t SendByte ); +void RS232_SendData( int8_t *SendData, uint16_t DataLen ); void RS232_SendStr( int8_t *pWord ); void RS232_SendNum( StrType Type, uint8_t NumLen, int32_t SendData ); -void RS232_SendData( int8_t *SendData, uint16_t DataLen ); -void RS232_RecvStr( int8_t *pWord ); -int8_t RS232_RecvStrWTO( int8_t *pWord, int32_t TimeoutMs ); +int8_t RS232_RecvByte( void ); void RS232_RecvData( int8_t *RecvData, uint16_t DataLen ); int8_t RS232_RecvDataWTO( int8_t *RecvData, uint16_t DataLen, int32_t TimeoutMs ); +void RS232_RecvStr( int8_t *pWord ); +int8_t RS232_RecvStrWTO( int8_t *pWord, int32_t TimeoutMs ); /*====================================================================================================*/ /*====================================================================================================*/ #endif diff --git a/Software/BSR_TestUART/Program/experiment_stm32f1.c b/Software/BSR_TestUART/Program/experiment_stm32f1.c index 913a6ef..d5ab201 100644 --- a/Software/BSR_TestUART/Program/experiment_stm32f1.c +++ b/Software/BSR_TestUART/Program/experiment_stm32f1.c @@ -1,34 +1,36 @@ /*====================================================================================================*/ /*====================================================================================================*/ +#include + #include "stm32f1_system.h" #include "experiment_stm32f1.h" #include "module_rs232.h" /*====================================================================================================*/ /*====================================================================================================*/ -#define RECV_DATA_SIZE 1 -#define RECV_DATA_TIMEOUT 500 - int main( void ) { - int8_t State = ERROR; - int8_t RecvData = 0; + static uint8_t i = 0; + static uint8_t RecvData = 0; + static int8_t State = ERROR; GPIO_Config(); RS232_Config(); LED_R = 0; - RS232_SendStr((int8_t*)"\r\nHello World!\r\n\r\n"); + printf("\r\nHello World!\r\n\r\n"); while(1) { LED_G = !LED_G; - State = RS232_RecvDataWTO(&RecvData, RECV_DATA_SIZE, RECV_DATA_TIMEOUT); - if(State == ERROR) - RS232_SendStr((int8_t*)"Timeout ... \r\n"); + State = RS232_RecvDataWTO((int8_t*)&RecvData, 1, 200); + if(State == ERROR) { + printf("Timeout ... %d\r\n", i); + i = (i == 255) ? 0 : i + 1; + } else if(RecvData == 0x0D) // if press enter RS232_SendStr((int8_t*)"\r\n"); else - RS232_SendData(&RecvData, RECV_DATA_SIZE); + RS232_SendData((int8_t*)&RecvData, 1); } } /*====================================================================================================*/ diff --git a/Software/BSR_TestUART/Program/experiment_stm32f1_it.c b/Software/BSR_TestUART/Program/experiment_stm32f1_it.c new file mode 100644 index 0000000..f6066c4 --- /dev/null +++ b/Software/BSR_TestUART/Program/experiment_stm32f1_it.c @@ -0,0 +1,62 @@ +/*====================================================================================================*/ +/*====================================================================================================*/ +#include "stm32f1_system.h" +#include "module_rs232.h" +/*====================================================================================================*/ +/*====================================================================================================*/ +void NMI_Handler( void ) { while(1); } +void HardFault_Handler( void ) { while(1); } +void MemManage_Handler( void ) { while(1); } +void BusFault_Handler( void ) { while(1); } +void UsageFault_Handler( void ) { while(1); } +void SVC_Handler( void ) { while(1); } +void DebugMon_Handler( void ) { while(1); } +void PendSV_Handler( void ) { while(1); } +/*====================================================================================================*/ +/*====================================================================================================*/ +//void SysTick_Handler( void ); +//void WWDG_IRQHandler( void ); +//void PVD_IRQHandler( void ); +//void TAMPER_IRQHandler( void ); +//void RTC_IRQHandler( void ); +//void FLASH_IRQHandler( void ); +//void RCC_IRQHandler( void ); +//void EXTI0_IRQHandler( void ); +//void EXTI1_IRQHandler( void ); +//void EXTI2_IRQHandler( void ); +//void EXTI3_IRQHandler( void ); +//void EXTI4_IRQHandler( void ); +//void DMA1_Channel1_IRQHandler( void ); +//void DMA1_Channel2_IRQHandler( void ); +//void DMA1_Channel3_IRQHandler( void ); +//void DMA1_Channel4_IRQHandler( void ); +//void DMA1_Channel5_IRQHandler( void ); +//void DMA1_Channel6_IRQHandler( void ); +//void DMA1_Channel7_IRQHandler( void ); +//void ADC1_2_IRQHandler( void ); +//void USB_HP_CAN1_TX_IRQHandler( void ); +//void USB_LP_CAN1_RX0_IRQHandler( void ); +//void CAN1_RX1_IRQHandler( void ); +//void CAN1_SCE_IRQHandler( void ); +//void EXTI9_5_IRQHandler( void ); +//void TIM1_BRK_IRQHandler( void ); +//void TIM1_UP_IRQHandler( void ); +//void TIM1_TRG_COM_IRQHandler( void ); +//void TIM1_CC_IRQHandler( void ); +//void TIM2_IRQHandler( void ); +//void TIM3_IRQHandler( void ); +//void TIM4_IRQHandler( void ); +//void I2C1_EV_IRQHandler( void ); +//void I2C1_ER_IRQHandler( void ); +//void I2C2_EV_IRQHandler( void ); +//void I2C2_ER_IRQHandler( void ); +//void SPI1_IRQHandler( void ); +//void SPI2_IRQHandler( void ); +//void USART1_IRQHandler( void ); +//void USART2_IRQHandler( void ); +//void USART3_IRQHandler( void ); +//void EXTI15_10_IRQHandler( void ); +//void RTCAlarm_IRQHandler( void ); +//void USBWakeUp_IRQHandler( void ); +/*====================================================================================================*/ +/*====================================================================================================*/ diff --git a/Software/BSR_TestUART/ProjectBSR/ProjectSTM32.uvguix.Hom b/Software/BSR_TestUART/ProjectBSR/ProjectSTM32.uvguix.Hom index 0091ba7..cfef589 100644 --- a/Software/BSR_TestUART/ProjectBSR/ProjectSTM32.uvguix.Hom +++ b/Software/BSR_TestUART/ProjectBSR/ProjectSTM32.uvguix.Hom @@ -75,25 +75,25 @@ 2 3 - -32000 - -32000 + -1 + -1 -1 -1 - 237 - 777 - 1852 - 953 + 197 + 689 + 1649 + 841 0 - 259 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000100000000000000010000003C433A5C55736572735C486F6D5C4465736B746F705C4265616E5370726F7574525F54657374554152545F32303134303231345C526561646D652E6D640000000009526561646D652E6D6400000000C5D4F200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F4000000650000008007000069030000 + 60 + 010000000400000001000000010000000100000001000000000000000200000000000000010000000100000000000000280000002800000000000000 @@ -116,7 +116,7 @@ 16 - B20300003E010000AE070000CE010000 + 940100006500000090050000F5000000 @@ -1281,14 +1281,14 @@ 2639 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF94010000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000B20300003E010000AE070000CE010000940100004F00000090050000DF0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFFC0300004F000000000400002B020000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C0000018000400000000000001E0600003E010000AE0700001A030000000400004F000000900500002B0200000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000080000000000000FFFFFFFFFFFFFFFF0000000017020000900500001B02000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB090000018000800000000000001E0200000A030000AE070000AE030000000000001B02000090050000BF02000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC80200001B020000CC020000BF02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFFF4000000530300008007000057030000010000000100001004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B4010000779400000180008000000100000012030000460400009E090000D6040000F40000005703000080070000E70300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000E703000001000000020000100400000001000000E4FEFFFF8902000000000000000000000000000001000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000001E0200003E0100000E030000D6040000000000004F000000F0000000E70300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF94010000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000940100006500000090050000F5000000940100004F00000090050000DF0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFFC0300004F000000000400002B020000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C00000180004000000000000000040000650000009005000041020000000400004F000000900500002B0200000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000080000000000000FFFFFFFFFFFFFFFF0000000017020000900500001B02000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003102000090050000D5020000000000001B02000090050000BF02000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC80200001B020000CC020000BF02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFFF4000000530300008007000057030000010000000100001004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000001000000F40000006D03000080070000FD030000F40000005703000080070000E70300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000E703000001000000020000100400000001000000E4FEFFFF8902000000000000000000000000000001000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000065000000F0000000FD030000000000004F000000F0000000E70300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000000000000000000 59392 File - 2288 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000055346313338960000000000000011000553463133380F54494D5F47657449545374617475730854494D782D3E53520A54494D5F506572696F6410554152545F526563764279746557544F0648414E444C4517424C455F474154545F48414E444C455F494E56414C494404757569641E424C455F555549445F4E55535F52585F434841524143544552495354494314424C455F555549445F4E55535F5345525649434509757569645F747970650875696E7433325F74056D5F6E75730665787465726E0F6D5F6E75732E757569645F747970650853463539355F53540853463539355F4F450000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000 + 2307 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000400020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000004000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000004000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000040000000000000000000000000000000000000100000001000000960000000200205000000000094B69745370726F757496000000000000001100094B69745370726F7574182020202020202020202020202020202044434420202020200B4E4D495F48616E646C6572044D61696E0268320977686974656C697374067072696E74660D5343414E5F494E54455256414C0A6F6E5F626C655F6576740C6D5F7363616E5F706172616D19202020202020202020202020202020204443442020202020201055415254305F49525148616E646C65720B636F6D6D5F706172616D73124150505F554152545F4649464F5F494E49540D505F434F4D4D5F504152414D530E696E697469616C697A6174696F6E0E626C655F737461636B5F696E69740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000004001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000 1423 @@ -1339,22 +1339,4 @@ - - 1 - 0 - - 100 - 0 - - C:\Users\Hom\Desktop\BeanSproutR_TestUART_20140214\Readme.md - 16 - 1 - 18 - 1 - - 0 - - - - diff --git a/Software/BSR_TestUART/ProjectBSR/ProjectSTM32.uvoptx b/Software/BSR_TestUART/ProjectBSR/ProjectSTM32.uvoptx index 610efb1..02de78b 100644 --- a/Software/BSR_TestUART/ProjectBSR/ProjectSTM32.uvoptx +++ b/Software/BSR_TestUART/ProjectBSR/ProjectSTM32.uvoptx @@ -82,42 +82,47 @@ 0 Base Board Schematics (MCBSTM32E) - C:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.0.5\Documents\mcbstm32e-base-board-schematics.pdf + C:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Documents\mcbstm32e-base-board-schematics.pdf 1 Display Board Schematics (MCBSTM32E) - C:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.0.5\Documents\mcbstm32e-display-board-schematics.pdf + C:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Documents\mcbstm32e-display-board-schematics.pdf 2 User Manual (MCBSTM32E) - C:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.0.5\Documents\mcbstm32e.chm + C:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Documents\mcbstm32e.chm 3 User Manual (NUCLEO-F103RB) - C:\Keil_v5\ARM\PACK\Keil\STM32NUCLEO_BSP\1.2.0\Documents\DM00105823.pdf + C:\Keil_v5\ARM\PACK\Keil\STM32NUCLEO_BSP\1.3.0\Documents\DM00105823.pdf 4 - Getting started (NUCLEO-F103RB) - C:\Keil_v5\ARM\PACK\Keil\STM32NUCLEO_BSP\1.2.0\Documents\DM00105925.pdf + Overview (NUCLEO-F103RB) + C:\Keil_v5\ARM\PACK\Keil\STM32NUCLEO_BSP\1.3.0\Documents\DM00105918.pdf 5 - Schematics (NUCLEO-F103RB) - C:\Keil_v5\ARM\PACK\Keil\STM32NUCLEO_BSP\1.2.0\Documents\MB1136.pdf + Getting started (NUCLEO-F103RB) + C:\Keil_v5\ARM\PACK\Keil\STM32NUCLEO_BSP\1.3.0\Documents\DM00105925.pdf 6 + Schematics (NUCLEO-F103RB) + C:\Keil_v5\ARM\PACK\Keil\STM32NUCLEO_BSP\1.3.0\Documents\MB1136.pdf + + + 7 MCBSTM32E Evaluation Board Web Page (MCBSTM32E) http://www.keil.com/mcbstm32e/ - 7 - Nucleo STM32 F1 series development board (NUCLEO-F103RB) - http://www.st.com/web/en/catalog/tools/PF259875 + 8 + STM32 Nucleo board (NUCLEO-F103RB) + http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1847/PF259875 @@ -255,6 +260,19 @@ 0 0 + + 2 + 4 + 1 + 0 + 0 + 0 + 0 + ..\Program\experiment_stm32f1_it.c + experiment_stm32f1_it.c + 0 + 0 + @@ -265,7 +283,7 @@ 0 3 - 4 + 5 1 0 0 @@ -286,7 +304,7 @@ 0 4 - 5 + 6 1 0 0 diff --git a/Software/BSR_TestUART/ProjectBSR/ProjectSTM32.uvprojx b/Software/BSR_TestUART/ProjectBSR/ProjectSTM32.uvprojx index f115778..7d39779 100644 --- a/Software/BSR_TestUART/ProjectBSR/ProjectSTM32.uvprojx +++ b/Software/BSR_TestUART/ProjectBSR/ProjectSTM32.uvprojx @@ -14,7 +14,7 @@ STM32F103CB STMicroelectronics - Keil.STM32F1xx_DFP.1.0.5 + Keil.STM32F1xx_DFP.1.1.0 http://www.keil.com/pack/ IROM(0x08000000,0x20000) IRAM(0x20000000,0x5000) CPUTYPE("Cortex-M3") CLOCK(72000000) ELITTLE @@ -428,6 +428,11 @@ 1 ..\Program\experiment_stm32f1.c + + experiment_stm32f1_it.c + 1 + ..\Program\experiment_stm32f1_it.c +