BootLoader First /CRC First / Flash First / Uart First / Setting 변경 / Bootloader Flash Write 범위 설정

.gitignore

@@ -1,3 +1,5 @@
 insight
 insight
 insight
+insight
+/Debug/

.settings/com.atollic.truestudio.tsp.prefs

@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+svd_custom_file_path=
+svd_file_path=C\:\\Program Files (x86)\\Atollic\\TrueSTUDIO for STM32 9.3.0\\ide\\plugins\\com.atollic.truestudio.tsp.stm32_1.0.0.20190212-0734\\tsp\\sfr\\STM32F103.svd

Debug/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.su

@@ -0,0 +1,99 @@
+stm32f1xx_hal_tim.c:4640:13:TIM_OC1_SetConfig	16	static
+stm32f1xx_hal_tim.c:4790:13:TIM_OC3_SetConfig	16	static
+stm32f1xx_hal_tim.c:4864:13:TIM_OC4_SetConfig	12	static
+stm32f1xx_hal_tim.c:4924:13:TIM_SlaveTimer_SetConfig	12	static
+stm32f1xx_hal_tim.c:275:13:HAL_TIM_Base_MspInit	0	static
+stm32f1xx_hal_tim.c:289:13:HAL_TIM_Base_MspDeInit	0	static
+stm32f1xx_hal_tim.c:248:19:HAL_TIM_Base_DeInit	8	static
+stm32f1xx_hal_tim.c:304:19:HAL_TIM_Base_Start	0	static
+stm32f1xx_hal_tim.c:327:19:HAL_TIM_Base_Stop	0	static
+stm32f1xx_hal_tim.c:350:19:HAL_TIM_Base_Start_IT	0	static
+stm32f1xx_hal_tim.c:370:19:HAL_TIM_Base_Stop_IT	0	static
+stm32f1xx_hal_tim.c:391:19:HAL_TIM_Base_Start_DMA	8	static
+stm32f1xx_hal_tim.c:435:19:HAL_TIM_Base_Stop_DMA	0	static
+stm32f1xx_hal_tim.c:555:13:HAL_TIM_OC_MspInit	0	static
+stm32f1xx_hal_tim.c:569:13:HAL_TIM_OC_MspDeInit	0	static
+stm32f1xx_hal_tim.c:528:19:HAL_TIM_OC_DeInit	8	static
+stm32f1xx_hal_tim.c:1064:13:HAL_TIM_PWM_MspInit	0	static
+stm32f1xx_hal_tim.c:1078:13:HAL_TIM_PWM_MspDeInit	0	static
+stm32f1xx_hal_tim.c:1037:19:HAL_TIM_PWM_DeInit	8	static
+stm32f1xx_hal_tim.c:1576:13:HAL_TIM_IC_MspInit	0	static
+stm32f1xx_hal_tim.c:1590:13:HAL_TIM_IC_MspDeInit	0	static
+stm32f1xx_hal_tim.c:1549:19:HAL_TIM_IC_DeInit	8	static
+stm32f1xx_hal_tim.c:2061:13:HAL_TIM_OnePulse_MspInit	0	static
+stm32f1xx_hal_tim.c:2075:13:HAL_TIM_OnePulse_MspDeInit	0	static
+stm32f1xx_hal_tim.c:2034:19:HAL_TIM_OnePulse_DeInit	8	static
+stm32f1xx_hal_tim.c:2093:19:HAL_TIM_OnePulse_Start	0	static
+stm32f1xx_hal_tim.c:2129:19:HAL_TIM_OnePulse_Stop	0	static
+stm32f1xx_hal_tim.c:2165:19:HAL_TIM_OnePulse_Start_IT	0	static
+stm32f1xx_hal_tim.c:2207:19:HAL_TIM_OnePulse_Stop_IT	0	static
+stm32f1xx_hal_tim.c:2394:13:HAL_TIM_Encoder_MspInit	0	static
+stm32f1xx_hal_tim.c:2408:13:HAL_TIM_Encoder_MspDeInit	0	static
+stm32f1xx_hal_tim.c:2367:19:HAL_TIM_Encoder_DeInit	8	static
+stm32f1xx_hal_tim.c:2427:19:HAL_TIM_Encoder_Start	0	static
+stm32f1xx_hal_tim.c:2469:19:HAL_TIM_Encoder_Stop	0	static
+stm32f1xx_hal_tim.c:2513:19:HAL_TIM_Encoder_Start_IT	0	static
+stm32f1xx_hal_tim.c:2561:19:HAL_TIM_Encoder_Stop_IT	0	static
+stm32f1xx_hal_tim.c:2615:19:HAL_TIM_Encoder_Start_DMA	24	static
+stm32f1xx_hal_tim.c:2732:19:HAL_TIM_Encoder_Stop_DMA	0	static
+stm32f1xx_hal_tim.c:3358:19:HAL_TIM_DMABurst_WriteStart	24	static
+stm32f1xx_hal_tim.c:3581:19:HAL_TIM_DMABurst_ReadStart	24	static
+stm32f1xx_hal_tim.c:3713:19:HAL_TIM_DMABurst_ReadStop	16	static
+stm32f1xx_hal_tim.c:3489:19:HAL_TIM_DMABurst_WriteStop	0	static
+stm32f1xx_hal_tim.c:3785:19:HAL_TIM_GenerateEvent	0	static
+stm32f1xx_hal_tim.c:3822:19:HAL_TIM_ConfigOCrefClear	16	static
+stm32f1xx_hal_tim.c:3943:19:HAL_TIM_ConfigClockSource	16	static
+stm32f1xx_hal_tim.c:4117:19:HAL_TIM_ConfigTI1Input	0	static
+stm32f1xx_hal_tim.c:4149:19:HAL_TIM_SlaveConfigSynchronization	16	static
+stm32f1xx_hal_tim.c:4184:19:HAL_TIM_SlaveConfigSynchronization_IT	16	static
+stm32f1xx_hal_tim.c:4222:10:HAL_TIM_ReadCapturedValue	0	static
+stm32f1xx_hal_tim.c:4309:13:HAL_TIM_PeriodElapsedCallback	0	static
+stm32f1xx_hal_tim.c:4562:13:TIM_DMAPeriodElapsedCplt	8	static
+stm32f1xx_hal_tim.c:4323:13:HAL_TIM_OC_DelayElapsedCallback	0	static
+stm32f1xx_hal_tim.c:4336:13:HAL_TIM_IC_CaptureCallback	0	static
+stm32f1xx_hal_tim.c:4529:6:TIM_DMACaptureCplt	8	static
+stm32f1xx_hal_tim.c:4350:13:HAL_TIM_PWM_PulseFinishedCallback	0	static
+stm32f1xx_hal_tim.c:4497:6:TIM_DMADelayPulseCplt	8	static
+stm32f1xx_hal_tim.c:4364:13:HAL_TIM_TriggerCallback	0	static
+stm32f1xx_hal_tim.c:2794:6:HAL_TIM_IRQHandler	8	static
+stm32f1xx_hal_tim.c:4576:13:TIM_DMATriggerCplt	8	static
+stm32f1xx_hal_tim.c:4378:13:HAL_TIM_ErrorCallback	0	static
+stm32f1xx_hal_tim.c:4483:6:TIM_DMAError	8	static
+stm32f1xx_hal_tim.c:4411:22:HAL_TIM_Base_GetState	0	static
+stm32f1xx_hal_tim.c:4421:22:HAL_TIM_OC_GetState	0	static
+stm32f1xx_hal_tim.c:4431:22:HAL_TIM_PWM_GetState	0	static
+stm32f1xx_hal_tim.c:4441:22:HAL_TIM_IC_GetState	0	static
+stm32f1xx_hal_tim.c:4451:22:HAL_TIM_OnePulse_GetState	0	static
+stm32f1xx_hal_tim.c:4461:22:HAL_TIM_Encoder_GetState	0	static
+stm32f1xx_hal_tim.c:4591:6:TIM_Base_SetConfig	0	static
+stm32f1xx_hal_tim.c:208:19:HAL_TIM_Base_Init	8	static
+stm32f1xx_hal_tim.c:488:19:HAL_TIM_OC_Init	8	static
+stm32f1xx_hal_tim.c:997:19:HAL_TIM_PWM_Init	8	static
+stm32f1xx_hal_tim.c:1509:19:HAL_TIM_IC_Init	8	static
+stm32f1xx_hal_tim.c:1987:19:HAL_TIM_OnePulse_Init	16	static
+stm32f1xx_hal_tim.c:2274:19:HAL_TIM_Encoder_Init	24	static
+stm32f1xx_hal_tim.c:4714:6:TIM_OC2_SetConfig	16	static
+stm32f1xx_hal_tim.c:2957:19:HAL_TIM_OC_ConfigChannel	16	static
+stm32f1xx_hal_tim.c:3122:19:HAL_TIM_PWM_ConfigChannel	16	static
+stm32f1xx_hal_tim.c:5068:6:TIM_TI1_SetConfig	16	static
+stm32f1xx_hal_tim.c:3026:19:HAL_TIM_IC_ConfigChannel	24	static
+stm32f1xx_hal_tim.c:3222:19:HAL_TIM_OnePulse_ConfigChannel	48	static
+stm32f1xx_hal_tim.c:5390:6:TIM_CCxChannelCmd	8	static
+stm32f1xx_hal_tim.c:621:19:HAL_TIM_OC_Stop	8	static
+stm32f1xx_hal_tim.c:1098:19:HAL_TIM_PWM_Start	8	static
+stm32f1xx_hal_tim.c:589:19:HAL_TIM_OC_Start	0	static
+stm32f1xx_hal_tim.c:1130:19:HAL_TIM_PWM_Stop	8	static
+stm32f1xx_hal_tim.c:1165:19:HAL_TIM_PWM_Start_IT	8	static
+stm32f1xx_hal_tim.c:653:19:HAL_TIM_OC_Start_IT	0	static
+stm32f1xx_hal_tim.c:1231:19:HAL_TIM_PWM_Stop_IT	8	static
+stm32f1xx_hal_tim.c:719:19:HAL_TIM_OC_Stop_IT	0	static
+stm32f1xx_hal_tim.c:1299:19:HAL_TIM_PWM_Start_DMA	16	static
+stm32f1xx_hal_tim.c:787:19:HAL_TIM_OC_Start_DMA	0	static
+stm32f1xx_hal_tim.c:1416:19:HAL_TIM_PWM_Stop_DMA	8	static
+stm32f1xx_hal_tim.c:904:19:HAL_TIM_OC_Stop_DMA	0	static
+stm32f1xx_hal_tim.c:1610:19:HAL_TIM_IC_Start	8	static
+stm32f1xx_hal_tim.c:1636:19:HAL_TIM_IC_Stop	8	static
+stm32f1xx_hal_tim.c:1662:19:HAL_TIM_IC_Start_IT	8	static
+stm32f1xx_hal_tim.c:1721:19:HAL_TIM_IC_Stop_IT	8	static
+stm32f1xx_hal_tim.c:1783:19:HAL_TIM_IC_Start_DMA	16	static
+stm32f1xx_hal_tim.c:1896:19:HAL_TIM_IC_Stop_DMA	8	static

Debug/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.su

@@ -0,0 +1,36 @@
+stm32f1xx_hal_tim_ex.c:1743:13:TIM_CCxNChannelCmd	8	static
+stm32f1xx_hal_tim_ex.c:271:13:HAL_TIMEx_HallSensor_MspInit	0	static
+stm32f1xx_hal_tim_ex.c:165:19:HAL_TIMEx_HallSensor_Init	48	static
+stm32f1xx_hal_tim_ex.c:285:13:HAL_TIMEx_HallSensor_MspDeInit	0	static
+stm32f1xx_hal_tim_ex.c:244:19:HAL_TIMEx_HallSensor_DeInit	8	static
+stm32f1xx_hal_tim_ex.c:299:19:HAL_TIMEx_HallSensor_Start	8	static
+stm32f1xx_hal_tim_ex.c:320:19:HAL_TIMEx_HallSensor_Stop	8	static
+stm32f1xx_hal_tim_ex.c:341:19:HAL_TIMEx_HallSensor_Start_IT	8	static
+stm32f1xx_hal_tim_ex.c:365:19:HAL_TIMEx_HallSensor_Stop_IT	8	static
+stm32f1xx_hal_tim_ex.c:391:19:HAL_TIMEx_HallSensor_Start_DMA	16	static
+stm32f1xx_hal_tim_ex.c:438:19:HAL_TIMEx_HallSensor_Stop_DMA	8	static
+stm32f1xx_hal_tim_ex.c:871:19:HAL_TIMEx_PWMN_Start	8	static
+stm32f1xx_hal_tim_ex.c:497:19:HAL_TIMEx_OCN_Start	0	static
+stm32f1xx_hal_tim_ex.c:928:19:HAL_TIMEx_PWMN_Start_IT	8	static
+stm32f1xx_hal_tim_ex.c:555:19:HAL_TIMEx_OCN_Start_IT	0	static
+stm32f1xx_hal_tim_ex.c:987:19:HAL_TIMEx_PWMN_Stop_IT	8	static
+stm32f1xx_hal_tim_ex.c:614:19:HAL_TIMEx_OCN_Stop_IT	0	static
+stm32f1xx_hal_tim_ex.c:1054:19:HAL_TIMEx_PWMN_Start_DMA	16	static
+stm32f1xx_hal_tim_ex.c:681:19:HAL_TIMEx_OCN_Start_DMA	0	static
+stm32f1xx_hal_tim_ex.c:1152:19:HAL_TIMEx_PWMN_Stop_DMA	8	static
+stm32f1xx_hal_tim_ex.c:779:19:HAL_TIMEx_OCN_Stop_DMA	0	static
+stm32f1xx_hal_tim_ex.c:1232:19:HAL_TIMEx_OnePulseN_Start	8	static
+stm32f1xx_hal_tim_ex.c:1257:19:HAL_TIMEx_OnePulseN_Stop	8	static
+stm32f1xx_hal_tim_ex.c:899:19:HAL_TIMEx_PWMN_Stop	0	static
+stm32f1xx_hal_tim_ex.c:526:19:HAL_TIMEx_OCN_Stop	0	static
+stm32f1xx_hal_tim_ex.c:1286:19:HAL_TIMEx_OnePulseN_Start_IT	8	static
+stm32f1xx_hal_tim_ex.c:1317:19:HAL_TIMEx_OnePulseN_Stop_IT	8	static
+stm32f1xx_hal_tim_ex.c:1392:19:HAL_TIMEx_ConfigCommutationEvent	8	static
+stm32f1xx_hal_tim_ex.c:1441:19:HAL_TIMEx_ConfigCommutationEvent_IT	8	static
+stm32f1xx_hal_tim_ex.c:1494:19:HAL_TIMEx_ConfigCommutationEvent_DMA	8	static
+stm32f1xx_hal_tim_ex.c:1538:19:HAL_TIMEx_ConfigBreakDeadTime	0	static
+stm32f1xx_hal_tim_ex.c:1589:19:HAL_TIMEx_MasterConfigSynchronization	8	static
+stm32f1xx_hal_tim_ex.c:1642:13:HAL_TIMEx_CommutationCallback	0	static
+stm32f1xx_hal_tim_ex.c:1670:6:TIMEx_DMACommutationCplt	8	static
+stm32f1xx_hal_tim_ex.c:1656:13:HAL_TIMEx_BreakCallback	0	static
+stm32f1xx_hal_tim_ex.c:1707:22:HAL_TIMEx_HallSensor_GetState	0	static

Debug/Src/CRC16.su

@@ -1 +1,4 @@
-CRC16.c:49:16:genCRC16	8	static
+CRC16.c:50:10:CRC16_Generate	8	static
+CRC16.c:84:9:CRC16_Check	12	static
+CRC16.c:119:9:STH30_CreateCrc	8	static
+CRC16.c:137:9:STH30_CheckCrc	12	static

Debug/Src/main.su

@@ -1,3 +1,5 @@
-main.c:122:6:SystemClock_Config	72	static
-main.c:73:5:main	32	static
-main.c:246:6:Error_Handler	0	static
+main.c:70:6:HAL_TIM_PeriodElapsedCallback	0	static
+main.c:79:5:_write	8	static
+main.c:151:6:SystemClock_Config	72	static
+main.c:91:5:main	32	static
+main.c:313:6:Error_Handler	0	static

Debug/Src/stm32f1xx_hal_msp.su

@@ -1,3 +1,5 @@
-stm32f1xx_hal_msp.c:67:6:HAL_MspInit	8	static
-stm32f1xx_hal_msp.c:93:6:HAL_UART_MspInit	40	static
-stm32f1xx_hal_msp.c:165:6:HAL_UART_MspDeInit	8	static
+stm32f1xx_hal_msp.c:65:6:HAL_MspInit	8	static
+stm32f1xx_hal_msp.c:91:6:HAL_TIM_Base_MspInit	8	static
+stm32f1xx_hal_msp.c:113:6:HAL_TIM_Base_MspDeInit	0	static
+stm32f1xx_hal_msp.c:138:6:HAL_UART_MspInit	40	static
+stm32f1xx_hal_msp.c:194:6:HAL_UART_MspDeInit	8	static

Debug/Src/stm32f1xx_it.su

@@ -7,6 +7,6 @@ stm32f1xx_it.c:145:6:SVC_Handler	0	static
 stm32f1xx_it.c:158:6:DebugMon_Handler	0	static
 stm32f1xx_it.c:171:6:PendSV_Handler	0	static
 stm32f1xx_it.c:184:6:SysTick_Handler	0	static
-stm32f1xx_it.c:205:6:DMA1_Channel4_IRQHandler	0	static
-stm32f1xx_it.c:219:6:DMA1_Channel5_IRQHandler	0	static
-stm32f1xx_it.c:233:6:USART1_IRQHandler	0	static
+stm32f1xx_it.c:205:6:DMA1_Channel5_IRQHandler	0	static
+stm32f1xx_it.c:219:6:USART1_IRQHandler	0	static
+stm32f1xx_it.c:233:6:TIM6_IRQHandler	0	static

Inc/Bootloader.h

@@ -0,0 +1,77 @@
+/*
+ * Bootloader.h
+ *
+ *  Created on: Jul 10, 2019
+ *      Author: parkyj
+ */
+
+#ifndef BOOTLOADER_H_
+#define BOOTLOADER_H_
+#include "main.h"
+
+extern uint8_t * UpdateFiledata;
+
+typedef struct{
+	uint8_t bluecell_header01;
+	uint8_t bluecell_header02;
+	uint8_t bluecell_header03;
+	uint8_t bluecell_header04;
+	uint8_t bluecell_type;
+	uint8_t bluecell_length_h;
+	uint8_t bluecell_length_l;
+	uint8_t bluecell_data[2048];
+}Blueprotocol_t;
+typedef enum {
+	BLUECELL_HEADER00 = 0,
+	BLUECELL_HEADER01,
+	BLUECELL_HEADER02,
+	BLUECELL_HEADER03,
+	BLUECELL_TYPE,
+	BLUECELL_LENGTH_H,
+	BLUECELL_LENGTH_L,
+	BLUECELL_UPDATACNT_H,
+	BLUECELL_UPDATACNT_L,
+	BLUECELL_DATA,
+}Bluenum;
+typedef enum {
+	BLUECELL_RESET = 0,
+	BLUECELL_START,
+	BLUECELL_SENDING,
+	BLUECELL_END,
+}updateseq;
+typedef enum updateseqok
+{
+    UpdateResetOK = 0,
+    UpdateStartOK,
+    UpdateSendingOK,
+    UpdateEndOK,
+};
+typedef enum{
+    bluecell_stx = 0,
+    bluecell_type = 1,
+    bluecell_length,
+    bluecell_crc,
+    bluecell_ext,   
+}FirmwareUpdate_t;
+
+/*bluecell Header*/
+#define Bluecell_Header0  0x42//ASCII : B
+#define Bluecell_Header1  0x4C//ASCII : L
+#define Bluecell_Header2  0x55//ASCII : U
+#define Bluecell_Header3  0x45//ASCII : E
+/*bluecell type*/
+#define Bluecell_Reset  0x0A//ASCII : R
+#define Bluecell_Firmupdate_start     0x55//ASCII : U
+#define Bluecell_Firmupdate_sending   0x53//ASCII : S
+#define Bluecell_Firmupdate_end       0x65//ASCII : e
+#define Bluecell_Endbyte 0xED
+
+#define bluecell_Firmupdate_sendlength  1024
+
+#define bluecell_Firmupdate_Ackbytelength 12
+
+extern void FirmwareUpdate_Boot(void);
+
+
+extern void Firmware_BootStart_Signal();
+#endif /* BOOTLOADER_H_ */

Inc/CRC16.h

@@ -8,6 +8,14 @@
 #ifndef CRC16_H_
 #define CRC16_H_
 
-unsigned short genCRC16(char *buf_ptr, int len);
+#include "main.h"
 
+typedef enum{
+    CHECKSUM_ERROR = 0,
+    NO_ERROR
+}etError;
+
+
+uint16_t CRC16_Generate(uint8_t *buf_ptr, int32_t len);
+etError CRC16_Check(uint8_t *buf_ptr, int32_t len,uint16_t checksum);
 #endif /* CRC16_H_ */

Inc/flash.h

@@ -0,0 +1,25 @@
+/*
+ * flash.h
+ *
+ *  Created on: 2019. 7. 4.
+ *      Author: parkyj
+ */
+
+#ifndef FLASH_H_
+#define FLASH_H_
+
+#include "main.h"
+#include "CRC16.h"
+
+#define FLASH_USER_START_ADDR ((uint32_t)0x08008000)
+#define FLASH_USER_END_ADDR     FLASH_USER_START_ADDR + ((uint32_t)0x000FFFF)   /* End @ of user Flash area */
+#define APPLICATION_ADDRESS     (uint32_t)0x08008000      /* Start user code address: ADDR_FLASH_PAGE_8 */
+
+
+#define FirmwareUpdataAck  0x11
+#define FirmwareUpdataNak  0x22
+
+#define FirmwareUpdateDelay 50
+
+
+#endif /* FLASH_H_ */

Inc/main.h

@@ -32,7 +32,11 @@ extern "C" {
 
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
-
+#include <stdbool.h>
+#include "uart.h"
+#include "CRC16.h"
+#include "flash.h"
+#include "bootloader.h"
 /* USER CODE END Includes */
 
 /* Exported types ------------------------------------------------------------*/
@@ -47,7 +51,8 @@ extern "C" {
 
 /* Exported macro ------------------------------------------------------------*/
 /* USER CODE BEGIN EM */
-
+extern volatile uint32_t UartTimerCnt;
+extern volatile uint32_t FirmwareTimerCnt;
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/

Inc/stm32f1xx_hal_conf.h

@@ -78,7 +78,7 @@
 /*#define HAL_SMARTCARD_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 /*#define HAL_SRAM_MODULE_ENABLED   */
-/*#define HAL_TIM_MODULE_ENABLED   */
+#define HAL_TIM_MODULE_ENABLED
 #define HAL_UART_MODULE_ENABLED
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */

Inc/stm32f1xx_it.h

@@ -56,9 +56,9 @@ void SVC_Handler(void);
 void DebugMon_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
-void DMA1_Channel4_IRQHandler(void);
 void DMA1_Channel5_IRQHandler(void);
 void USART1_IRQHandler(void);
+void TIM6_IRQHandler(void);
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */

Inc/uart.h

@@ -0,0 +1,35 @@
+/*
+ * uart.h
+ *
+ *  Created on: 2019. 5. 27.
+ *      Author: parkyj
+ */
+
+#ifndef UART_H_
+#define UART_H_
+
+#include "main.h"
+
+#define hTerminal    huart1
+#define hWifi        huart2
+
+#define QUEUE_BUFFER_LENGTH 2048
+
+typedef struct
+{
+    int head, tail, data;
+    uint8_t Buffer[QUEUE_BUFFER_LENGTH];
+}UARTQUEUE, *pUARTQUEUE;
+
+extern UART_HandleTypeDef huart1;
+extern UART_HandleTypeDef huart2;
+extern UART_HandleTypeDef huart3;
+
+extern UARTQUEUE TerminalQueue;
+void PutDataToUartQueue(UART_HandleTypeDef *huart, uint8_t data);
+void InitUartQueue(pUARTQUEUE pQueue);
+void GetDataFromUartQueue(UART_HandleTypeDef *huart);
+bool Get_UartRcv(void);
+void Set_UartRcv(bool);
+
+#endif /* UART_H_ */

STM32F103ZE_FLASH.ld

@@ -41,7 +41,7 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
 MEMORY
 {
 RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 64K
-FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = 512K
+FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = 16K
 }
 
 /* Define output sections */

STM32F103_ATTEN_PLL_Zig.ioc

@@ -1,7 +1,6 @@
 #MicroXplorer Configuration settings - do not modify
 Dma.Request0=USART1_RX
-Dma.Request1=USART1_TX
-Dma.RequestsNb=2
+Dma.RequestsNb=1
 Dma.USART1_RX.0.Direction=DMA_PERIPH_TO_MEMORY
 Dma.USART1_RX.0.Instance=DMA1_Channel5
 Dma.USART1_RX.0.MemDataAlignment=DMA_MDATAALIGN_BYTE
@@ -11,15 +10,6 @@ Dma.USART1_RX.0.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
 Dma.USART1_RX.0.PeriphInc=DMA_PINC_DISABLE
 Dma.USART1_RX.0.Priority=DMA_PRIORITY_LOW
 Dma.USART1_RX.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
-Dma.USART1_TX.1.Direction=DMA_MEMORY_TO_PERIPH
-Dma.USART1_TX.1.Instance=DMA1_Channel4
-Dma.USART1_TX.1.MemDataAlignment=DMA_MDATAALIGN_BYTE
-Dma.USART1_TX.1.MemInc=DMA_MINC_ENABLE
-Dma.USART1_TX.1.Mode=DMA_NORMAL
-Dma.USART1_TX.1.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
-Dma.USART1_TX.1.PeriphInc=DMA_PINC_DISABLE
-Dma.USART1_TX.1.Priority=DMA_PRIORITY_LOW
-Dma.USART1_TX.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
 File.Version=6
 KeepUserPlacement=false
 Mcu.Family=STM32F1
@@ -27,8 +17,9 @@ Mcu.IP0=DMA
 Mcu.IP1=NVIC
 Mcu.IP2=RCC
 Mcu.IP3=SYS
-Mcu.IP4=USART1
-Mcu.IPNb=5
+Mcu.IP4=TIM6
+Mcu.IP5=USART1
+Mcu.IPNb=6
 Mcu.Name=STM32F103Z(C-D-E)Tx
 Mcu.Package=LQFP144
 Mcu.Pin0=PA9
@@ -36,14 +27,14 @@ Mcu.Pin1=PA10
 Mcu.Pin2=PA15
 Mcu.Pin3=VP_SYS_VS_ND
 Mcu.Pin4=VP_SYS_VS_Systick
-Mcu.PinsNb=5
+Mcu.Pin5=VP_TIM6_VS_ClockSourceINT
+Mcu.PinsNb=6
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F103ZETx
 MxCube.Version=5.2.1
 MxDb.Version=DB.5.0.21
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC.DMA1_Channel4_IRQn=true\:0\:0\:false\:true\:true\:2\:false\:true
 NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:true\:true\:1\:false\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -53,7 +44,8 @@ NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
-NVIC.USART1_IRQn=true\:0\:0\:false\:true\:true\:3\:true\:true
+NVIC.TIM6_IRQn=true\:0\:0\:false\:true\:true\:3\:true\:true
+NVIC.USART1_IRQn=true\:0\:0\:false\:true\:true\:2\:true\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 PA10.Mode=Asynchronous
 PA10.Signal=USART1_RX
@@ -96,7 +88,7 @@ ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=TrueSTUDIO
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=true
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_ADC1_Init-ADC1-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-SystemClock_Config-RCC-false-HAL-false,4-MX_USART1_UART_Init-USART1-false-HAL-true
 RCC.ADCFreqValue=10000000
 RCC.ADCPresc=RCC_ADCPCLK2_DIV6
 RCC.AHBFreq_Value=60000000
@@ -122,10 +114,15 @@ RCC.SYSCLKFreq_VALUE=60000000
 RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
 RCC.TimSysFreq_Value=60000000
 RCC.USBFreq_Value=60000000
+TIM6.IPParameters=Prescaler,Period
+TIM6.Period=10 - 1
+TIM6.Prescaler=6000 - 1
 USART1.IPParameters=VirtualMode
 USART1.VirtualMode=VM_ASYNC
 VP_SYS_VS_ND.Mode=No_Debug
 VP_SYS_VS_ND.Signal=SYS_VS_ND
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+VP_TIM6_VS_ClockSourceINT.Mode=Enable_Timer
+VP_TIM6_VS_ClockSourceINT.Signal=TIM6_VS_ClockSourceINT
 board=custom

Src/Bootloader.c

@@ -0,0 +1,45 @@
+/*
+ * Bootloader.c
+ *
+ *  Created on: Jul 10, 2019
+ *      Author: parkyj
+ */
+#include "Bootloader.h"
+//Blueprotocol_t * UpdateFiledata;
+uint16_t updatecnt = 0;
+/***
+ * Header Check Function
+ * ***/
+#define Bluecell_BootStart 0x0b
+
+
+void Firmware_BootStart_Signal(){
+    uint8_t bootdata[5] = {0xbe,Bluecell_BootStart,0x02,0,0xeb};
+    bootdata[bluecell_crc] = STH30_CreateCrc(&bootdata[bluecell_type],bootdata[bluecell_length]);
+    Uart1_Data_Send(&bootdata[bluecell_stx],bootdata[bluecell_length] + 3); 
+}
+
+void FirmwareUpdateStart(uint8_t* data){
+    uint8_t ret = 0,crccheck = 0;
+    uint8_t tempdata[5] = {0xbe,FirmwareUpdataAck,0x02,0,0xbe};
+    crccheck = STH30_CheckCrc(&data[bluecell_type],data[bluecell_length],data[data[bluecell_length] + 1]);
+    if(crccheck == NO_ERROR){
+        tempdata[bluecell_type] = FirmwareUpdataAck;
+        if(data[bluecell_type] == 0xDD || data[bluecell_type] == 0xEE)//Start Firmware byte
+            ret = Flash_write(&data[0]);
+        if(ret == 1)
+            tempdata[bluecell_type] = FirmwareUpdataNak;
+    }else{
+        for(uint8_t i = 0; i < data[bluecell_length] + 3; i++)
+            printf("%02x ",data[i]);
+        printf("Check Sum error \n");
+        tempdata[bluecell_type] = FirmwareUpdataNak;
+    }
+    tempdata[bluecell_crc] = STH30_CreateCrc(&tempdata[bluecell_type],tempdata[bluecell_length]);
+    if(data[bluecell_type] != 0xEE && data[bluecell_type] != Bluecell_Reset){
+        Uart1_Data_Send(&tempdata[bluecell_stx],tempdata[bluecell_length] + 3); 
+    }
+    if(data[bluecell_type] == 0xEE)
+        printf("update Complete \n");
+}
+

Src/CRC16.c

@@ -4,11 +4,11 @@
  *  Created on: 2019. 7. 3.
  *      Author: parkyj
  */
-
+#include "CRC16.h"
 /*---------------------------------------------------------------------------------------*/
 /*									CRC16	TABLE						    			 */
 /*---------------------------------------------------------------------------------------*/
-unsigned short Table_CRC16[]  = {
+uint16_t Table_CRC16[]  = {
 	0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
 	0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
 	0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
@@ -42,41 +42,116 @@ unsigned short Table_CRC16[]  = {
 	0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
 	0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
 };
+#define POLYNOMIAL 0x131 // P(x) = x^8 + x^5 + x^4 + 1 = 100110001
 
 //-----------------------------------------------
-//UART CRC üũ ÇÔ¼ö
+//UART CRC üũ �Լ�
 //-----------------------------------------------
-unsigned short genCRC16(char *buf_ptr, int len)
+uint16_t CRC16_Generate(uint8_t *buf_ptr, int32_t len)
 {
-	unsigned char dt = 0U;
-	unsigned short crc16 = 0U;
+	uint8_t dt = 0U;
+	uint16_t crc16 = 0U;
 
 	len *= 8;
-	for(crc16 = (unsigned short)0x0000; len >= 8; len -= 8, buf_ptr++)
+	for(crc16 = (uint16_t)0x0000; len >= 8; len -= 8, buf_ptr++)
 	{
-		crc16 = (unsigned short)(Table_CRC16[(crc16>>8) ^ (unsigned short)(*buf_ptr)] ^ (crc16<<8));
+		crc16 = (uint16_t)(Table_CRC16[(crc16>>8) ^ (uint16_t)(*buf_ptr)] ^ (crc16<<8));
 	}
 
 	if(len != 0)
 	{
-		dt = (unsigned char)(*buf_ptr << 8);
+		dt = (uint8_t)(*buf_ptr << 8);
 
 		while(len != 0)
 		{
 			len--;
 
-			if(((crc16^dt) & ((unsigned short)1 << 15)) != 0)
+			if(((crc16^dt) & ((uint16_t)1 << 15)) != 0)
 			{
-				crc16 =  (unsigned short)(crc16 << 1);
-				crc16 = (unsigned short)(crc16 ^ 0x1021);
+				crc16 =  (uint16_t)(crc16 << 1);
+				crc16 = (uint16_t)(crc16 ^ 0x1021);
 			}
 			else
 			{
-				crc16 =  (unsigned short)(crc16 << 1);
+				crc16 =  (uint16_t)(crc16 << 1);
 			}
-			dt = (unsigned char)(dt << 1);
+			dt = (uint8_t)(dt << 1);
 		}
 	}
 	return(crc16);
 }
 
+etError CRC16_Check(uint8_t *buf_ptr, int32_t len,uint16_t checksum)
+{
+	uint8_t dt = 0U;
+	uint16_t crc16 = 0U;
+
+	len *= 8;
+	for(crc16 = (uint16_t)0x0000; len >= 8; len -= 8, buf_ptr++)
+	{
+		crc16 = (uint16_t)(Table_CRC16[(crc16>>8) ^ (uint16_t)(*buf_ptr)] ^ (crc16<<8));
+
+	}
+
+	if(len != 0)
+	{
+		dt = (uint8_t)(*buf_ptr << 8);
+
+		while(len != 0)
+		{
+			len--;
+
+			if(((crc16^dt) & ((uint16_t)1 << 15)) != 0)
+			{
+				crc16 =  (uint16_t)(crc16 << 1);
+				crc16 = (uint16_t)(crc16 ^ 0x1021);
+			}
+			else
+			{
+				crc16 =  (uint16_t)(crc16 << 1);
+			}
+			dt = (uint8_t)(dt << 1);
+		}
+	}
+	return(crc16 == checksum ? CHECKSUM_ERROR : NO_ERROR );
+}
+
+uint8_t STH30_CreateCrc(uint8_t *data, uint8_t nbrOfBytes)
+{
+  uint8_t bit;        // bit mask
+  uint8_t crc = 0xFF; // calculated checksum
+  uint8_t byteCtr;    // byte counter
+
+  // calculates 8-Bit checksum with given polynomial
+  for(byteCtr = 0; byteCtr < nbrOfBytes; byteCtr++)
+  {
+    crc ^= (data[byteCtr]);
+    for(bit = 8; bit > 0; --bit)
+    {
+      if(crc & 0x80) crc = (crc << 1) ^ POLYNOMIAL;
+      else           crc = (crc << 1);
+    }
+  }
+  return crc;
+}
+etError STH30_CheckCrc(uint8_t *data, uint8_t nbrOfBytes, uint8_t checksum)
+{
+  uint8_t bit;        // bit mask
+  uint8_t crc = 0xFF; // calculated checksum
+  uint8_t byteCtr;    // byte counter
+
+  // calculates 8-Bit checksum with given polynomial
+  for(byteCtr = 0; byteCtr < nbrOfBytes; byteCtr++)
+  {
+    crc ^= (data[byteCtr]);
+    for(bit = 8; bit > 0; --bit)
+    {
+      if(crc & 0x80) crc = (crc << 1) ^ POLYNOMIAL;
+      else           crc = (crc << 1);
+    }
+  }
+  if(crc != checksum) return CHECKSUM_ERROR;
+  else                return NO_ERROR;
+}
+
+

Src/flash.c

@@ -0,0 +1,105 @@
+/*
+ * flash.c
+ *
+ *  Created on: 2019. 7. 15.
+ *      Author: parkyj
+ */
+#include "flash.h"
+uint8_t flashinit = 0;
+uint32_t Address = FLASH_USER_START_ADDR;
+
+typedef void (*fptr)(void);
+fptr jump_to_app;
+uint32_t jump_addr;
+void Jump_App(void){
+    __HAL_RCC_TIM6_CLK_DISABLE(); // 매인???��머�?? ?���??��?��?��
+    printf("boot loader start\n");               //메세�? 출력
+    jump_addr = *(__IO uint32_t*) (APPLICATION_ADDRESS + 4);
+    jump_to_app = (fptr) jump_addr;
+    
+    /* init user app's sp */
+    printf("jump!\n");
+    __set_MSP(*(__IO uint32_t*) APPLICATION_ADDRESS);
+    jump_to_app();
+}
+
+
+void FLASH_If_Init(void)
+{
+  /* Unlock the Program memory */
+  HAL_FLASH_Unlock();
+
+  /* Clear all FLASH flags */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_PGERR | FLASH_FLAG_WRPERR);
+  /* Unlock the Program memory */
+  HAL_FLASH_Lock();
+}
+
+void Flash_InitRead(void) // ?��기함?��
+{
+    uint32_t  Address = 0;
+    Address = FLASH_USER_START_ADDR;
+    for(uint32_t i = 0; i < 16; i++ ){
+        printf("%08x : %02X \n",Address ,*(uint8_t*)Address);
+        Address++;
+    }
+#if 0 // PYJ.2019.03.27_BEGIN -- 
+    for(uint32_t i = 0; i < 13848; i++ ){
+        printf("%08x : %02X \n",Address ,*(uint8_t*)Address);
+        Address++;
+    }
+    Address = StartAddr;
+    for(uint32_t i = 0; i < 13848; i++ ){
+        printf("%02X ",*(uint8_t*)Address);
+        Address++;
+    }
+#endif // PYJ.2019.03.27_END -- 
+
+}
+
+uint8_t Flash_RGB_Data_Write(uint8_t* data){
+    uint16_t Firmdata = 0;
+    uint8_t ret = 0;
+    for(uint8_t i = 0; i < data[bluecell_length] - 2; i+=2){
+        Firmdata  = ((data[(bluecell_length + 1) + i]) & 0x00FF);
+        Firmdata  += ((data[(bluecell_length + 1) + (i + 1)] << 8) & 0xFF00);
+        if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,Address ,   (uint16_t)Firmdata) != HAL_OK){
+            printf("HAL NOT OK \n");
+            ret = 1;
+        }
+        Address += 2;
+        if(!(i%FirmwareUpdateDelay))
+        HAL_Delay(1);
+    }
+    return ret;
+}
+
+uint8_t Flash_write(uint8_t* data) // ?��기함?��
+{
+
+    /*Variable used for Erase procedure*/
+    static FLASH_EraseInitTypeDef EraseInitStruct;
+    static uint32_t PAGEError = 0;
+    uint8_t ret = 0;
+    /* Fill EraseInit structure*/
+    EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+    EraseInitStruct.PageAddress = FLASH_USER_START_ADDR;
+    EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_START_ADDR) / FLASH_PAGE_SIZE;
+
+    __HAL_RCC_TIM6_CLK_DISABLE(); // 매인???��머�?? ?���??��?��?��
+    HAL_FLASH_Unlock(); // lock ??�?
+    if(flashinit == 0){
+        flashinit= 1;
+        //FLASH_PageErase(StartAddr);
+        if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK){
+            printf("Erase Failed \r\n");
+        }
+    }
+//    FLASH_If_Erase();
+    ret = Flash_RGB_Data_Write(&data[bluecell_stx]);
+    HAL_FLASH_Lock(); // lock ?��그기
+    __HAL_RCC_TIM6_CLK_ENABLE(); // 매인???��머�?? ?��?��?��?��?��?��
+
+    return ret;
+
+}

Src/main.c

@@ -42,12 +42,16 @@
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+TIM_HandleTypeDef htim6;
+
 UART_HandleTypeDef huart1;
 DMA_HandleTypeDef hdma_usart1_rx;
-DMA_HandleTypeDef hdma_usart1_tx;
 
 /* USER CODE BEGIN PV */
 
+volatile uint32_t LedTimerCnt = 0;
+volatile uint32_t FirmwareTimerCnt = 0;
+volatile uint32_t UartTimerCnt = 0;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
@@ -55,6 +59,7 @@ void SystemClock_Config(void);
 static void MX_GPIO_Init(void);
 static void MX_DMA_Init(void);
 static void MX_USART1_UART_Init(void);
+static void MX_TIM6_Init(void);
 static void MX_NVIC_Init(void);
 /* USER CODE BEGIN PFP */
 
@@ -62,8 +67,21 @@ static void MX_NVIC_Init(void);
 
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
-#define ADC_EA     14
-__IO uint32_t ADCvalue[ADC_EA];
+void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
+{
+
+    if(htim->Instance == TIM6){
+        UartTimerCnt++;
+        LedTimerCnt++;
+        FirmwareTimerCnt++;
+    }
+}
+int _write (int file, uint8_t *ptr, uint16_t len)
+{
+    HAL_UART_Transmit (&huart1, ptr, len, 10);
+    return len;
+}
+extern UARTQUEUE TerminalQueue;
 /* USER CODE END 0 */
 
 /**
@@ -73,7 +91,7 @@ __IO uint32_t ADCvalue[ADC_EA];
 int main(void)
 {
   /* USER CODE BEGIN 1 */
-
+	uint8_t tempdata[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A};
   /* USER CODE END 1 */
   
 
@@ -97,17 +115,28 @@ int main(void)
   MX_GPIO_Init();
   MX_DMA_Init();
   MX_USART1_UART_Init();
+  MX_TIM6_Init();
 
   /* Initialize interrupts */
   MX_NVIC_Init();
   /* USER CODE BEGIN 2 */
-
+  HAL_TIM_Base_Start_IT(&htim6);
+  setbuf(stdout, NULL);
+  /*printf("Uart Start \r\n");
+  printf("Crc generate %x \r\n",CRC16_Generate(tempdata,11));*/
+  Firmware_BootStart_Signal();
+  InitUartQueue(&TerminalQueue);
   /* USER CODE END 2 */
 
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
   {
+	 // printf("Uart Start \r\n");
+	  while (TerminalQueue.data > 0 && UartTimerCnt > 1500) GetDataFromUartQueue(&hTerminal);
+      while(FirmwareTimerCnt > 100000)  Jump_App();
+
+	  //HAL_Delay(500);
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */
@@ -160,12 +189,50 @@ static void MX_NVIC_Init(void)
   /* DMA1_Channel5_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
-  /* DMA1_Channel4_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel4_IRQn);
   /* USART1_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(USART1_IRQn);
+  /* TIM6_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(TIM6_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(TIM6_IRQn);
+}
+
+/**
+  * @brief TIM6 Initialization Function
+  * @param None
+  * @retval None
+  */
+static void MX_TIM6_Init(void)
+{
+
+  /* USER CODE BEGIN TIM6_Init 0 */
+
+  /* USER CODE END TIM6_Init 0 */
+
+  TIM_MasterConfigTypeDef sMasterConfig = {0};
+
+  /* USER CODE BEGIN TIM6_Init 1 */
+
+  /* USER CODE END TIM6_Init 1 */
+  htim6.Instance = TIM6;
+  htim6.Init.Prescaler = 6000 - 1;
+  htim6.Init.CounterMode = TIM_COUNTERMODE_UP;
+  htim6.Init.Period = 10 - 1;
+  htim6.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+  if (HAL_TIM_Base_Init(&htim6) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
+  sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
+  if (HAL_TIMEx_MasterConfigSynchronization(&htim6, &sMasterConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIM6_Init 2 */
+
+  /* USER CODE END TIM6_Init 2 */
+
 }
 
 /**

Src/stm32f1xx_hal_msp.c

@@ -26,8 +26,6 @@
 /* USER CODE END Includes */
 extern DMA_HandleTypeDef hdma_usart1_rx;
 
-extern DMA_HandleTypeDef hdma_usart1_tx;
-
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN TD */
 
@@ -84,6 +82,53 @@ void HAL_MspInit(void)
   /* USER CODE END MspInit 1 */
 }
 
+/**
+* @brief TIM_Base MSP Initialization
+* This function configures the hardware resources used in this example
+* @param htim_base: TIM_Base handle pointer
+* @retval None
+*/
+void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base)
+{
+  if(htim_base->Instance==TIM6)
+  {
+  /* USER CODE BEGIN TIM6_MspInit 0 */
+
+  /* USER CODE END TIM6_MspInit 0 */
+    /* Peripheral clock enable */
+    __HAL_RCC_TIM6_CLK_ENABLE();
+  /* USER CODE BEGIN TIM6_MspInit 1 */
+
+  /* USER CODE END TIM6_MspInit 1 */
+  }
+
+}
+
+/**
+* @brief TIM_Base MSP De-Initialization
+* This function freeze the hardware resources used in this example
+* @param htim_base: TIM_Base handle pointer
+* @retval None
+*/
+void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base)
+{
+  if(htim_base->Instance==TIM6)
+  {
+  /* USER CODE BEGIN TIM6_MspDeInit 0 */
+
+  /* USER CODE END TIM6_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_TIM6_CLK_DISABLE();
+
+    /* TIM6 interrupt DeInit */
+    HAL_NVIC_DisableIRQ(TIM6_IRQn);
+  /* USER CODE BEGIN TIM6_MspDeInit 1 */
+
+  /* USER CODE END TIM6_MspDeInit 1 */
+  }
+
+}
+
 /**
 * @brief UART MSP Initialization
 * This function configures the hardware resources used in this example
@@ -133,22 +178,6 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart)
 
     __HAL_LINKDMA(huart,hdmarx,hdma_usart1_rx);
 
-    /* USART1_TX Init */
-    hdma_usart1_tx.Instance = DMA1_Channel4;
-    hdma_usart1_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
-    hdma_usart1_tx.Init.PeriphInc = DMA_PINC_DISABLE;
-    hdma_usart1_tx.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_usart1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
-    hdma_usart1_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
-    hdma_usart1_tx.Init.Mode = DMA_NORMAL;
-    hdma_usart1_tx.Init.Priority = DMA_PRIORITY_LOW;
-    if (HAL_DMA_Init(&hdma_usart1_tx) != HAL_OK)
-    {
-      Error_Handler();
-    }
-
-    __HAL_LINKDMA(huart,hdmatx,hdma_usart1_tx);
-
   /* USER CODE BEGIN USART1_MspInit 1 */
 
   /* USER CODE END USART1_MspInit 1 */
@@ -180,7 +209,6 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
 
     /* USART1 DMA DeInit */
     HAL_DMA_DeInit(huart->hdmarx);
-    HAL_DMA_DeInit(huart->hdmatx);
 
     /* USART1 interrupt DeInit */
     HAL_NVIC_DisableIRQ(USART1_IRQn);

Src/stm32f1xx_it.c

@@ -56,8 +56,8 @@
 /* USER CODE END 0 */
 
 /* External variables --------------------------------------------------------*/
+extern TIM_HandleTypeDef htim6;
 extern DMA_HandleTypeDef hdma_usart1_rx;
-extern DMA_HandleTypeDef hdma_usart1_tx;
 extern UART_HandleTypeDef huart1;
 /* USER CODE BEGIN EV */
 
@@ -199,20 +199,6 @@ void SysTick_Handler(void)
 /* please refer to the startup file (startup_stm32f1xx.s).                    */
 /******************************************************************************/
 
-/**
-  * @brief This function handles DMA1 channel4 global interrupt.
-  */
-void DMA1_Channel4_IRQHandler(void)
-{
-  /* USER CODE BEGIN DMA1_Channel4_IRQn 0 */
-
-  /* USER CODE END DMA1_Channel4_IRQn 0 */
-  HAL_DMA_IRQHandler(&hdma_usart1_tx);
-  /* USER CODE BEGIN DMA1_Channel4_IRQn 1 */
-
-  /* USER CODE END DMA1_Channel4_IRQn 1 */
-}
-
 /**
   * @brief This function handles DMA1 channel5 global interrupt.
   */
@@ -241,6 +227,20 @@ void USART1_IRQHandler(void)
   /* USER CODE END USART1_IRQn 1 */
 }
 
+/**
+  * @brief This function handles TIM6 global interrupt.
+  */
+void TIM6_IRQHandler(void)
+{
+  /* USER CODE BEGIN TIM6_IRQn 0 */
+
+  /* USER CODE END TIM6_IRQn 0 */
+  HAL_TIM_IRQHandler(&htim6);
+  /* USER CODE BEGIN TIM6_IRQn 1 */
+
+  /* USER CODE END TIM6_IRQn 1 */
+}
+
 /* USER CODE BEGIN 1 */
 
 /* USER CODE END 1 */

Src/uart.c

@@ -0,0 +1,91 @@
+/*
+ * uart.c
+ *
+ *  Created on: 2019. 5. 27.
+ *      Author: parkyj
+ */
+
+#include "uart.h"
+
+UARTQUEUE TerminalQueue;
+UARTQUEUE WifiQueue;
+
+void InitUartQueue(pUARTQUEUE pQueue)
+{
+    pQueue->data = pQueue->head = pQueue->tail = 0;
+
+    if (HAL_UART_Receive_DMA(&hTerminal, TerminalQueue.Buffer, 1) != HAL_OK)
+    {
+      //_Error_Handler(__FILE__, __LINE__);
+    }
+    //HAL_UART_Receive_DMA(&hTerminal,  TerminalQueue.Buffer, 1);
+    //HAL_UART_Receive_IT(hTerminal, pQueue->Buffer + pQueue->head, 1);
+}
+
+void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
+{
+    pUARTQUEUE pQueue;
+//    printf("Function : %s : \r\n",__func__);
+    UartTimerCnt = 0;
+    pQueue = &TerminalQueue;
+    pQueue->head++;
+    if (pQueue->head >= QUEUE_BUFFER_LENGTH) pQueue->head = 0;
+    pQueue->data++;
+    if (pQueue->data >= QUEUE_BUFFER_LENGTH)
+        GetDataFromUartQueue(huart);
+    HAL_UART_Receive_DMA(&hTerminal, pQueue->Buffer + pQueue->head, 1);
+   // Set_UartRcv(true);
+}
+void PutDataToUartQueue(UART_HandleTypeDef *huart, uint8_t data)
+{
+    pUARTQUEUE pQueue = &TerminalQueue;
+    if (pQueue->data >= QUEUE_BUFFER_LENGTH)
+        GetDataFromUartQueue(huart);
+    pQueue->Buffer[pQueue->head++] = data;
+    if (pQueue->head == QUEUE_BUFFER_LENGTH) pQueue->head = 0;
+    pQueue->data++;
+   // HAL_UART_Receive_DMA(&hTerminal,  pQueue->Buffer + pQueue->head, 10);
+}
+
+void GetDataFromUartQueue(UART_HandleTypeDef *huart)
+{
+    volatile static uint8_t update_data_buf[1024];
+    volatile static int cnt;
+    uint8_t temp_buf[11];
+    
+//    UART_HandleTypeDef *dst = (huart->Instance == USART2 ? &hWifi:&hTerminal);
+    UART_HandleTypeDef *dst = &hTerminal;
+    pUARTQUEUE pQueue = &TerminalQueue;
+//    if (HAL_UART_Transmit(dst, pQueue->Buffer + pQueue->tail, 1, 3000) != HAL_OK)
+//    {
+//       _Error_Handler(__FILE__, __LINE__);
+//    }
+    update_data_buf[cnt++] = *(pQueue->Buffer + pQueue->tail);        
+
+    pQueue->tail++;
+    if (pQueue->tail >= QUEUE_BUFFER_LENGTH) pQueue->tail = 0;
+    pQueue->data--;
+    
+    if(pQueue->data == 0){
+        HAL_UART_Transmit(dst, &temp_buf[BLUECELL_HEADER00], 11, 3000);
+#if 0 // PYJ.2019.07.15_BEGIN -- 
+//            for(int i = 0; i < cnt; i++){
+//                printf("%02x",update_data_buf[i]);
+//            }
+#endif // PYJ.2019.07.15_END -- 
+        cnt = 0;
+        FirmwareUpdateStart(&update_data_buf[0]);
+        
+        for(int i  = 0; i < 1024; i++)
+            update_data_buf[i] = 0;
+        
+        FirmwareTimerCnt = 0;
+        HAL_Delay(1);
+    }
+
+}
+
+void Uart1_Data_Send(uint8_t* data,uint8_t size){
+    HAL_UART_Transmit(&huart1, data,size, 10); 
+}
+