Data Recv Confirm Check Jum API not excute

.code_review_properties

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Property>
+  <Review id="DEFAULT">
+    <Description>property.default.description</Description>
+    <Author/>
+    <CreationDate format="yyyy-MM-dd :: HH:mm:ss:SSS z">1970-01-01 :: 00:00:00:000 GMT-10:00</CreationDate>
+    <Directory>review</Directory>
+    <Reviewers/>
+    <Files/>
+    <FieldItems>
+      <FieldItem id="Type" default="item.label.unset">
+        <Entry name="item.label.unset" />        
+        <Entry name="item.type.label.codingStandards" />
+        <Entry name="item.type.label.programLogic" />
+        <Entry name="item.type.label.optimization" />
+        <Entry name="item.type.label.usability" />
+        <Entry name="item.type.label.clarity" />
+        <Entry name="item.type.label.missing" />
+        <Entry name="item.type.label.irrelevant" />
+        <Entry name="item.type.label.suggestion" />
+        <Entry name="item.type.label.other" />
+      </FieldItem>
+      <FieldItem id="Severity" default="item.label.unset">
+        <Entry name="item.label.unset" />
+        <Entry name="item.severity.label.critical" />
+        <Entry name="item.severity.label.major" />
+        <Entry name="item.severity.label.normal" />
+        <Entry name="item.severity.label.minor" />
+        <Entry name="item.severity.label.trivial" />
+      </FieldItem>
+      <FieldItem id="Resolution" default="item.label.unset">
+        <Entry name="item.label.unset" />
+        <Entry name="item.resolution.label.validNeedsfixing" />
+        <Entry name="item.resolution.label.validFixlater" />
+        <Entry name="item.resolution.label.validDuplicate" />
+        <Entry name="item.resolution.label.validWontfix" />
+        <Entry name="item.resolution.label.invalidWontfix" />
+        <Entry name="item.resolution.label.unsureValidity" />
+      </FieldItem>
+      <FieldItem id="Status" default="item.status.label.open">
+        <Entry name="item.status.label.open" />
+        <Entry name="item.status.label.resolved" />
+        <Entry name="item.status.label.closed" />
+        <Entry name="item.status.label.reopened" />        
+      </FieldItem>
+    </FieldItems>
+    <Filters>
+      <Phase name="phase.individual" enabled="true">
+        <Filter name="Interval" value="7" enabled="false" />
+        <Filter name="Reviewer" value="item.reviewer.label.automatic" enabled="true" />
+        <Filter name="Type" value="item.label.unset" enabled="false" />
+        <Filter name="Severity" value="item.label.unset" enabled="false" />
+        <Filter name="AssignedTo" value="" enabled="false" />
+        <Filter name="Resolution" value="item.label.unset" enabled="false" />
+        <Filter name="Status" value="item.status.label.open" enabled="false" />
+        <Filter name="File" value="" enabled="false" />
+      </Phase>
+      <Phase name="phase.team" enabled="true">
+        <Filter name="Interval" value="7" enabled="false" />
+        <Filter name="Reviewer" value="" enabled="false" />
+        <Filter name="Type" value="item.label.unset" enabled="false" />
+        <Filter name="Severity" value="item.label.unset" enabled="false" />
+        <Filter name="AssignedTo" value="" enabled="false" />
+        <Filter name="Resolution" value="item.label.unset" enabled="true" />
+        <Filter name="Status" value="item.status.label.open" enabled="false" />
+        <Filter name="File" value="" enabled="false" />
+      </Phase>
+      <Phase name="phase.rework" enabled="true">
+        <Filter name="Interval" value="7" enabled="false" />
+        <Filter name="Reviewer" value="" enabled="false" />
+        <Filter name="Type" value="item.label.unset" enabled="false" />
+        <Filter name="Severity" value="item.label.unset" enabled="false" />
+        <Filter name="AssignedTo" value="item.reviewer.label.automatic" enabled="true" />
+        <Filter name="Resolution" value="item.label.unset" enabled="false" />
+        <Filter name="Status" value="item.status.label.open" enabled="true" />
+        <Filter name="File" value="" enabled="false" />
+      </Phase>
+    </Filters>
+  </Review>
+</Property>

.settings/language.settings.xml

@@ -4,7 +4,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1681877287601945682" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="800489075853895203" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -14,7 +14,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1681877287601945682" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="800489075853895203" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

Debug/Src/main.su

@@ -1,5 +1,5 @@
-main.c:74:6:HAL_TIM_PeriodElapsedCallback	0	static
-main.c:83:5:_write	8	static
-main.c:161:6:SystemClock_Config	72	static
-main.c:99:5:main	40	static
-main.c:362:6:Error_Handler	0	static
+main.c:77:6:HAL_TIM_PeriodElapsedCallback	0	static
+main.c:86:5:_write	8	static
+main.c:166:6:SystemClock_Config	72	static
+main.c:102:5:main	40	static
+main.c:406:6:Error_Handler	0	static

Debug/Src/stm32f1xx_hal_msp.su

@@ -1,7 +1,7 @@
-stm32f1xx_hal_msp.c:67:6:HAL_MspInit	8	static
-stm32f1xx_hal_msp.c:93:6:HAL_I2C_MspInit	32	static
-stm32f1xx_hal_msp.c:127:6:HAL_I2C_MspDeInit	0	static
-stm32f1xx_hal_msp.c:156:6:HAL_TIM_Base_MspInit	8	static
-stm32f1xx_hal_msp.c:178:6:HAL_TIM_Base_MspDeInit	0	static
-stm32f1xx_hal_msp.c:203:6:HAL_UART_MspInit	40	static
-stm32f1xx_hal_msp.c:275:6:HAL_UART_MspDeInit	8	static
+stm32f1xx_hal_msp.c:69:6:HAL_MspInit	8	static
+stm32f1xx_hal_msp.c:95:6:HAL_I2C_MspInit	32	static
+stm32f1xx_hal_msp.c:129:6:HAL_I2C_MspDeInit	0	static
+stm32f1xx_hal_msp.c:158:6:HAL_TIM_Base_MspInit	8	static
+stm32f1xx_hal_msp.c:180:6:HAL_TIM_Base_MspDeInit	0	static
+stm32f1xx_hal_msp.c:205:6:HAL_UART_MspInit	48	static
+stm32f1xx_hal_msp.c:321:6:HAL_UART_MspDeInit	8	static

Debug/Src/stm32f1xx_it.su

@@ -1,13 +1,15 @@
-stm32f1xx_it.c:73:6:NMI_Handler	0	static
-stm32f1xx_it.c:86:6:HardFault_Handler	0	static
-stm32f1xx_it.c:101:6:MemManage_Handler	0	static
-stm32f1xx_it.c:116:6:BusFault_Handler	0	static
-stm32f1xx_it.c:131:6:UsageFault_Handler	0	static
-stm32f1xx_it.c:146:6:SVC_Handler	0	static
-stm32f1xx_it.c:159:6:DebugMon_Handler	0	static
-stm32f1xx_it.c:172:6:PendSV_Handler	0	static
-stm32f1xx_it.c:185:6:SysTick_Handler	0	static
-stm32f1xx_it.c:206:6:DMA1_Channel4_IRQHandler	0	static
-stm32f1xx_it.c:220:6:DMA1_Channel5_IRQHandler	0	static
-stm32f1xx_it.c:234:6:USART1_IRQHandler	0	static
-stm32f1xx_it.c:248:6:TIM6_IRQHandler	0	static
+stm32f1xx_it.c:75:6:NMI_Handler	0	static
+stm32f1xx_it.c:88:6:HardFault_Handler	0	static
+stm32f1xx_it.c:103:6:MemManage_Handler	0	static
+stm32f1xx_it.c:118:6:BusFault_Handler	0	static
+stm32f1xx_it.c:133:6:UsageFault_Handler	0	static
+stm32f1xx_it.c:148:6:SVC_Handler	0	static
+stm32f1xx_it.c:161:6:DebugMon_Handler	0	static
+stm32f1xx_it.c:174:6:PendSV_Handler	0	static
+stm32f1xx_it.c:187:6:SysTick_Handler	0	static
+stm32f1xx_it.c:208:6:DMA1_Channel4_IRQHandler	0	static
+stm32f1xx_it.c:222:6:DMA1_Channel5_IRQHandler	0	static
+stm32f1xx_it.c:236:6:DMA1_Channel6_IRQHandler	0	static
+stm32f1xx_it.c:250:6:USART1_IRQHandler	0	static
+stm32f1xx_it.c:264:6:USART2_IRQHandler	0	static
+stm32f1xx_it.c:278:6:TIM6_IRQHandler	0	static

Inc/Bootloader.h

@@ -23,7 +23,7 @@ typedef enum updateseqok
     UpdateStartOK,
     UpdateSendingOK,
     UpdateEndOK,
-};
+}bluecell_update_t;
 typedef enum{
     bluecell_stx = 0,
     bluecell_type = 1,

Inc/stm32f1xx_it.h

@@ -58,7 +58,9 @@ void PendSV_Handler(void);
 void SysTick_Handler(void);
 void DMA1_Channel4_IRQHandler(void);
 void DMA1_Channel5_IRQHandler(void);
+void DMA1_Channel6_IRQHandler(void);
 void USART1_IRQHandler(void);
+void USART2_IRQHandler(void);
 void TIM6_IRQHandler(void);
 /* USER CODE BEGIN EFP */
 

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 = 20K
+FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = 512K
 }
 
 /* Define output sections */

STM32F103_ATTEN_PLL_Zig.elf.launch

@@ -43,7 +43,7 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;&gt;&#13;&#10;&lt;gdbmemoryBlockExpression address=&quot;536873172&quot; label=&quot;data&quot;/&gt;&#13;&#10;&lt;gdbmemoryBlockExpression address=&quot;536873172&quot; label=&quot;data&quot;/&gt;&#13;&#10;&lt;/memoryBlockExpressionList&gt;&#13;&#10;"/>
 <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-<stringAttribute key="saved_expressions&lt;seperator&gt;Unknown" value="update_data_buf,data"/>
+<stringAttribute key="saved_expressions&lt;seperator&gt;Unknown" value="update_data_buf,data,uart_buf"/>
 </launchConfiguration>

STM32F103_ATTEN_PLL_Zig.ioc

@@ -1,7 +1,8 @@
 #MicroXplorer Configuration settings - do not modify
 Dma.Request0=USART1_RX
 Dma.Request1=USART1_TX
-Dma.RequestsNb=2
+Dma.Request2=USART2_RX
+Dma.RequestsNb=3
 Dma.USART1_RX.0.Direction=DMA_PERIPH_TO_MEMORY
 Dma.USART1_RX.0.Instance=DMA1_Channel5
 Dma.USART1_RX.0.MemDataAlignment=DMA_MDATAALIGN_BYTE
@@ -20,6 +21,15 @@ 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
+Dma.USART2_RX.2.Direction=DMA_PERIPH_TO_MEMORY
+Dma.USART2_RX.2.Instance=DMA1_Channel6
+Dma.USART2_RX.2.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.USART2_RX.2.MemInc=DMA_MINC_ENABLE
+Dma.USART2_RX.2.Mode=DMA_NORMAL
+Dma.USART2_RX.2.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.USART2_RX.2.PeriphInc=DMA_PINC_DISABLE
+Dma.USART2_RX.2.Priority=DMA_PRIORITY_LOW
+Dma.USART2_RX.2.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
 I2C2.I2C_Mode=I2C_Fast
@@ -33,19 +43,22 @@ Mcu.IP3=RCC
 Mcu.IP4=SYS
 Mcu.IP5=TIM6
 Mcu.IP6=USART1
-Mcu.IPNb=7
+Mcu.IP7=USART2
+Mcu.IPNb=8
 Mcu.Name=STM32F103Z(C-D-E)Tx
 Mcu.Package=LQFP144
 Mcu.Pin0=PC15-OSC32_OUT
-Mcu.Pin1=PB10
-Mcu.Pin2=PB11
-Mcu.Pin3=PA9
-Mcu.Pin4=PA10
-Mcu.Pin5=PA13
-Mcu.Pin6=PA14
-Mcu.Pin7=VP_SYS_VS_Systick
-Mcu.Pin8=VP_TIM6_VS_ClockSourceINT
-Mcu.PinsNb=9
+Mcu.Pin1=PA2
+Mcu.Pin10=VP_TIM6_VS_ClockSourceINT
+Mcu.Pin2=PA3
+Mcu.Pin3=PB10
+Mcu.Pin4=PB11
+Mcu.Pin5=PA9
+Mcu.Pin6=PA10
+Mcu.Pin7=PA13
+Mcu.Pin8=PA14
+Mcu.Pin9=VP_SYS_VS_Systick
+Mcu.PinsNb=11
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F103ZETx
@@ -54,6 +67,7 @@ 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\:4\:false\:true
 NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:true\:true\:1\:false\:true
+NVIC.DMA1_Channel6_IRQn=true\:0\:0\:false\:true\:true\:5\:false\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.ForceEnableDMAVector=true
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -65,6 +79,7 @@ NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\: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.USART2_IRQn=true\:0\:0\:false\:true\:true\:6\:true\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 PA10.Mode=Asynchronous
 PA10.Signal=USART1_RX
@@ -72,6 +87,10 @@ PA13.Mode=Serial_Wire
 PA13.Signal=SYS_JTMS-SWDIO
 PA14.Mode=Serial_Wire
 PA14.Signal=SYS_JTCK-SWCLK
+PA2.Mode=Asynchronous
+PA2.Signal=USART2_TX
+PA3.Mode=Asynchronous
+PA3.Signal=USART2_RX
 PA9.Mode=Asynchronous
 PA9.Signal=USART1_TX
 PB10.GPIOParameters=GPIO_Label
@@ -87,7 +106,7 @@ PC15-OSC32_OUT.GPIO_Label=BOOT_LED
 PC15-OSC32_OUT.Locked=true
 PC15-OSC32_OUT.Signal=GPIO_Output
 PinOutPanel.RotationAngle=0
-ProjectManager.AskForMigrate=false
+ProjectManager.AskForMigrate=true
 ProjectManager.BackupPrevious=false
 ProjectManager.CompilerOptimize=6
 ProjectManager.ComputerToolchain=false
@@ -145,6 +164,8 @@ TIM6.Period=10 - 1
 TIM6.Prescaler=5600 - 1
 USART1.IPParameters=VirtualMode
 USART1.VirtualMode=VM_ASYNC
+USART2.IPParameters=VirtualMode
+USART2.VirtualMode=VM_ASYNC
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM6_VS_ClockSourceINT.Mode=Enable_Timer

Src/Bootloader.c

@@ -5,7 +5,12 @@
  *      Author: parkyj
  */
 #include "Bootloader.h"
+#include "CRC16.h"
+#include "flash.h"
 //Blueprotocol_t * UpdateFiledata;
+extern uint8_t Flash_write(uint8_t* data); // ?占쏙옙湲고븿?占쏙옙
+extern etError STH30_CheckCrc(uint8_t *data, uint8_t nbrOfBytes, uint8_t checksum);
+
 uint16_t updatecnt = 0;
 /***
  * Header Check Function

Src/MBIC_Bootloader.c

@@ -164,7 +164,7 @@ uint8_t* MBIC_HeaderMergeFunction(uint8_t* data,uint16_t Length )
 
         
 
-    ret[MBIC_LENGTH_0] = (Length & 0xFF00) << 8;
+    ret[MBIC_LENGTH_0] = (Length & 0xFF00) >>8;
     ret[MBIC_LENGTH_1] = Length & 0x00FF;
 
     ret[MBIC_HEADERCHECKSUM_0] = Chksum_Create(ret);
@@ -203,8 +203,9 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
     static uint32_t Curr_Download_DataIndex = 0;
     static uint32_t Prev_Download_DataIndex = 0;    
     uint32_t TotalFrame = 0;
-    uint32_t CurrFrame = 0;
-    
+   // uint32_t CurrFrame = 0;
+    uint16_t DeviceCrc16 = 0;
+    uint16_t FileCrc16 = 0;    
     uint32_t i = 0 ;
 #if 0 // PYJ.2020.06.04_BEGIN -- 
     uint8_t dataTest[1024] = {
@@ -274,27 +275,59 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
             data[MBIC_PAYLOADSTART + index++] = 0;
             data[MBIC_PAYLOADSTART + index++] = 0;
             data[MBIC_PAYLOADSTART + index++] = 0;
-            for(i = 0; i < Curr_Download_DataIndex - Prev_Download_DataIndex; i++){
+#if 0 // PYJ.2020.06.16_BEGIN -- 
+            if(Curr_Download_DataIndex != 1023){
+                for(i = 0; i <= Curr_Download_DataIndex - Prev_Download_DataIndex; i++){
+                        MBIC_DownLoadData[i] = data[MBIC_PAYLOADSTART + 12 +i];
+                        printf("%02x ",MBIC_DownLoadData[i]);
+                }
+            }else{
+                Curr_Download_DataIndex = 1024;
+                for(i = 0; i < Curr_Download_DataIndex; i++){
+                        MBIC_DownLoadData[i] = data[MBIC_PAYLOADSTART + 12 +i];
+                        printf("%02x ",MBIC_DownLoadData[i]);
+                }
+            }
+#else
+            for(i = 0; i <= Curr_Download_DataIndex - Prev_Download_DataIndex; i++){
                     MBIC_DownLoadData[i] = data[MBIC_PAYLOADSTART + 12 +i];
                     printf("%02x ",MBIC_DownLoadData[i]);
             }
+
+#endif // PYJ.2020.06.16_END -- 
 //            printf("Data End\r\n");
-//            Bank_Flash_write(data,FLASH_USER_TEMPBANK_START_ADDR);
-//            HAL_Delay(100);
-            Prev_Download_DataIndex  = Curr_Download_DataIndex;
+            Bank_Flash_write(data,FLASH_USER_START_ADDR);
+//            HAL_Delay(5);
+            Prev_Download_DataIndex  = Curr_Download_DataIndex + 1;
             break;
         case MBIC_Download_Confirm_REQ:
             cmd = MBIC_Download_Confirm_RSP;
+            TotalFrame = data[MBIC_PAYLOADSTART + 0] << 24
+                        |data[MBIC_PAYLOADSTART + 1] << 16
+                        |data[MBIC_PAYLOADSTART + 2] << 8
+                        |data[MBIC_PAYLOADSTART + 3] << 0;
+            
             /*TOTAL FRAME NUMBER*/
+            if(Curr_Download_DataIndex != TotalFrame){
+                printf("Device Total : %d\r\n     File   Total : %d\r\n    ",Curr_Download_DataIndex,TotalFrame);
+            }
+
+    
+
             data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 0];
             data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 1];        
             data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 2];
             data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 3];        
-            /*DOWNLOAD OPTION*/        
+            /*DOWNLOAD CRC CHECK*/    
             data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 4];
-            Download_Option = data[MBIC_PAYLOADSTART + 4];
-            /*DOWNLOAD DELAY REQUEST*/
-            data[MBIC_PAYLOADSTART + index++] = 3;
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 5];
+            FileCrc16 = data[MBIC_PAYLOADSTART + 4] << 8;
+            FileCrc16 += data[MBIC_PAYLOADSTART + 5];
+         //   DeviceCrc16 = CRC16_Generate();
+            
+            if(FileCrc16 != DeviceCrc16){
+                printf("Device Total : %d\r\n    File   Total : %d\r\n    ",Curr_Download_DataIndex,TotalFrame);
+            }            
             /*DOWNLOAD Reserve*/
             data[MBIC_PAYLOADSTART + index++] = 0;
             data[MBIC_PAYLOADSTART + index++] = 0;

Src/flash.c

@@ -39,10 +39,12 @@ void FLASH_If_Init(void)
 
 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);
+    for(uint32_t i = 0; i < 0xC9BC; i++ ){
+//        printf("%08x : %02X \n",Address ,*(uint8_t*)Address);
+	printf("%02X ",*(uint8_t*)Address);
         Address++;
     }
 #if 0 // PYJ.2019.03.27_BEGIN -- 
@@ -77,9 +79,14 @@ uint8_t Flash_RGB_Data_Write(uint8_t* data){
     }
     return ret;
 }
+/*
+
+
+*/
 uint8_t Flash_Data_Write(uint8_t* data){
     uint16_t Firmdata = 0;
     uint8_t ret = 0;
+    HAL_StatusTypeDef HAL_Ret = HAL_ERROR;
     static uint32_t Curr_Download_DataIndex = 0;
     static uint32_t Prev_Download_DataIndex = 0;  
     
@@ -88,17 +95,62 @@ uint8_t Flash_Data_Write(uint8_t* data){
     Curr_Download_DataIndex += data[MBIC_PAYLOADSTART + 6] << 8;            
     Curr_Download_DataIndex += data[MBIC_PAYLOADSTART + 7];      
 
+
+#if 1 // PYJ.2020.06.16_BEGIN -- 
+    for(int i = 0; i <= Curr_Download_DataIndex - Prev_Download_DataIndex; i += 2){
+            Firmdata  = ((data[MBIC_PAYLOADSTART + 12 +i]) & 0x00FF);
+            Firmdata  += ((data[MBIC_PAYLOADSTART + 12 +i + 1] << 8) & 0xFF00);
+            HAL_Ret = HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,UserAddress ,   (uint16_t)Firmdata);
+            if(HAL_Ret != HAL_OK){
+                switch(ret) {
+                    case HAL_OK:
+                        break;
+                    case HAL_TIMEOUT:
+                        printf("HAL_FLASH_Program() timeout!\n");
+                        break;
+                    case HAL_ERROR:
+                        printf("HAL_FLASH_Program() error 0x%08x, see *hal_flash.h for bit definitions\n", HAL_FLASH_GetError());
+                        break;
+                    default:
+                        printf("HAL_FLASH_Program() returned unknown status %lu\n", ret);
+                }
+
+                ret = 1;
+            }
+            UserAddress += 2;
+
+    }
+#else
+
+#endif // PYJ.2020.06.16_END -- 
+
 //    data[MBIC_PAYLOADSTART + 12 +i];
-    for(int i= 0; i <= Curr_Download_DataIndex - Prev_Download_DataIndex+1; i+=2){
-        Firmdata  = ((data[MBIC_PAYLOADSTART + 12 +i]) & 0x00FF);
-        Firmdata  += ((data[MBIC_PAYLOADSTART + 12 +i + 1] << 8) & 0xFF00);
-        if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,UserAddress ,   (uint16_t)Firmdata) != HAL_OK){
-            printf("HAL NOT OK \n");
-            ret = 1;
+#if 0 // PYJ.2020.06.16_BEGIN -- 
+    if(Curr_Download_DataIndex != 1023){
+        for(int i= 0; i <= Curr_Download_DataIndex - Prev_Download_DataIndex+1; i+=2){
+            Firmdata  = ((data[MBIC_PAYLOADSTART + 12 +i]) & 0x00FF);
+            Firmdata  += ((data[MBIC_PAYLOADSTART + 12 +i + 1] << 8) & 0xFF00);
+            if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,UserAddress ,   (uint16_t)Firmdata) != HAL_OK){
+                printf("HAL NOT OK \n");
+                ret = 1;
+            }
+            UserAddress += 2;
+
+        }
+    }else{/*(Curr_Download_DataIndex == 1023)*/
+        for(int i= 0; i <= 1024; i+=2){
+            Firmdata  = ((data[MBIC_PAYLOADSTART + 12 +i]) & 0x00FF);
+            Firmdata  += ((data[MBIC_PAYLOADSTART + 12 +i + 1] << 8) & 0xFF00);
+            if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,UserAddress ,   (uint16_t)Firmdata) != HAL_OK){
+                printf("HAL NOT OK \n");
+                ret = 1;
+            }
+            UserAddress += 2;
         }
-        UserAddress += 2;
     }
-    Prev_Download_DataIndex = Curr_Download_DataIndex;
+#endif // PYJ.2020.06.16_END -- 
+//    HAL_Delay(1);
+    Prev_Download_DataIndex =  Curr_Download_DataIndex + 1;
     return ret;
 }
 
@@ -236,35 +288,36 @@ uint8_t Bank_Flash_write(uint8_t* data,uint32_t StartBankAddress) // ?占쏙옙
     static FLASH_EraseInitTypeDef EraseInitStruct;
     static uint32_t PAGEError = 0;
     uint8_t ret = 0;
-    /* Fill EraseInit structure*/
-    switch(StartBankAddress){
-        case FLASH_USER_START_ADDR:
-            EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-            EraseInitStruct.PageAddress = FLASH_USER_START_ADDR;
-            EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_START_ADDR) / FLASH_PAGE_SIZE;
-        break;
-        case FLASH_USER_BANK1_START_ADDR:
-            EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-            EraseInitStruct.PageAddress = FLASH_USER_BANK1_START_ADDR;
-            EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_BANK1_START_ADDR) / FLASH_PAGE_SIZE;
-
-        break;
-        case FLASH_USER_BANK2_START_ADDR:
-            EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-            EraseInitStruct.PageAddress = FLASH_USER_BANK2_START_ADDR;
-            EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_BANK2_START_ADDR) / FLASH_PAGE_SIZE;
-
-        break;
-        case FLASH_USER_TEMPBANK_START_ADDR:
-            EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-            EraseInitStruct.PageAddress = FLASH_USER_TEMPBANK_START_ADDR;
-            EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_TEMPBANK_START_ADDR) / FLASH_PAGE_SIZE;
-        break;
 
-    }
 
     HAL_FLASH_Unlock(); // lock ??占�?
     if(flashinit == 0){
+        /* Fill EraseInit structure*/
+        switch(StartBankAddress){
+            case FLASH_USER_START_ADDR:
+                EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+                EraseInitStruct.PageAddress = FLASH_USER_START_ADDR;
+                EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_START_ADDR) / FLASH_PAGE_SIZE;
+            break;
+            case FLASH_USER_BANK1_START_ADDR:
+                EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+                EraseInitStruct.PageAddress = FLASH_USER_BANK1_START_ADDR;
+                EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_BANK1_START_ADDR) / FLASH_PAGE_SIZE;
+
+            break;
+            case FLASH_USER_BANK2_START_ADDR:
+                EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+                EraseInitStruct.PageAddress = FLASH_USER_BANK2_START_ADDR;
+                EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_BANK2_START_ADDR) / FLASH_PAGE_SIZE;
+
+            break;
+            case FLASH_USER_TEMPBANK_START_ADDR:
+                EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+                EraseInitStruct.PageAddress = FLASH_USER_TEMPBANK_START_ADDR;
+                EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_TEMPBANK_START_ADDR) / FLASH_PAGE_SIZE;
+            break;
+
+        }        
         flashinit= 1;
         UserAddress = EraseInitStruct.PageAddress;
         //FLASH_PageErase(StartAddr);

Src/main.c

@@ -47,8 +47,10 @@ I2C_HandleTypeDef hi2c2;
 TIM_HandleTypeDef htim6;
 
 UART_HandleTypeDef huart1;
+UART_HandleTypeDef huart2;
 DMA_HandleTypeDef hdma_usart1_rx;
 DMA_HandleTypeDef hdma_usart1_tx;
+DMA_HandleTypeDef hdma_usart2_rx;
 
 /* USER CODE BEGIN PV */
 
@@ -64,6 +66,7 @@ static void MX_DMA_Init(void);
 static void MX_USART1_UART_Init(void);
 static void MX_I2C2_Init(void);
 static void MX_TIM6_Init(void);
+static void MX_USART2_UART_Init(void);
 static void MX_NVIC_Init(void);
 /* USER CODE BEGIN PFP */
 
@@ -99,7 +102,7 @@ extern UARTQUEUE TerminalQueue;
 int main(void)
 {
   /* USER CODE BEGIN 1 */
-	uint8_t tempdata[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A};
+//	uint8_t tempdata[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A};
   /* USER CODE END 1 */
   
 
@@ -125,6 +128,7 @@ int main(void)
   MX_USART1_UART_Init();
   MX_I2C2_Init();
   MX_TIM6_Init();
+  MX_USART2_UART_Init();
 
   /* Initialize interrupts */
   MX_NVIC_Init();
@@ -135,6 +139,7 @@ int main(void)
   printf("Crc generate %x \r\n",CRC16_Generate(tempdata,11));*/
   Firmware_BootStart_Signal();
   InitUartQueue(&TerminalQueue);
+  //Flash_InitRead();
   /* USER CODE END 2 */
 
   /* Infinite loop */
@@ -144,7 +149,7 @@ int main(void)
 	 // printf("Uart Start \r\n");
 	  if(LedTimerCnt > 500){HAL_GPIO_TogglePin(BOOT_LED_GPIO_Port,BOOT_LED_Pin);LedTimerCnt = 0;}
 	  while (TerminalQueue.data > 0 && UartTimerCnt > 30) GetDataFromUartQueue(&hTerminal);
-	 // while(FirmwareTimerCnt > 3000)  Jump_App();
+	 while(FirmwareTimerCnt > 3000)  Jump_App();
 
 	  //HAL_Delay(500);
     /* USER CODE END WHILE */
@@ -208,6 +213,12 @@ static void MX_NVIC_Init(void)
   /* DMA1_Channel4_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(DMA1_Channel4_IRQn);
+  /* DMA1_Channel6_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel6_IRQn);
+  /* USART2_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(USART2_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(USART2_IRQn);
 }
 
 /**
@@ -315,6 +326,39 @@ static void MX_USART1_UART_Init(void)
 
 }
 
+/**
+  * @brief USART2 Initialization Function
+  * @param None
+  * @retval None
+  */
+static void MX_USART2_UART_Init(void)
+{
+
+  /* USER CODE BEGIN USART2_Init 0 */
+
+  /* USER CODE END USART2_Init 0 */
+
+  /* USER CODE BEGIN USART2_Init 1 */
+
+  /* USER CODE END USART2_Init 1 */
+  huart2.Instance = USART2;
+  huart2.Init.BaudRate = 115200;
+  huart2.Init.WordLength = UART_WORDLENGTH_8B;
+  huart2.Init.StopBits = UART_STOPBITS_1;
+  huart2.Init.Parity = UART_PARITY_NONE;
+  huart2.Init.Mode = UART_MODE_TX_RX;
+  huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  huart2.Init.OverSampling = UART_OVERSAMPLING_16;
+  if (HAL_UART_Init(&huart2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN USART2_Init 2 */
+
+  /* USER CODE END USART2_Init 2 */
+
+}
+
 /** 
   * Enable DMA controller clock
   */
@@ -336,8 +380,8 @@ static void MX_GPIO_Init(void)
 
   /* GPIO Ports Clock Enable */
   __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
   __HAL_RCC_GPIOA_CLK_ENABLE();
+  __HAL_RCC_GPIOB_CLK_ENABLE();
 
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(BOOT_LED_GPIO_Port, BOOT_LED_Pin, GPIO_PIN_RESET);

Src/stm32f1xx_hal_msp.c

@@ -28,6 +28,8 @@ extern DMA_HandleTypeDef hdma_usart1_rx;
 
 extern DMA_HandleTypeDef hdma_usart1_tx;
 
+extern DMA_HandleTypeDef hdma_usart2_rx;
+
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN TD */
 
@@ -263,6 +265,50 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart)
 
   /* USER CODE END USART1_MspInit 1 */
   }
+  else if(huart->Instance==USART2)
+  {
+  /* USER CODE BEGIN USART2_MspInit 0 */
+
+  /* USER CODE END USART2_MspInit 0 */
+    /* Peripheral clock enable */
+    __HAL_RCC_USART2_CLK_ENABLE();
+  
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    /**USART2 GPIO Configuration    
+    PA2     ------> USART2_TX
+    PA3     ------> USART2_RX 
+    */
+    GPIO_InitStruct.Pin = GPIO_PIN_2;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+    GPIO_InitStruct.Pin = GPIO_PIN_3;
+    GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+    /* USART2 DMA Init */
+    /* USART2_RX Init */
+    hdma_usart2_rx.Instance = DMA1_Channel6;
+    hdma_usart2_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
+    hdma_usart2_rx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_usart2_rx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_usart2_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    hdma_usart2_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+    hdma_usart2_rx.Init.Mode = DMA_NORMAL;
+    hdma_usart2_rx.Init.Priority = DMA_PRIORITY_LOW;
+    if (HAL_DMA_Init(&hdma_usart2_rx) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(huart,hdmarx,hdma_usart2_rx);
+
+  /* USER CODE BEGIN USART2_MspInit 1 */
+
+  /* USER CODE END USART2_MspInit 1 */
+  }
 
 }
 
@@ -298,6 +344,29 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
 
   /* USER CODE END USART1_MspDeInit 1 */
   }
+  else if(huart->Instance==USART2)
+  {
+  /* USER CODE BEGIN USART2_MspDeInit 0 */
+
+  /* USER CODE END USART2_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_USART2_CLK_DISABLE();
+  
+    /**USART2 GPIO Configuration    
+    PA2     ------> USART2_TX
+    PA3     ------> USART2_RX 
+    */
+    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_2|GPIO_PIN_3);
+
+    /* USART2 DMA DeInit */
+    HAL_DMA_DeInit(huart->hdmarx);
+
+    /* USART2 interrupt DeInit */
+    HAL_NVIC_DisableIRQ(USART2_IRQn);
+  /* USER CODE BEGIN USART2_MspDeInit 1 */
+
+  /* USER CODE END USART2_MspDeInit 1 */
+  }
 
 }
 

Src/stm32f1xx_it.c

@@ -59,7 +59,9 @@
 extern TIM_HandleTypeDef htim6;
 extern DMA_HandleTypeDef hdma_usart1_rx;
 extern DMA_HandleTypeDef hdma_usart1_tx;
+extern DMA_HandleTypeDef hdma_usart2_rx;
 extern UART_HandleTypeDef huart1;
+extern UART_HandleTypeDef huart2;
 /* USER CODE BEGIN EV */
 
 /* USER CODE END EV */
@@ -228,6 +230,20 @@ void DMA1_Channel5_IRQHandler(void)
   /* USER CODE END DMA1_Channel5_IRQn 1 */
 }
 
+/**
+  * @brief This function handles DMA1 channel6 global interrupt.
+  */
+void DMA1_Channel6_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA1_Channel6_IRQn 0 */
+
+  /* USER CODE END DMA1_Channel6_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_usart2_rx);
+  /* USER CODE BEGIN DMA1_Channel6_IRQn 1 */
+
+  /* USER CODE END DMA1_Channel6_IRQn 1 */
+}
+
 /**
   * @brief This function handles USART1 global interrupt.
   */
@@ -242,6 +258,20 @@ void USART1_IRQHandler(void)
   /* USER CODE END USART1_IRQn 1 */
 }
 
+/**
+  * @brief This function handles USART2 global interrupt.
+  */
+void USART2_IRQHandler(void)
+{
+  /* USER CODE BEGIN USART2_IRQn 0 */
+
+  /* USER CODE END USART2_IRQn 0 */
+  HAL_UART_IRQHandler(&huart2);
+  /* USER CODE BEGIN USART2_IRQn 1 */
+
+  /* USER CODE END USART2_IRQn 1 */
+}
+
 /**
   * @brief This function handles TIM6 global interrupt.
   */

Src/uart.c

@@ -10,6 +10,8 @@
 #include "MBIC_Bootloader.h"
 UARTQUEUE TerminalQueue;
 UARTQUEUE WifiQueue;
+extern void FirmwareUpdateStart(uint8_t* data);
+extern void MBIC_Bootloader_FirmwareUpdate(uint8_t* data);
 
 void InitUartQueue(pUARTQUEUE pQueue)
 {
@@ -56,7 +58,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
     volatile static int cnt;
     uint16_t Length = 0;
     uint16_t CrcChk = 0;
-    UART_HandleTypeDef *dst = (huart->Instance == USART2 ? &hTest:&hTerminal);
+   // UART_HandleTypeDef *dst = (huart->Instance == USART2 ? &hTest:&hTerminal);
 //    UART_HandleTypeDef *dst = &hTerminal;
     pUARTQUEUE pQueue = &TerminalQueue;
 //    if (HAL_UART_Transmit(dst, pQueue->Buffer + pQueue->tail, 1, 3000) != HAL_OK)
@@ -72,8 +74,8 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
     if(pQueue->data == 0){
         //HAL_UART_Transmit_DMA(dst, &temp_buf[BLUECELL_HEADER00], 11);
 #if 0 // PYJ.2019.07.15_BEGIN -- 
-            for(int i = 0; i < 128; i++){
-                printf("%02x",update_data_buf[i]);
+            for(int i = 0; i < pQueue->tail; i++){
+                printf("%02x ",update_data_buf[i]);
             }
 #endif // PYJ.2019.07.15_END -- 
         cnt = 0;
@@ -110,8 +112,13 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 void Uart1_Data_Send(uint8_t* data,uint16_t size){
 //    printf("size : %d \r\n",size);
     HAL_UART_Transmit (&huart1, data, size, 0xFFFF);
+//  static uint8_t  testdata[10] = {0x16,0x16,};
+
+ //   HAL_UART_Transmit_DMA(&huart1, &data[0], size);
+   // HAL_UART_Transmit_DMA(&huart1, &data[1], size);
+
 //    for(int i = 0; i < size; i++)
-//    if(HAL_UART_Transmit_DMA(&huart1, data, size) != HAL_OK){
+ //   if(HAL_UART_Transmit_DMA(&huart1, data, size) != HAL_OK){
 //        printf("ERROR \r\n");
 //    }
 //        printf("data : %x \r\n",data[i]);