#1 OTA升级文件存储地址从w25q32更改到EC800的UFS中

Terbuka
yang684665 ingin menggabungkan 9 komit dari haitaowang1001/YangSC menjadi haitaowang1001/master
100 mengubah file dengan 8052 tambahan dan 4116 penghapusan
  1. 20 0
      .vscode/c_cpp_properties.json
  2. 9 0
      .vscode/settings.json
  3. 3 1
      README.md
  4. 20 0
      app/.vscode/c_cpp_properties.json
  5. 16 0
      app/.vscode/settings.json
  6. 16 0
      app/App/ec800m.h
  7. 4 2
      app/App/main.c
  8. 293 28
      app/App/otaEvent.c
  9. 15 15
      app/Proj/.vscode/c_cpp_properties.json
  10. 16 0
      app/Proj/.vscode/keil-assistant.log
  11. 48 0
      app/Proj/.vscode/uv4.log
  12. 1 0
      app/Proj/.vscode/uv4.log.lock
  13. 4074 455
      app/Proj/JLinkLog.txt
  14. 1121 1129
      app/Proj/Listings/Ringzle.map
  15. 4 5
      app/Proj/Listings/startup_gd32f10x_xd.lst
  16. TEMPAT SAMPAH
      app/Proj/Objects/Ringzle.axf
  17. TEMPAT SAMPAH
      app/Proj/Objects/Ringzle.bin
  18. 40 22
      app/Proj/Objects/Ringzle.build_log.htm
  19. 729 844
      app/Proj/Objects/Ringzle.htm
  20. 1513 1509
      app/Proj/Objects/Ringzle_GD32F103C8T6.dep
  21. TEMPAT SAMPAH
      app/Proj/Objects/cjson.crf
  22. 8 8
      app/Proj/Objects/cjson.d
  23. TEMPAT SAMPAH
      app/Proj/Objects/device_message.crf
  24. 3 3
      app/Proj/Objects/device_message.d
  25. TEMPAT SAMPAH
      app/Proj/Objects/dlt645.crf
  26. 2 2
      app/Proj/Objects/dlt645.d
  27. TEMPAT SAMPAH
      app/Proj/Objects/dlt645_1997.crf
  28. 2 2
      app/Proj/Objects/dlt645_1997.d
  29. TEMPAT SAMPAH
      app/Proj/Objects/dlt645_2007.crf
  30. 2 2
      app/Proj/Objects/dlt645_2007.d
  31. TEMPAT SAMPAH
      app/Proj/Objects/dlt645_data.crf
  32. 3 3
      app/Proj/Objects/dlt645_data.d
  33. TEMPAT SAMPAH
      app/Proj/Objects/dlt645_port.crf
  34. 2 2
      app/Proj/Objects/dlt645_port.d
  35. TEMPAT SAMPAH
      app/Proj/Objects/ec800m.crf
  36. 5 5
      app/Proj/Objects/ec800m.d
  37. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_adc.crf
  38. 2 2
      app/Proj/Objects/gd32f10x_adc.d
  39. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_bkp.crf
  40. 2 2
      app/Proj/Objects/gd32f10x_bkp.d
  41. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_can.crf
  42. 2 2
      app/Proj/Objects/gd32f10x_can.d
  43. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_crc.crf
  44. 2 2
      app/Proj/Objects/gd32f10x_crc.d
  45. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_dac.crf
  46. 2 2
      app/Proj/Objects/gd32f10x_dac.d
  47. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_dbg.crf
  48. 2 2
      app/Proj/Objects/gd32f10x_dbg.d
  49. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_dma.crf
  50. 2 2
      app/Proj/Objects/gd32f10x_dma.d
  51. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_enet.crf
  52. 2 2
      app/Proj/Objects/gd32f10x_enet.d
  53. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_exmc.crf
  54. 2 2
      app/Proj/Objects/gd32f10x_exmc.d
  55. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_exti.crf
  56. 2 2
      app/Proj/Objects/gd32f10x_exti.d
  57. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_fmc.crf
  58. 2 2
      app/Proj/Objects/gd32f10x_fmc.d
  59. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_fwdgt.crf
  60. 2 2
      app/Proj/Objects/gd32f10x_fwdgt.d
  61. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_gpio.crf
  62. 2 2
      app/Proj/Objects/gd32f10x_gpio.d
  63. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_i2c.crf
  64. 2 2
      app/Proj/Objects/gd32f10x_i2c.d
  65. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_it.crf
  66. 6 6
      app/Proj/Objects/gd32f10x_it.d
  67. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_misc.crf
  68. 2 2
      app/Proj/Objects/gd32f10x_misc.d
  69. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_pmu.crf
  70. 2 2
      app/Proj/Objects/gd32f10x_pmu.d
  71. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_rcu.crf
  72. 2 2
      app/Proj/Objects/gd32f10x_rcu.d
  73. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_rtc.crf
  74. 2 2
      app/Proj/Objects/gd32f10x_rtc.d
  75. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_sdio.crf
  76. 2 2
      app/Proj/Objects/gd32f10x_sdio.d
  77. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_spi.crf
  78. 2 2
      app/Proj/Objects/gd32f10x_spi.d
  79. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_timer.crf
  80. 2 2
      app/Proj/Objects/gd32f10x_timer.d
  81. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_usart.crf
  82. 2 2
      app/Proj/Objects/gd32f10x_usart.d
  83. TEMPAT SAMPAH
      app/Proj/Objects/gd32f10x_wwdgt.crf
  84. 2 2
      app/Proj/Objects/gd32f10x_wwdgt.d
  85. TEMPAT SAMPAH
      app/Proj/Objects/key.crf
  86. 2 2
      app/Proj/Objects/key.d
  87. TEMPAT SAMPAH
      app/Proj/Objects/led.crf
  88. 2 2
      app/Proj/Objects/led.d
  89. TEMPAT SAMPAH
      app/Proj/Objects/log.crf
  90. 4 4
      app/Proj/Objects/log.d
  91. TEMPAT SAMPAH
      app/Proj/Objects/main.crf
  92. 6 6
      app/Proj/Objects/main.d
  93. TEMPAT SAMPAH
      app/Proj/Objects/mmodbus.crf
  94. 5 5
      app/Proj/Objects/mmodbus.d
  95. TEMPAT SAMPAH
      app/Proj/Objects/mqttrecv.crf
  96. 6 6
      app/Proj/Objects/mqttrecv.d
  97. TEMPAT SAMPAH
      app/Proj/Objects/otaevent.crf
  98. 6 2
      app/Proj/Objects/otaevent.d
  99. TEMPAT SAMPAH
      app/Proj/Objects/parsedevicemessage.crf
  100. 0 0
      app/Proj/Objects/parsedevicemessage.d

+ 20 - 0
.vscode/c_cpp_properties.json

@@ -0,0 +1,20 @@
+{
+    "configurations": [
+        {
+            "name": "Win32",
+            "includePath": [
+                "${workspaceFolder}/**"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE",
+                "_UNICODE"
+            ],
+            "compilerPath": "C:/MinGW/bin/gcc.exe",
+            "cStandard": "c17",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "windows-gcc-arm"
+        }
+    ],
+    "version": 4
+}

+ 9 - 0
.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+    "files.associations": {
+        "fmc.h": "c",
+        "gd32f10x.h": "c",
+        "gd32f10x_libopt.h": "c",
+        "gd32f10x_enet.h": "c",
+        "main.h": "c"
+    }
+}

+ 3 - 1
README.md

@@ -1,3 +1,5 @@
 # dtu_gateway
 
-dtu数据采集网关
+dtu数据采集网关
+
+杨世昌负责的分支

+ 20 - 0
app/.vscode/c_cpp_properties.json

@@ -0,0 +1,20 @@
+{
+    "configurations": [
+        {
+            "name": "Win32",
+            "includePath": [
+                "${workspaceFolder}/**"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE",
+                "_UNICODE"
+            ],
+            "compilerPath": "C:/MinGW/bin/gcc.exe",
+            "cStandard": "c17",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "windows-gcc-arm"
+        }
+    ],
+    "version": 4
+}

+ 16 - 0
app/.vscode/settings.json

@@ -0,0 +1,16 @@
+{
+    "files.associations": {
+        "gd32f10x.h": "c",
+        "gd32f10x_libopt.h": "c",
+        "gd32f10x_can.h": "c",
+        "gd32f10x_enet.h": "c",
+        "systick.h": "c",
+        "stdio.h": "c",
+        "main.h": "c",
+        "device_message.h": "c",
+        "gd32f10x_gpio.h": "c",
+        "gd32f10x_exti.h": "c",
+        "type_traits": "c",
+        "cstdio": "c"
+    }
+}

+ 16 - 0
app/App/ec800m.h

@@ -19,6 +19,22 @@
 #define CMD_GET_TO_FILE "AT+QHTTPREADFILE=\"UFS:http.txt\",80\r\n"
 #define CMD_HTTP_GET "QHTTPGET:"
 #define CMD_READ_FILE "AT+QFDWL=http.txt\r\n"
+
+#define OPEN_otaMSG_FILE "AT+QFOPEN=\"otaMSG.txt\",1\r\n"
+#define WRITE_otaMSG_FILE "AT+QFWRITE=1,8,3\r\n"
+#define CLOSE_otaMSG_FILE "AT+QFCLOSE=1\r\n"
+#define LOAD_otaMSG_FILE "AT+QFDWL=otaMSG.txt\r\n"
+#define DEL_otaMSG_FILE "AT+QFDEL=otaMSG.txt\r\n"
+
+#define OPEN_otaDATA_FILE "AT+QFOPEN=\"otaDATA.txt\",0\r\n"
+#define WRITE_otaDATA_FILE "AT+QFWRITE=1,128,2\r\n"
+#define CLOSE_otaDATA_FILE "AT+QFCLOSE=1\r\n"
+#define LOAD_otaDATA_FILE "AT+QFDWL=otaDATA.txt\r\n"
+#define DEL_otaDATA_FILE "AT+QFDEL=otaDATA.txt\r\n"
+
+#define READ_otaDATA_FILE "AT+QFREAD=1,1024\r\n"
+#define TEST_DATA "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n"
+
 #define ATI "ATI"
 
 #define CMD_MQTT_DISCONNECT "AT+QMTDISC=0\r\n"

+ 4 - 2
app/App/main.c

@@ -75,7 +75,7 @@ int main(void)
 	systick_config();
 	nvic_config();
 	/* initilize the LEDs, USART */
-	W25Q32_Init();
+//	W25Q32_Init(); 	//弃用w25q32,改用EC800存储ota文件
 	gd_eval_led_init(LED1);
 	gd_com_init(COM_232);
 	gd_com_init(COM_EC800);
@@ -124,12 +124,14 @@ int main(void)
 	mmodbus_init(1);
 	dlt645_init(1);
 
+	usart_data_transmit(COM_232, '!');
 	//开启看门狗
 //	fwdgt_init();
 	while (1)
 	{
 		check_ota_event();                              //检测是否有ota事件产生
 		MQTT_Alarm_clock(gateway->inboundTime, gateway);
+		// delay_1ms(5000);
 	}
 }
 /*
@@ -210,7 +212,7 @@ void readID(char *strId)
  */
 void http_load_config(uint8_t *httpURL)
 {
-	uint32_t BufferSize=46*1024;//最大获取的数据空间
+	uint32_t BufferSize=46*1024;//最大获取的数据空间4KB
 	char *dmabuffer=malloc(BufferSize);
 	__LOAD_CONFIG:
 	if (EC800MGetUrl(httpURL,dmabuffer,BufferSize) == true) // 从http获取信息,获取成功则保存到本地

+ 293 - 28
app/App/otaEvent.c

@@ -3,6 +3,9 @@
 #include "systick.h"
 #include "w25q32.h"
 #include "main.h"
+#include "ec800m.h"
+#include <stdio.h>
+#include "string.h"
 
 #define APPBLOCKNB 2      	//下载的程序位于block的第3块中
 #define OTA_EVENT_BLOCKNB 1 //OTA事件完成标志存储的位置位于第2块中
@@ -13,9 +16,123 @@
 #define EOT 0x04 // 结束标志
 int8_t xmodem(uint16_t timeout);
 OTA_T ota_data;
-uint8_t w25q32_data[256];  //存放w25q32数据
-
 uint16_t Xmodem_CRC16(uint8_t *data, uint16_t datalen);
+static OTA_MESSAGE ota_message;
+
+#if 0
+//测试用的
+int WaitForReadData(uint8_t* data,int timeout,int datalen)
+{
+	uint32_t len = 0;
+	bool timeoutFlag = false;
+	if (timeout >= 0)
+	{
+		timeoutFlag = true;
+	}
+	while (1)
+	{
+		delay_1ms(50);
+		if (UART0_RX_STAT > 0)
+		{
+			UART0_RX_STAT = 0;
+			char *p  = strstr((char *)&UART0_RX_BUF, "CONNECT ");
+			if (p)
+			{
+				p += 8;
+				sscanf(p, "%u\r", &len);		// 读取长度
+				if(len == datalen)
+				{
+					p = strchr(p, '\n') + 1;		// 跳过换行
+					memcpy(data,p,datalen);
+					Clear_DMA_Buffer();
+					return datalen;
+				}
+				else
+				{
+					Clear_DMA_Buffer();
+					return len;
+				}
+			}
+			
+		}
+		timeout -= 50;
+		if (timeoutFlag == true && timeout <= 0)
+		{
+			Clear_DMA_Buffer();
+			return -1;
+		}
+	}
+}
+static uint8_t app_programmer[1024];
+void read_ota_DATA(uint32_t app_byte)
+{
+	/* 打开UFS:otaDATA.txt */
+	EC800MSendCmd(CLOSE_otaDATA_FILE,strlen(CLOSE_otaDATA_FILE));
+	WaitResponse("QFCLOSE",1000);
+	EC800MSendCmd(OPEN_otaDATA_FILE,strlen(OPEN_otaDATA_FILE));
+	if(WaitResponse("QFOPEN:", 2000) == 0)
+		return;
+	for(uint8_t i=0;i<app_byte/1024;i++)				//一次读1KB
+	{
+		task_fwdgt_reload();
+		memset(app_programmer,0,1024);
+		// uint32_t addr=APP_PROGRAMMER_BLOCK*64*1024+i*1024;   //其在w25q32中的地址
+		// W25Q32_Read(app_programmer,addr,1024);
+		while(1)
+		{
+			int x = 0;
+			EC800MSendCmd(READ_otaDATA_FILE,strlen(READ_otaDATA_FILE));
+			x = WaitForReadData(app_programmer,2000,1024);
+			if((x != 1024) && (x != -1))
+			{
+				char* SEEK_otaDATA_FILE = "";
+				sprintf(SEEK_otaDATA_FILE,"AT+QFSEEK=1,%d,2\r\n",x);
+				EC800MSendCmd(SEEK_otaDATA_FILE,strlen(SEEK_otaDATA_FILE));	//出错的话文件指针向左偏移1024个字节
+			}
+			else if(x == 1024)
+			{
+				break;
+			}
+		}
+		delay_1ms(50);
+	}
+	//将不满1024数据单独写入
+	if(app_byte % 1024 != 0)
+	{
+		uint32_t startAddress=(app_byte/1024)*1024;
+		memset(app_programmer,0,1024);
+		// uint32_t addr=APP_PROGRAMMER_BLOCK*64*1024+(app_byte/1024)*1024;   														//其在w25q32中的地址
+		// W25Q32_Read(app_programmer,addr,app_byte%1024);	
+		while(1)
+		{
+			int x = 0;
+			EC800MSendCmd(READ_otaDATA_FILE,strlen(READ_otaDATA_FILE));
+			x = WaitForReadData(app_programmer,2000,app_byte % 1024);
+			if(x != (app_byte % 1024) && (x != -1))
+			{
+				char* SEEK_otaDATA_FILE = "";
+				sprintf(SEEK_otaDATA_FILE,"AT+QFSEEK=1,%d,2\r\n",x);
+				EC800MSendCmd(SEEK_otaDATA_FILE,strlen(SEEK_otaDATA_FILE));	//出错的话文件指针向左偏移读取字节数
+			}
+			else if(x == (app_byte % 1024))
+			{
+				break;
+			}
+		}		
+		delay_1ms(50);																	
+	}
+	// 关闭保存UFS文件
+	while(1)
+	{
+		EC800MSendCmd(CLOSE_otaDATA_FILE,strlen(CLOSE_otaDATA_FILE));
+		if(WaitResponse("OK", 2000) == 1)
+		{
+			break;
+		}
+	}
+}
+#endif
+
 /*
  *  函数名:uint8_t check_ota_event()
  *  输入参数:无
@@ -29,14 +146,16 @@ int8_t check_ota_event()
 	// 当标志位为1时证明ota事件产生,将进入ota升级路线
 	if (ota_data.ota_flag == 1)
 	{
-		W25Q32_Erase64K(APPBLOCKNB);                    //程序文件在第三block以后
-		int8_t recvSta = xmodem(1000);
+		// W25Q32_Erase64K(APPBLOCKNB);                    //程序文件在第三block以后
+		// EC800MSendCmd(DEL_otaDATA_FILE, strlen(DEL_otaDATA_FILE));	//清空OTA数据文件
+		int8_t recvSta = xmodem(1000);						//在1000秒内解决OTA更新
 		if (recvSta == 0)
 		{
 			return 0;
 		}
-		else  
+		else
 		{
+			// read_ota_DATA(ota_message.XmodemByte);
 			NVIC_SystemReset();
 		}
 	}
@@ -44,6 +163,44 @@ int8_t check_ota_event()
 		return 0;
 }
 
+/**
+ * @brief 专门用来解析往文件里写数据的响应数据
+ * 
+ * @param timeout 超时时间(ms)
+ * @return uint8_t 实际写入字节数
+ */
+uint8_t WaitResponse_value(int timeout)
+{
+	bool timeoutFlag = false;
+	if (timeout >= 0)
+	{
+		timeoutFlag = true;
+	}
+
+	while (1)
+	{
+		delay_1ms(50);
+		if (UART0_RX_STAT > 0)
+		{
+			UART0_RX_STAT = 0;
+			char *p = strstr((char *)&UART0_RX_BUF, ": ") + 2;
+			if (p)
+			{
+				uint8_t ret = 0;
+				ret = strtol(p, &p, 10);
+				Clear_DMA_Buffer();
+				return ret;
+			}
+		}
+		timeout -= 50;
+		if (timeoutFlag == true && timeout <= 0)
+		{
+			Clear_DMA_Buffer();
+			return 0;
+		}
+	};
+}
+
 int8_t xmodem(uint16_t timeout)
 {
 	int startTime = gettick();
@@ -54,10 +211,19 @@ int8_t xmodem(uint16_t timeout)
 	while(1)
 	{
 		task_fwdgt_reload();                                 //喂狗
-		if(gettick()-startTime>timeout*1000)return 0;
-		usart_data_transmit(COM_232, 'C');
+		if(gettick()-startTime>timeout*1000)return 0;		//如果一直得不到上位机的xmode数据相应,超时则跳出本函数
+		usart_data_transmit(COM_232, 'C');					//向上位机发送'C',表明请求xmodem数据
 		delay_1ms(1000);
-		if(ota_data.done==1)break;
+		if(ota_data.done==1)
+		{
+			//打开otaData.txt文件
+			EC800MSendCmd(CLOSE_otaDATA_FILE,strlen(CLOSE_otaDATA_FILE));
+			WaitResponse("QFCLOSE",1000);
+			EC800MSendCmd(OPEN_otaDATA_FILE,strlen(OPEN_otaDATA_FILE));
+			if(WaitResponse("QFOPEN:", 2000) == 0)
+				return 0;
+			break;							//如果上位机响应请求则跳出循环等待
+		}
 	}
 	// 判断数据帧头是否符合标准
 	while (gettick() - startTime < timeout * 1000)
@@ -65,23 +231,44 @@ int8_t xmodem(uint16_t timeout)
 		if (ota_data.done == 1)
 		{
 			task_fwdgt_reload();                                       //喂狗
-			if (ota_data.data[0] == SOH && ota_data.data_cnt == 133)
+			if (ota_data.data[0] == SOH && ota_data.data_cnt == 133)	//如果xmodem数据包是满的128个字节
 			{
-				uint16_t XCRC = Xmodem_CRC16(ota_data.data + 3, 128);
+				uint16_t XCRC = Xmodem_CRC16(ota_data.data + 3, 128);	
 				if (XCRC == ota_data.data[131] * 256 + ota_data.data[132]) // 经过校验的数据一致时将进行数据处理
 				{
-					data_flag.xmodemNB++;
-					//因为W25Q32只支持按页写入数据、所以将128字节数据找了一个暂存空间,两次应答才进行一次数据写入,最后在结束语句判断是否为奇数在进行
-					//数据尾部的处理
-					if(ota_data.data[1]%2==0)                                      
+					data_flag.xmodemNB++;	//xmodem数据包计数
+					// W25Q32_PageWrite(w25q32_data,APPBLOCKNB*256+(data_flag.xmodemNB-1)/2);
+					uint8_t sed_flg = 0;
+					while(sed_flg < 2)
 					{
-						memcpy(w25q32_data+128,ota_data.data + 3,128);
-						W25Q32_PageWrite(w25q32_data,APPBLOCKNB*256+(data_flag.xmodemNB-1)/2);
-						memset(w25q32_data,0,256);
+						EC800MSendCmd(WRITE_otaDATA_FILE,strlen(WRITE_otaDATA_FILE));
+						if(WaitResponse("CONNECT", 2000) == 0)
+						{
+							sed_flg++;
+						}
+						else
+						{
+							sed_flg = 0;
+							break;
+						}	
 					}
-					else
+					while(sed_flg < 2)
 					{
-						memcpy(w25q32_data,ota_data.data + 3,128);
+						EC800MSendCmd(ota_data.data + 3,128);
+//						EC800MSendCmd(TEST_DATA,128);
+						int x = WaitResponse_value(2000);
+						if(x != 128)
+						{
+							sed_flg++;
+							char* QFSEEK_CMD;
+							sprintf(QFSEEK_CMD,"AT+QFSEEK=1,%d,2\r\n",x);
+							EC800MSendCmd(QFSEEK_CMD,strlen(QFSEEK_CMD));	//出错的话文件指针向左偏移x个字节
+						}
+						else
+						{
+							sed_flg = 0;
+							break;
+						}
 					}
 					
 					ota_data.data_cnt = 0;
@@ -101,22 +288,100 @@ int8_t xmodem(uint16_t timeout)
 			//进入结束的包处理
 			else if (ota_data.data[0] == EOT && ota_data.data_cnt == 1)
 			{
-				if(data_flag.xmodemNB%2!=0)                                            //将可能为奇数的数据写入进去
+				// if(data_flag.xmodemNB%2!=0)                                            //将可能为奇数的数据写入进去
+				// {
+					// W25Q32_PageWrite(w25q32_data,APPBLOCKNB*256+(data_flag.xmodemNB-1)/2);
+				// }
+				// 保存UFS文件
+				uint8_t sed_flg = 0;
+				while(sed_flg < 2)
 				{
-					W25Q32_PageWrite(w25q32_data,APPBLOCKNB*256+(data_flag.xmodemNB-1)/2);
+					EC800MSendCmd(CLOSE_otaDATA_FILE,strlen(CLOSE_otaDATA_FILE));
+					if(WaitResponse("OK", 2000) == 0)
+					{
+						sed_flg++;
+					}
+					else
+					{
+						sed_flg = 0;
+						break;
+					}	
 				}
-				
-				
-				
+
 				usart_data_transmit(COM_232, ACK);
 				//完成xmodem协议的交互将完成的标志存储到内存中
-				OTA_MESSAGE ota_message;
 				ota_message.Completion_flag=1U;
 				ota_message.XmodemByte=data_flag.xmodemNB*128;//后续补齐的0x1A还需要进一步考虑
 
-				W25Q32_Erase64K(OTA_EVENT_BLOCKNB);//擦除原先的数据
-				W25Q32_PageWrite((uint8_t *)&ota_message,OTA_EVENT_BLOCKNB*256);
-			
+				while(sed_flg < 2)
+				{
+					EC800MSendCmd(CLOSE_otaDATA_FILE,strlen(CLOSE_otaDATA_FILE));
+					WaitResponse("QFCLOSE",1000);
+					EC800MSendCmd(OPEN_otaMSG_FILE,strlen(OPEN_otaMSG_FILE));
+					if(WaitResponse("QFOPEN:", 2000) == 0)
+					{
+						sed_flg++;
+					}
+					else
+					{
+						sed_flg = 0;
+						break;
+					}
+				}
+				
+
+				while(sed_flg < 2)
+				{
+					EC800MSendCmd(WRITE_otaMSG_FILE,strlen(WRITE_otaMSG_FILE));
+					if(WaitResponse("CONNECT", 2000) == 0)
+					{
+						sed_flg++;
+					}
+					else
+					{
+						sed_flg = 0;
+						break;
+					}
+				}
+
+				while(sed_flg < 2)
+				{
+					EC800MSendCmd((uint8_t *)&ota_message,sizeof(OTA_MESSAGE));
+					// delay_1ms(3000);
+					int x = WaitResponse_value(2000);
+					if(x != sizeof(OTA_MESSAGE))
+					{
+						sed_flg++;
+						char* QFSEEK_CMD;
+						sprintf(QFSEEK_CMD,"AT+QFSEEK=1,%d,2",x);
+						EC800MSendCmd(QFSEEK_CMD,strlen(QFSEEK_CMD));	//出错的话文件指针向左偏移x个字节
+					}
+					else
+					{
+						sed_flg = 0;
+						break;
+					}
+				}
+
+				while(sed_flg < 2)
+				{
+					EC800MSendCmd(CLOSE_otaMSG_FILE,strlen(CLOSE_otaMSG_FILE));
+					if(WaitResponse("OK", 2000))
+					{
+						sed_flg++;
+					}
+					else
+					{
+						sed_flg = 0;
+						break;
+					}
+				}
+
+				// W25Q32_Erase64K(OTA_EVENT_BLOCKNB);//擦除原先的数据
+				// W25Q32_PageWrite((uint8_t *)&ota_message,OTA_EVENT_BLOCKNB*256);
+				ota_data.data_cnt = 0;
+				memset(ota_data.data, 0, 133);
+				ota_data.done = 0;
 				delay_1ms(50);
 				// 写入事件完成标志后重启设备,其他状态页无需回滚,写入完成会执行重启指令
 				return 1;

+ 15 - 15
app/Proj/.vscode/c_cpp_properties.json

@@ -3,21 +3,21 @@
         {
             "name": "GD32F103C8T6",
             "includePath": [
-                "d:\\Project\\dtu\\App",
-                "d:\\Project\\dtu\\CMSIS",
-                "d:\\Project\\dtu\\Firmware\\Include",
-                "d:\\Project\\dtu\\bsp",
-                "d:\\Project\\dtu\\internet",
-                "d:\\Project\\dtu\\cjson",
-                "d:\\Project\\dtu\\dlt",
-                "d:\\Project\\dtu\\dlt\\inc",
-                "d:\\Project\\dtu\\dlt\\port",
-                "D:\\workSoftware\\stm32Software\\mdk\\mdkcore\\ARM\\ARMCC\\include",
-                "D:\\workSoftware\\stm32Software\\mdk\\mdkcore\\ARM\\ARMCC\\include\\rw",
-                "d:\\Project\\dtu\\Startup",
-                "d:\\Project\\dtu\\Firmware\\Source",
-                "d:\\Project\\dtu\\internet\\W5500",
-                "d:\\Project\\dtu\\dlt\\src"
+                "d:\\project\\dtu_gateway\\app\\App",
+                "d:\\project\\dtu_gateway\\app\\CMSIS",
+                "d:\\project\\dtu_gateway\\app\\Firmware\\Include",
+                "d:\\project\\dtu_gateway\\app\\bsp",
+                "d:\\project\\dtu_gateway\\app\\internet",
+                "d:\\project\\dtu_gateway\\app\\cjson",
+                "d:\\project\\dtu_gateway\\app\\dlt",
+                "d:\\project\\dtu_gateway\\app\\dlt\\inc",
+                "d:\\project\\dtu_gateway\\app\\dlt\\port",
+                "d:\\project\\dtu_gateway\\app\\jsmn",
+                "D:\\software\\MDK5\\ARM\\ARMCC\\include",
+                "D:\\software\\MDK5\\ARM\\ARMCC\\include\\rw",
+                "d:\\project\\dtu_gateway\\app\\Startup",
+                "d:\\project\\dtu_gateway\\app\\Firmware\\Source",
+                "d:\\project\\dtu_gateway\\app\\dlt\\src"
             ],
             "defines": [
                 "USE_STDPERIPH_DRIVER",

+ 16 - 0
app/Proj/.vscode/keil-assistant.log

@@ -1,2 +1,18 @@
 [info] Log at : 2023/7/29|10:57:21|GMT+0800
 
+[info] Log at : 2023/10/25|17:53:43|GMT+0800
+
+[info] Log at : 2023/10/25|17:56:20|GMT+0800
+
+[info] Log at : 2023/10/25|17:57:42|GMT+0800
+
+[info] Log at : 2023/10/27|08:27:52|GMT+0800
+
+[info] Log at : 2023/10/27|08:38:12|GMT+0800
+
+[info] Log at : 2023/10/30|19:23:45|GMT+0800
+
+[info] Log at : 2023/10/31|11:33:18|GMT+0800
+
+[info] Log at : 2023/11/2|10:29:27|GMT+0800
+

+ 48 - 0
app/Proj/.vscode/uv4.log

@@ -0,0 +1,48 @@
+Load "d:\\project\\dtu_gateway\\app\\Proj\\Objects\\Ringzle.axf" 
+Set JLink Project File to "d:\project\dtu_gateway\app\Proj\JLinkSettings.ini"* JLink Info: Device "GD32F103VG" selected.
+
+JLink info:
+------------
+DLL: V6.84a, compiled Sep  7 2020 17:26:08
+Firmware: J-Link V9 compiled May  7 2021 16:26:12
+Hardware: V9.40
+S/N : 69405423 
+Feature(s) : RDI, GDB, FlashDL, FlashBP, JFlash 
+
+* JLink Info: Found SW-DP with ID 0x1BA01477
+* JLink Info: DPIDR: 0x1BA01477
+* JLink Info: Scanning AP map to find all available APs
+* JLink Info: AP[1]: Stopped AP scan as end of AP map has been reached
+* JLink Info: AP[0]: AHB-AP (IDR: 0x24770011)
+* JLink Info: Iterating through AP map to find AHB-AP to use
+* JLink Info: AP[0]: Core found
+* JLink Info: AP[0]: AHB-AP ROM base: 0xE00FF000
+* JLink Info: CPUID register: 0x412FC231. Implementer code: 0x41 (ARM)
+* JLink Info: Found Cortex-M3 r2p1, Little endian.
+* JLink Info: FPUnit: 6 code (BP) slots and 2 literal slots
+* JLink Info: CoreSight components:
+* JLink Info: ROMTbl[0] @ E00FF000
+* JLink Info: ROMTbl[0][0]: E000E000, CID: B105E00D, PID: 000BB000 SCS
+* JLink Info: ROMTbl[0][1]: E0001000, CID: B105E00D, PID: 003BB002 DWT
+* JLink Info: ROMTbl[0][2]: E0002000, CID: B105E00D, PID: 002BB003 FPB
+* JLink Info: ROMTbl[0][3]: E0000000, CID: B105E00D, PID: 003BB001 ITM
+* JLink Info: ROMTbl[0][4]: E0040000, CID: B105900D, PID: 003BB923 TPIU-Lite
+* JLink Info: ROMTbl[0][5]: E0041000, CID: B105900D, PID: 003BB924 ETM-M3
+ROMTableAddr = 0xE00FF000
+* JLink Info: Reset: Halt core after reset via DEMCR.VC_CORERESET.
+* JLink Info: Reset: Reset device via AIRCR.SYSRESETREQ.
+
+Target info:
+------------
+Device: GD32F103VG
+VTarget = 3.282V
+State of Pins: TCK: 0, TDI: 0, TDO: 0, TMS: 1, TRES: 1, TRST: 0
+Hardware-Breakpoints: 6
+Software-Breakpoints: 8192
+Watchpoints:          4
+JTAG speed: 500 kHz
+
+Erase Done.Programming Done.Verify OK.* JLink Info: Reset: Halt core after reset via DEMCR.VC_CORERESET.
+* JLink Info: Reset: Reset device via AIRCR.SYSRESETREQ.
+Application running ...
+Flash Load finished at 10:29:55

+ 1 - 0
app/Proj/.vscode/uv4.log.lock

@@ -0,0 +1 @@
+2023/11/2 10:29:55

File diff ditekan karena terlalu besar
+ 4074 - 455
app/Proj/JLinkLog.txt


File diff ditekan karena terlalu besar
+ 1121 - 1129
app/Proj/Listings/Ringzle.map


+ 4 - 5
app/Proj/Listings/startup_gd32f10x_xd.lst

@@ -609,11 +609,10 @@ ARM Macro Assembler    Page 10
               00000000 
 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
 ork --depend=.\objects\startup_gd32f10x_xd.d -o.\objects\startup_gd32f10x_xd.o 
--I.\RTE\_GD32F103C8T6 -ID:\workSoftware\stm32Software\mdk\mdkpack\GigaDevice\GD
-32F10x_DFP\2.0.3\Device\Include -ID:\workSoftware\stm32Software\mdk\mdkcore\ARM
-\CMSIS\Include --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION S
-ETA 529" --predefine="GD32F10X_XD SETA 1" --predefine="USE_STDPERIPH_DRIVER SET
-A 1" --list=.\listings\startup_gd32f10x_xd.lst ..\Startup\startup_gd32f10x_xd.s
+-ID:\software\MDK5\Pack\GigaDevice\GD32F10x_DFP\2.1.0\Device\Include --predefin
+e="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 536" --predefine="GD3
+2F10X_XD SETA 1" --predefine="USE_STDPERIPH_DRIVER SETA 1" --list=.\listings\st
+artup_gd32f10x_xd.lst ..\Startup\startup_gd32f10x_xd.s
 
 
 

TEMPAT SAMPAH
app/Proj/Objects/Ringzle.axf


TEMPAT SAMPAH
app/Proj/Objects/Ringzle.bin


+ 40 - 22
app/Proj/Objects/Ringzle.build_log.htm

@@ -3,46 +3,64 @@
 <pre>
 <h1>礦ision Build Log</h1>
 <h2>Tool Versions:</h2>
-IDE-Version: μVision V5.29.0.0
-Copyright (C) 2019 ARM Ltd and ARM Germany GmbH. All rights reserved.
-License Information: s yf, 11, LIC=WHYH9-4R8F5-WFPI7-E0KRQ-DXARV-W9U12
+IDE-Version: μVision V5.36.0.0
+Copyright (C) 2021 ARM Ltd and ARM Germany GmbH. All rights reserved.
+License Information: 1 1, 1, LIC=D0D7S-LUDD6-UHI8H-WGPSX-UUXXX-1T4U9
  
 Tool Versions:
-Toolchain:       MDK-ARM Plus  Version: 5.29.0.0
-Toolchain Path:  D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin
-C Compiler:      Armcc.exe V5.06 update 6 (build 750)
-Assembler:       Armasm.exe V5.06 update 6 (build 750)
-Linker/Locator:  ArmLink.exe V5.06 update 6 (build 750)
-Library Manager: ArmAr.exe V5.06 update 6 (build 750)
-Hex Converter:   FromElf.exe V5.06 update 6 (build 750)
-CPU DLL:         SARMCM3.DLL V5.29.0.0
+Toolchain:       MDK-ARM Plus  Version: 5.36.0.0
+Toolchain Path:  D:\software\MDK5\ARM\ARMCC\Bin
+C Compiler:      Armcc.exe V5.06 update 7 (build 960)
+Assembler:       Armasm.exe V5.06 update 7 (build 960)
+Linker/Locator:  ArmLink.exe V5.06 update 7 (build 960)
+Library Manager: ArmAr.exe V5.06 update 7 (build 960)
+Hex Converter:   FromElf.exe V5.06 update 7 (build 960)
+CPU DLL:         SARMCM3.DLL V5.36.0.0
 Dialog DLL:      DCM.DLL V1.17.3.0
-Target DLL:      Segger\JL2CM3.dll V2.99.36.0
-Dialog DLL:      TCM.DLL V1.36.5.0
+Target DLL:      Segger\JL2CM3.dll V2.99.40.0
+Dialog DLL:      TCM.DLL V1.53.0.0
  
 <h2>Project:</h2>
-D:\Project\dtu_gateway\app\Proj\Ringzle.uvprojx
-Project File Date:  09/20/2023
+D:\project\dtu_gateway\app\Proj\Ringzle.uvprojx
+Project File Date:  10/31/2023
 
 <h2>Output:</h2>
-*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin'
+*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'D:\software\MDK5\ARM\ARMCC\Bin'
 Build target 'GD32F103C8T6'
+compiling main.c...
+..\App\device_message.h(99): warning:  #1295-D: Deprecated declaration get_gateway_config_params - give arg types
+  GATEWAY_PARAMS *get_gateway_config_params();
+..\App\parseDeviceMessage.h(13): warning:  #1295-D: Deprecated declaration Read_Data - give arg types
+  void Read_Data();
+..\App\otaEvent.h(26): warning:  #1295-D: Deprecated declaration check_ota_event - give arg types
+  int8_t check_ota_event();
+..\App\main.c(66): warning:  #1295-D: Deprecated declaration fwdgt_init - give arg types
+  void fwdgt_init();
+..\App\main.c(67): warning:  #1295-D: Deprecated declaration task_fwdgt_reload - give arg types
+  void task_fwdgt_reload();
+..\App\main.c(104): warning:  #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
+   	http_load_config(httpURL);
+..\App\main.c(218): warning:  #167-D: argument of type "uint8_t *" is incompatible with parameter of type "char *"
+  	if (EC800MGetUrl(httpURL,dmabuffer,BufferSize) == true) // 从http获取信息,获取成功则保存到本地
+..\App\main.c: 7 warnings, 0 errors
+linking...
+Program Size: Code=31292 RO-data=1696 RW-data=232 ZI-data=82968  
+FromELF: creating hex file...
 After Build - User command #1: fromelf --bin --output ./Objects/Ringzle.bin ./Objects/Ringzle.axf
-".\Objects\Ringzle.axf" - 0 Error(s), 0 Warning(s).
+".\Objects\Ringzle.axf" - 0 Error(s), 7 Warning(s).
 
 <h2>Software Packages used:</h2>
 
 Package Vendor: GigaDevice
-                https://gd32mcu.com/data/documents/pack/GigaDevice.GD32F10x_DFP.2.0.3.pack
-                GigaDevice.GD32F10x_DFP.2.0.3
+                https://gd32mcu.com/data/documents/pack/GigaDevice.GD32F10x_DFP.2.1.0.pack
+                GigaDevice.GD32F10x_DFP.2.1.0
                 GigaDevice GD32F10x Series Device Support and Examples
 
 <h2>Collection of Component include folders:</h2>
-  .\RTE\_GD32F103C8T6
-  D:\workSoftware\stm32Software\mdk\mdkpack\GigaDevice\GD32F10x_DFP\2.0.3\Device\Include
+  D:\software\MDK5\Pack\GigaDevice\GD32F10x_DFP\2.1.0\Device\Include
 
 <h2>Collection of Component Files used:</h2>
-Build Time Elapsed:  00:00:00
+Build Time Elapsed:  00:00:02
 </pre>
 </body>
 </html>

File diff ditekan karena terlalu besar
+ 729 - 844
app/Proj/Objects/Ringzle.htm


File diff ditekan karena terlalu besar
+ 1513 - 1509
app/Proj/Objects/Ringzle_GD32F103C8T6.dep


TEMPAT SAMPAH
app/Proj/Objects/cjson.crf


+ 8 - 8
app/Proj/Objects/cjson.d

@@ -1,10 +1,10 @@
 .\objects\cjson.o: ..\cjson\cJSON.c
-.\objects\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
-.\objects\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
-.\objects\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\math.h
-.\objects\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
-.\objects\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\limits.h
-.\objects\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\ctype.h
-.\objects\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\float.h
+.\objects\cjson.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\string.h
+.\objects\cjson.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdio.h
+.\objects\cjson.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\math.h
+.\objects\cjson.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\cjson.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\limits.h
+.\objects\cjson.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\ctype.h
+.\objects\cjson.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\float.h
 .\objects\cjson.o: ..\cjson\cJSON.h
-.\objects\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stddef.h
+.\objects\cjson.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stddef.h

TEMPAT SAMPAH
app/Proj/Objects/device_message.crf


+ 3 - 3
app/Proj/Objects/device_message.d

@@ -1,6 +1,6 @@
 .\objects\device_message.o: ..\App\device_message.c
 .\objects\device_message.o: ..\App\device_message.h
-.\objects\device_message.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\device_message.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\device_message.o: ..\CMSIS\gd32f10x.h
 .\objects\device_message.o: ..\CMSIS\core_cm3.h
 .\objects\device_message.o: ..\CMSIS\core_cmInstr.h
@@ -30,6 +30,6 @@
 .\objects\device_message.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\device_message.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\device_message.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\device_message.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\device_message.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\device_message.o: ..\Firmware\Include\gd32f10x_misc.h
-.\objects\device_message.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
+.\objects\device_message.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\string.h

TEMPAT SAMPAH
app/Proj/Objects/dlt645.crf


+ 2 - 2
app/Proj/Objects/dlt645.d

@@ -1,7 +1,7 @@
 .\objects\dlt645.o: ..\dlt\src\dlt645.c
 .\objects\dlt645.o: ..\dlt\inc\dlt645_private.h
 .\objects\dlt645.o: ..\dlt\inc\dlt645.h
-.\objects\dlt645.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\dlt645.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\dlt645.o: ..\dlt\inc\dlt645_1997.h
 .\objects\dlt645.o: ..\dlt\inc\dlt645_2007.h
-.\objects\dlt645.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
+.\objects\dlt645.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\string.h

TEMPAT SAMPAH
app/Proj/Objects/dlt645_1997.crf


+ 2 - 2
app/Proj/Objects/dlt645_1997.d

@@ -1,6 +1,6 @@
 .\objects\dlt645_1997.o: ..\dlt\src\dlt645_1997.c
 .\objects\dlt645_1997.o: ..\dlt\inc\dlt645_private.h
 .\objects\dlt645_1997.o: ..\dlt\inc\dlt645.h
-.\objects\dlt645_1997.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\dlt645_1997.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\dlt645_1997.o: ..\dlt\inc\dlt645_1997_private.h
-.\objects\dlt645_1997.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
+.\objects\dlt645_1997.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\string.h

TEMPAT SAMPAH
app/Proj/Objects/dlt645_2007.crf


+ 2 - 2
app/Proj/Objects/dlt645_2007.d

@@ -1,6 +1,6 @@
 .\objects\dlt645_2007.o: ..\dlt\src\dlt645_2007.c
 .\objects\dlt645_2007.o: ..\dlt\inc\dlt645_private.h
 .\objects\dlt645_2007.o: ..\dlt\inc\dlt645.h
-.\objects\dlt645_2007.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\dlt645_2007.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\dlt645_2007.o: ..\dlt\inc\dlt645_2007_private.h
-.\objects\dlt645_2007.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
+.\objects\dlt645_2007.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\string.h

TEMPAT SAMPAH
app/Proj/Objects/dlt645_data.crf


+ 3 - 3
app/Proj/Objects/dlt645_data.d

@@ -1,6 +1,6 @@
 .\objects\dlt645_data.o: ..\dlt\src\dlt645_data.c
 .\objects\dlt645_data.o: ..\dlt\inc\dlt645_private.h
 .\objects\dlt645_data.o: ..\dlt\inc\dlt645.h
-.\objects\dlt645_data.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
-.\objects\dlt645_data.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
-.\objects\dlt645_data.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\math.h
+.\objects\dlt645_data.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\dlt645_data.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\string.h
+.\objects\dlt645_data.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\math.h

TEMPAT SAMPAH
app/Proj/Objects/dlt645_port.crf


+ 2 - 2
app/Proj/Objects/dlt645_port.d

@@ -1,6 +1,6 @@
 .\objects\dlt645_port.o: ..\dlt\port\dlt645_port.c
 .\objects\dlt645_port.o: ..\dlt\inc\dlt645.h
-.\objects\dlt645_port.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\dlt645_port.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\dlt645_port.o: ..\Firmware\Include\gd32f10x_gpio.h
 .\objects\dlt645_port.o: ..\CMSIS\gd32f10x.h
 .\objects\dlt645_port.o: ..\CMSIS\core_cm3.h
@@ -31,6 +31,6 @@
 .\objects\dlt645_port.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\dlt645_port.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\dlt645_port.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\dlt645_port.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\dlt645_port.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\dlt645_port.o: ..\Firmware\Include\gd32f10x_misc.h
 .\objects\dlt645_port.o: ..\App\systick.h

TEMPAT SAMPAH
app/Proj/Objects/ec800m.crf


+ 5 - 5
app/Proj/Objects/ec800m.d

@@ -2,7 +2,7 @@
 .\objects\ec800m.o: ..\App\ec800m.h
 .\objects\ec800m.o: ..\CMSIS\gd32f10x.h
 .\objects\ec800m.o: ..\CMSIS\core_cm3.h
-.\objects\ec800m.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\ec800m.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\ec800m.o: ..\CMSIS\core_cmInstr.h
 .\objects\ec800m.o: ..\CMSIS\core_cmFunc.h
 .\objects\ec800m.o: ..\CMSIS\system_gd32f10x.h
@@ -30,13 +30,13 @@
 .\objects\ec800m.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\ec800m.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\ec800m.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\ec800m.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\ec800m.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\ec800m.o: ..\Firmware\Include\gd32f10x_misc.h
 .\objects\ec800m.o: ..\App\device_message.h
 .\objects\ec800m.o: ..\bsp\usart.h
 .\objects\ec800m.o: ..\App\systick.h
 .\objects\ec800m.o: ..\cjson\cJson.h
-.\objects\ec800m.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stddef.h
-.\objects\ec800m.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
+.\objects\ec800m.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stddef.h
+.\objects\ec800m.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\string.h
 .\objects\ec800m.o: ..\App\log.h
-.\objects\ec800m.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdarg.h
+.\objects\ec800m.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdarg.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_adc.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_adc.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_adc.o: ..\Firmware\Include\gd32f10x_adc.h
 .\objects\gd32f10x_adc.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_adc.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_adc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_adc.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_adc.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_adc.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_adc.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_adc.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_adc.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_adc.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_adc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_adc.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_adc.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_bkp.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_bkp.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_bkp.o: ..\Firmware\Include\gd32f10x_bkp.h
 .\objects\gd32f10x_bkp.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_bkp.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_bkp.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_bkp.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_bkp.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_bkp.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_bkp.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_bkp.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_bkp.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_bkp.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_bkp.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_bkp.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_bkp.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_can.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_can.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_can.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_can.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_can.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_can.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_can.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_can.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_can.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_can.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_can.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_can.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_can.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_can.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_can.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_can.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_crc.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_crc.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_crc.o: ..\Firmware\Include\gd32f10x_crc.h
 .\objects\gd32f10x_crc.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_crc.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_crc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_crc.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_crc.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_crc.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_crc.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_crc.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_crc.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_crc.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_crc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_crc.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_crc.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_dac.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_dac.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_dac.o: ..\Firmware\Include\gd32f10x_dac.h
 .\objects\gd32f10x_dac.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_dac.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_dac.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_dac.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_dac.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_dac.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_dac.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_dac.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_dac.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_dac.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_dac.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_dac.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_dac.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_dbg.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_dbg.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_dbg.o: ..\Firmware\Include\gd32f10x_dbg.h
 .\objects\gd32f10x_dbg.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_dbg.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_dbg.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_dbg.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_dbg.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_dbg.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_dbg.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_dbg.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_dbg.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_dbg.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_dbg.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_dbg.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_dbg.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_dma.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_dma.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_dma.o: ..\Firmware\Include\gd32f10x_dma.h
 .\objects\gd32f10x_dma.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_dma.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_dma.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_dma.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_dma.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_dma.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_dma.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_dma.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_dma.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_dma.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_dma.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_dma.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_dma.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_enet.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_enet.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_enet.o: ..\Firmware\Include\gd32f10x_enet.h
 .\objects\gd32f10x_enet.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_enet.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_enet.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_enet.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_enet.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_enet.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_enet.o: ..\CMSIS\system_gd32f10x.h
@@ -31,4 +31,4 @@
 .\objects\gd32f10x_enet.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_enet.o: ..\Firmware\Include\gd32f10x_enet.h
 .\objects\gd32f10x_enet.o: ..\Firmware\Include\gd32f10x_misc.h
-.\objects\gd32f10x_enet.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_enet.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_exmc.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_exmc.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_exmc.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_exmc.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_exmc.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_exmc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_exmc.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_exmc.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_exmc.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_exmc.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_exmc.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_exmc.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_exmc.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_exmc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_exmc.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_exmc.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_exti.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_exti.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_exti.o: ..\Firmware\Include\gd32f10x_exti.h
 .\objects\gd32f10x_exti.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_exti.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_exti.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_exti.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_exti.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_exti.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_exti.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_exti.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_exti.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_exti.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_exti.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_exti.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_exti.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_fmc.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_fmc.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_fmc.o: ..\Firmware\Include\gd32f10x_fmc.h
 .\objects\gd32f10x_fmc.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_fmc.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_fmc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_fmc.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_fmc.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_fmc.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_fmc.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_fmc.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_fmc.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_fmc.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_fmc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_fmc.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_fmc.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_fwdgt.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_fwdgt.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_fwdgt.o: ..\Firmware\Include\gd32f10x_fwdgt.h
 .\objects\gd32f10x_fwdgt.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_fwdgt.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_fwdgt.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_fwdgt.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_fwdgt.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_fwdgt.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_fwdgt.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_fwdgt.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_fwdgt.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_fwdgt.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_fwdgt.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_fwdgt.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_fwdgt.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_gpio.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_gpio.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_gpio.o: ..\Firmware\Include\gd32f10x_gpio.h
 .\objects\gd32f10x_gpio.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_gpio.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_gpio.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_gpio.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_gpio.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_gpio.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_gpio.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_gpio.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_gpio.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_gpio.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_gpio.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_gpio.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_gpio.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_i2c.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_i2c.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_i2c.o: ..\Firmware\Include\gd32f10x_i2c.h
 .\objects\gd32f10x_i2c.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_i2c.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_i2c.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_i2c.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_i2c.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_i2c.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_i2c.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_i2c.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_i2c.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_i2c.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_i2c.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_i2c.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_i2c.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_it.crf


+ 6 - 6
app/Proj/Objects/gd32f10x_it.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_it.o: ..\App\gd32f10x_it.h
 .\objects\gd32f10x_it.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_it.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_it.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_it.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_it.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_it.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_it.o: ..\CMSIS\system_gd32f10x.h
@@ -30,17 +30,17 @@
 .\objects\gd32f10x_it.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_it.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_it.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_it.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_it.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_it.o: ..\Firmware\Include\gd32f10x_misc.h
 .\objects\gd32f10x_it.o: ..\App\main.h
 .\objects\gd32f10x_it.o: ..\bsp\usart.h
 .\objects\gd32f10x_it.o: ..\App\mmodbus.h
 .\objects\gd32f10x_it.o: ..\App\mmodbusConfig.h
-.\objects\gd32f10x_it.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdbool.h
-.\objects\gd32f10x_it.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
-.\objects\gd32f10x_it.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
+.\objects\gd32f10x_it.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdbool.h
+.\objects\gd32f10x_it.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\string.h
+.\objects\gd32f10x_it.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdio.h
 .\objects\gd32f10x_it.o: ..\App\log.h
-.\objects\gd32f10x_it.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdarg.h
+.\objects\gd32f10x_it.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdarg.h
 .\objects\gd32f10x_it.o: ..\App\mqttRecv.h
 .\objects\gd32f10x_it.o: ..\App\mqttRecv.h
 .\objects\gd32f10x_it.o: ..\App\systick.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_misc.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_misc.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_misc.o: ..\Firmware\Include\gd32f10x_misc.h
 .\objects\gd32f10x_misc.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_misc.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_misc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_misc.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_misc.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_misc.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_misc.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_misc.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_misc.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_misc.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_misc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_misc.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_misc.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_pmu.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_pmu.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_pmu.o: ..\Firmware\Include\gd32f10x_pmu.h
 .\objects\gd32f10x_pmu.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_pmu.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_pmu.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_pmu.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_pmu.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_pmu.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_pmu.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_pmu.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_pmu.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_pmu.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_pmu.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_pmu.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_pmu.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_rcu.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_rcu.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_rcu.o: ..\Firmware\Include\gd32f10x_rcu.h
 .\objects\gd32f10x_rcu.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_rcu.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_rcu.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_rcu.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_rcu.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_rcu.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_rcu.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_rcu.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_rcu.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_rcu.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_rcu.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_rcu.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_rcu.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_rtc.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_rtc.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_rtc.o: ..\Firmware\Include\gd32f10x_rtc.h
 .\objects\gd32f10x_rtc.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_rtc.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_rtc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_rtc.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_rtc.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_rtc.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_rtc.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_rtc.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_rtc.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_rtc.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_rtc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_rtc.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_rtc.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_sdio.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_sdio.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_sdio.o: ..\Firmware\Include\gd32f10x_sdio.h
 .\objects\gd32f10x_sdio.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_sdio.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_sdio.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_sdio.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_sdio.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_sdio.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_sdio.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_sdio.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_sdio.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_sdio.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_sdio.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_sdio.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_sdio.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_spi.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_spi.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_spi.o: ..\Firmware\Include\gd32f10x_spi.h
 .\objects\gd32f10x_spi.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_spi.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_spi.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_spi.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_spi.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_spi.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_spi.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_spi.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_spi.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_spi.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_spi.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_spi.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_spi.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_timer.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_timer.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_timer.o: ..\Firmware\Include\gd32f10x_timer.h
 .\objects\gd32f10x_timer.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_timer.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_timer.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_timer.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_timer.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_timer.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_timer.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_timer.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_timer.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_timer.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_timer.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_timer.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_timer.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_usart.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_usart.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_usart.o: ..\Firmware\Include\gd32f10x_usart.h
 .\objects\gd32f10x_usart.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_usart.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_usart.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_usart.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_usart.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_usart.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_usart.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_usart.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_usart.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_usart.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_usart.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_usart.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_usart.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/gd32f10x_wwdgt.crf


+ 2 - 2
app/Proj/Objects/gd32f10x_wwdgt.d

@@ -2,7 +2,7 @@
 .\objects\gd32f10x_wwdgt.o: ..\Firmware\Include\gd32f10x_wwdgt.h
 .\objects\gd32f10x_wwdgt.o: ..\CMSIS\gd32f10x.h
 .\objects\gd32f10x_wwdgt.o: ..\CMSIS\core_cm3.h
-.\objects\gd32f10x_wwdgt.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\gd32f10x_wwdgt.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\gd32f10x_wwdgt.o: ..\CMSIS\core_cmInstr.h
 .\objects\gd32f10x_wwdgt.o: ..\CMSIS\core_cmFunc.h
 .\objects\gd32f10x_wwdgt.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\gd32f10x_wwdgt.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\gd32f10x_wwdgt.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\gd32f10x_wwdgt.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\gd32f10x_wwdgt.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\gd32f10x_wwdgt.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\gd32f10x_wwdgt.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/key.crf


+ 2 - 2
app/Proj/Objects/key.d

@@ -1,7 +1,7 @@
 .\objects\key.o: ..\bsp\key.c
 .\objects\key.o: ..\CMSIS\gd32f10x.h
 .\objects\key.o: ..\CMSIS\core_cm3.h
-.\objects\key.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\key.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\key.o: ..\CMSIS\core_cmInstr.h
 .\objects\key.o: ..\CMSIS\core_cmFunc.h
 .\objects\key.o: ..\CMSIS\system_gd32f10x.h
@@ -29,7 +29,7 @@
 .\objects\key.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\key.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\key.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\key.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\key.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\key.o: ..\Firmware\Include\gd32f10x_misc.h
 .\objects\key.o: ..\bsp\key.h
 .\objects\key.o: ..\App\systick.h

TEMPAT SAMPAH
app/Proj/Objects/led.crf


+ 2 - 2
app/Proj/Objects/led.d

@@ -2,7 +2,7 @@
 .\objects\led.o: ..\bsp\led.h
 .\objects\led.o: ..\CMSIS\gd32f10x.h
 .\objects\led.o: ..\CMSIS\core_cm3.h
-.\objects\led.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\led.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\led.o: ..\CMSIS\core_cmInstr.h
 .\objects\led.o: ..\CMSIS\core_cmFunc.h
 .\objects\led.o: ..\CMSIS\system_gd32f10x.h
@@ -30,5 +30,5 @@
 .\objects\led.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\led.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\led.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\led.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\led.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\led.o: ..\Firmware\Include\gd32f10x_misc.h

TEMPAT SAMPAH
app/Proj/Objects/log.crf


+ 4 - 4
app/Proj/Objects/log.d

@@ -1,10 +1,10 @@
 .\objects\log.o: ..\App\log.c
 .\objects\log.o: ..\App\log.h
-.\objects\log.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdarg.h
+.\objects\log.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdarg.h
 .\objects\log.o: ..\bsp\usart.h
 .\objects\log.o: ..\CMSIS\gd32f10x.h
 .\objects\log.o: ..\CMSIS\core_cm3.h
-.\objects\log.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\log.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\log.o: ..\CMSIS\core_cmInstr.h
 .\objects\log.o: ..\CMSIS\core_cmFunc.h
 .\objects\log.o: ..\CMSIS\system_gd32f10x.h
@@ -32,7 +32,7 @@
 .\objects\log.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\log.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\log.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\log.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\log.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\log.o: ..\Firmware\Include\gd32f10x_misc.h
 .\objects\log.o: ..\App\config.h
-.\objects\log.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
+.\objects\log.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdio.h

TEMPAT SAMPAH
app/Proj/Objects/main.crf


+ 6 - 6
app/Proj/Objects/main.d

@@ -1,7 +1,7 @@
 .\objects\main.o: ..\App\main.c
 .\objects\main.o: ..\CMSIS\gd32f10x.h
 .\objects\main.o: ..\CMSIS\core_cm3.h
-.\objects\main.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\main.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\main.o: ..\CMSIS\core_cmInstr.h
 .\objects\main.o: ..\CMSIS\core_cmFunc.h
 .\objects\main.o: ..\CMSIS\system_gd32f10x.h
@@ -29,23 +29,23 @@
 .\objects\main.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\main.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\main.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\main.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\main.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\main.o: ..\Firmware\Include\gd32f10x_misc.h
 .\objects\main.o: ..\App\systick.h
-.\objects\main.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
+.\objects\main.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdio.h
 .\objects\main.o: ..\App\main.h
 .\objects\main.o: ..\bsp\usart.h
 .\objects\main.o: ..\bsp\led.h
 .\objects\main.o: ..\App\config.h
 .\objects\main.o: ..\App\log.h
-.\objects\main.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdarg.h
+.\objects\main.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdarg.h
 .\objects\main.o: ..\App\ec800m.h
 .\objects\main.o: ..\App\device_message.h
 .\objects\main.o: ..\App\parseDeviceMessage.h
 .\objects\main.o: ..\App\mmodbus.h
 .\objects\main.o: ..\App\mmodbusConfig.h
-.\objects\main.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdbool.h
-.\objects\main.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
+.\objects\main.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdbool.h
+.\objects\main.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\string.h
 .\objects\main.o: ..\bsp\ring_buffer.h
 .\objects\main.o: ..\dlt\inc\dlt645.h
 .\objects\main.o: ..\dlt\port\dlt645_port.h

TEMPAT SAMPAH
app/Proj/Objects/mmodbus.crf


+ 5 - 5
app/Proj/Objects/mmodbus.d

@@ -3,7 +3,7 @@
 .\objects\mmodbus.o: ..\Firmware\Include\gd32f10x_usart.h
 .\objects\mmodbus.o: ..\CMSIS\gd32f10x.h
 .\objects\mmodbus.o: ..\CMSIS\core_cm3.h
-.\objects\mmodbus.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\mmodbus.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\mmodbus.o: ..\CMSIS\core_cmInstr.h
 .\objects\mmodbus.o: ..\CMSIS\core_cmFunc.h
 .\objects\mmodbus.o: ..\CMSIS\system_gd32f10x.h
@@ -31,11 +31,11 @@
 .\objects\mmodbus.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\mmodbus.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\mmodbus.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\mmodbus.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\mmodbus.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\mmodbus.o: ..\Firmware\Include\gd32f10x_misc.h
 .\objects\mmodbus.o: ..\App\mmodbusConfig.h
-.\objects\mmodbus.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdbool.h
-.\objects\mmodbus.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
-.\objects\mmodbus.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
+.\objects\mmodbus.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdbool.h
+.\objects\mmodbus.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\string.h
+.\objects\mmodbus.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdio.h
 .\objects\mmodbus.o: ..\bsp\usart.h
 .\objects\mmodbus.o: ..\App\systick.h

TEMPAT SAMPAH
app/Proj/Objects/mqttrecv.crf


+ 6 - 6
app/Proj/Objects/mqttrecv.d

@@ -2,7 +2,7 @@
 .\objects\mqttrecv.o: ..\bsp\usart.h
 .\objects\mqttrecv.o: ..\CMSIS\gd32f10x.h
 .\objects\mqttrecv.o: ..\CMSIS\core_cm3.h
-.\objects\mqttrecv.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\mqttrecv.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\mqttrecv.o: ..\CMSIS\core_cmInstr.h
 .\objects\mqttrecv.o: ..\CMSIS\core_cmFunc.h
 .\objects\mqttrecv.o: ..\CMSIS\system_gd32f10x.h
@@ -30,20 +30,20 @@
 .\objects\mqttrecv.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\mqttrecv.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\mqttrecv.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\mqttrecv.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\mqttrecv.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\mqttrecv.o: ..\Firmware\Include\gd32f10x_misc.h
-.\objects\mqttrecv.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
+.\objects\mqttrecv.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\string.h
 .\objects\mqttrecv.o: ..\bsp\ring_buffer.h
 .\objects\mqttrecv.o: ..\App\mqttRecv.h
-.\objects\mqttrecv.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdbool.h
+.\objects\mqttrecv.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdbool.h
 .\objects\mqttrecv.o: ..\App\log.h
-.\objects\mqttrecv.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdarg.h
+.\objects\mqttrecv.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdarg.h
 .\objects\mqttrecv.o: ..\App\mqttRecv.h
 .\objects\mqttrecv.o: ..\App\main.h
 .\objects\mqttrecv.o: ..\App\parseDeviceMessage.h
 .\objects\mqttrecv.o: ..\App\device_message.h
 .\objects\mqttrecv.o: ..\App\mmodbus.h
 .\objects\mqttrecv.o: ..\App\mmodbusConfig.h
-.\objects\mqttrecv.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
+.\objects\mqttrecv.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdio.h
 .\objects\mqttrecv.o: ..\dlt\inc\dlt645.h
 .\objects\mqttrecv.o: ..\dlt\port\dlt645_port.h

TEMPAT SAMPAH
app/Proj/Objects/otaevent.crf


+ 6 - 2
app/Proj/Objects/otaevent.d

@@ -1,6 +1,6 @@
 .\objects\otaevent.o: ..\App\otaEvent.c
 .\objects\otaevent.o: ..\App\otaEvent.h
-.\objects\otaevent.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+.\objects\otaevent.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\otaevent.o: ..\bsp\usart.h
 .\objects\otaevent.o: ..\CMSIS\gd32f10x.h
 .\objects\otaevent.o: ..\CMSIS\core_cm3.h
@@ -31,8 +31,12 @@
 .\objects\otaevent.o: ..\Firmware\Include\gd32f10x_exmc.h
 .\objects\otaevent.o: ..\Firmware\Include\gd32f10x_can.h
 .\objects\otaevent.o: ..\Firmware\Include\gd32f10x_enet.h
-.\objects\otaevent.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+.\objects\otaevent.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdlib.h
 .\objects\otaevent.o: ..\Firmware\Include\gd32f10x_misc.h
 .\objects\otaevent.o: ..\App\systick.h
 .\objects\otaevent.o: ..\bsp\w25q32.h
 .\objects\otaevent.o: ..\App\main.h
+.\objects\otaevent.o: ..\App\ec800m.h
+.\objects\otaevent.o: ..\App\device_message.h
+.\objects\otaevent.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\stdio.h
+.\objects\otaevent.o: D:\software\MDK5\ARM\ARMCC\Bin\..\include\string.h

TEMPAT SAMPAH
app/Proj/Objects/parsedevicemessage.crf


+ 0 - 0
app/Proj/Objects/parsedevicemessage.d


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini