diff --git a/Experimental_Platform_Based_On_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/emWin/uiBuild/core/src/UI_Touch.c b/Experimental_Platform_Based_On_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/emWin/uiBuild/core/src/UI_Touch.c
index 4a9b90e..b6d0055 100644
--- a/Experimental_Platform_Based_On_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/emWin/uiBuild/core/src/UI_Touch.c
+++ b/Experimental_Platform_Based_On_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/emWin/uiBuild/core/src/UI_Touch.c
@@ -110,6 +110,7 @@ void ui_action()
ex_touch_area = present_touch_area;
}
}
+
}
diff --git a/Experimental_Platform_Based_On_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/project.axf b/Experimental_Platform_Based_On_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/project.axf
index e2e4740..4b33df6 100644
Binary files a/Experimental_Platform_Based_On_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/project.axf and b/Experimental_Platform_Based_On_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/project.axf differ
diff --git a/Experimental_Platform_Based_On_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/project.build_log.htm b/Experimental_Platform_Based_On_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/project.build_log.htm
index 7078ad2..43243e6 100644
--- a/Experimental_Platform_Based_On_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/project.build_log.htm
+++ b/Experimental_Platform_Based_On_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/project.build_log.htm
@@ -8,36 +8,98 @@
Project:
Output:
Build target 'v1.0'
+compiling main.c...
+..\..\app\normal\src\main.c(78): warning: #167-D: argument of type "char *" is incompatible with parameter of type "const u8 *"
+ voiceDispString(volumeString);
+..\..\app\normal\src\main.c(183): warning: #870-D: invalid multibyte character sequence
+ sprintf(pStrSysDate, "%d?d?d?", system_time.year, system_time.month, system_time.day);
+..\..\app\normal\src\main.c(183): warning: #870-D: invalid multibyte character sequence
+ sprintf(pStrSysDate, "%d?d?d?", system_time.year, system_time.month, system_time.day);
+..\..\app\normal\src\main.c(183): warning: #870-D: invalid multibyte character sequence
+ sprintf(pStrSysDate, "%d?d?d?", system_time.year, system_time.month, system_time.day);
+..\..\app\normal\src\main.c(191): warning: #870-D: invalid multibyte character sequence
+ notify_show("时间校准失败", "请稍?);
+..\..\app\normal\src\main.c(198): warning: #870-D: invalid multibyte character sequence
+ notify_show("同步失败", "请稍?);
+..\..\app\normal\src\main.c(221): warning: #550-D: variable "bounce_cnt" was set but never used
+ int bounce_cnt = 0;
+..\..\app\normal\src\main.c(334): warning: #870-D: invalid multibyte character sequence
+ notify_show("节点上传成功", "设备信息已更?);
+..\..\app\normal\src\main.c(417): warning: #181-D: argument is incompatible with corresponding format string conversion
+ sprintf((char *)request, "https://%s/openApi/experiment/signOut.json?id=%s&userId=%s", http_wifista_ip, sys_config.dev_id, routine.appointed_uid[0]);
+..\..\app\normal\src\main.c(466): warning: #870-D: invalid multibyte character sequence
+ notify_show("同步失败", "服务器登录超?);
+..\..\app\normal\src\main.c(469): warning: #870-D: invalid multibyte character sequence
+ notify_show("操作无效", "请稍?);
+..\..\app\normal\src\main.c(473): warning: #870-D: invalid multibyte character sequence
+ notify_show("同步成功", "初始化成?);
+..\..\app\normal\src\main.c(484): warning: #870-D: invalid multibyte character sequence
+ notify_show("操作无效", "请稍?);
+..\..\app\normal\src\main.c(495): warning: #870-D: invalid multibyte character sequence
+ notify_show("操作无效", "请稍?);
+..\..\app\normal\src\main.c(498): warning: #870-D: invalid multibyte character sequence
+ notify_show("同步失败", "服务器连接超?);
+..\..\app\normal\src\main.c(509): warning: #870-D: invalid multibyte character sequence
+ notify_show("操作无效", "请稍?);
+..\..\app\normal\src\main.c(255): warning: #177-D: variable "i" was declared but never referenced
+ u8 i, j;
+..\..\app\normal\src\main.c(255): warning: #177-D: variable "j" was declared but never referenced
+ u8 i, j;
+..\..\app\normal\src\main.c(257): warning: #177-D: variable "recheck_times" was declared but never referenced
+ static u8 recheck_times = 0;
+..\..\app\normal\src\main.c(260): warning: #177-D: variable "ulNotifiedValue" was declared but never referenced
+ uint32_t ulNotifiedValue;
+..\..\app\normal\src\main.c(579): warning: #870-D: invalid multibyte character sequence
+ notify_show("操作无效", "请稍?);
+..\..\app\normal\src\main.c(585): warning: #870-D: invalid multibyte character sequence
+ notify_show("扫描超时", "请重?);
+..\..\app\normal\src\main.c(591): warning: #870-D: invalid multibyte character sequence
+ notify_show("二维码错?, "请重?);
+..\..\app\normal\src\main.c(591): warning: #870-D: invalid multibyte character sequence
+ notify_show("二维码错?, "请重?);
+..\..\app\normal\src\main.c(632): warning: #167-D: argument of type "char *" is incompatible with parameter of type "const u8 *"
+ voiceDispString(epoch_dev_report);
+..\..\app\normal\src\main.c(622): warning: #177-D: variable "pmsg" was declared but never referenced
+ WM_MESSAGE pmsg;
+..\..\app\normal\src\main.c(679): warning: #177-D: variable "pmsg" was declared but never referenced
+ WM_MESSAGE pmsg;
+..\..\app\normal\src\main.c(680): warning: #177-D: variable "ulTimerID" was declared but never referenced
+ uint32_t ulTimerID;
+..\..\app\normal\src\main.c: 28 warnings, 0 errors
compiling UI_SettingWindow.c...
-..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(105): warning: #870-D: invalid multibyte character sequence
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(107): warning: #870-D: invalid multibyte character sequence
BUTTON_SetText(hAdminButton, "管理员入?);
-..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(255): warning: #870-D: invalid multibyte character sequence
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(265): warning: #870-D: invalid multibyte character sequence
TEXT_SetText(hItem, "声音开?);
-..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(459): warning: #870-D: invalid multibyte character sequence
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(466): warning: #870-D: invalid multibyte character sequence
+ notify_show("节点信息上传?, "请稍?);
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(466): warning: #870-D: invalid multibyte character sequence
+ notify_show("节点信息上传?, "请稍?);
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(468): warning: #870-D: invalid multibyte character sequence
+ notify_show("操作无效", "请稍?);
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(489): warning: #870-D: invalid multibyte character sequence
LISTVIEW_SetItemText(hConnectList, 1, 0, "加密状?);
-..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(461): warning: #870-D: invalid multibyte character sequence
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(491): warning: #870-D: invalid multibyte character sequence
LISTVIEW_SetItemText(hConnectList, 2, 0, "WIFI状?);
-..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(493): warning: #870-D: invalid multibyte character sequence
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(523): warning: #870-D: invalid multibyte character sequence
BUTTON_SetText(hScanButton, "开始匹?);
-..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(527): warning: #870-D: invalid multibyte character sequence
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(557): warning: #870-D: invalid multibyte character sequence
notify_show("操作无效", "请稍?);
-..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(534): warning: #870-D: invalid multibyte character sequence
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(564): warning: #870-D: invalid multibyte character sequence
} else if(strstr("开始匹?, (char *)p)) {
-..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(568): warning: #870-D: invalid multibyte character sequence
- notify_show("操作无效", "请稍?);
-..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(592): warning: #870-D: invalid multibyte character sequence
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(622): warning: #870-D: invalid multibyte character sequence
TEXT_SetText(hConnectPromptText2, "加密状?);
-..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(634): warning: #870-D: invalid multibyte character sequence
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(664): warning: #870-D: invalid multibyte character sequence
} else if(strstr("开始匹?", (char *)p)) {
-..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(143): warning: #177-D: variable "j" was declared but never referenced
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(153): warning: #177-D: variable "j" was declared but never referenced
int i, j;
-..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(148): warning: #177-D: variable "epoch_notify" was declared but never referenced
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c(158): warning: #177-D: variable "epoch_notify" was declared but never referenced
epoch_dev_t *epoch_notify = NULL;
-..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c: 12 warnings, 0 errors
+..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c: 14 warnings, 0 errors
linking...
-Program Size: Code=208692 RO-data=459900 RW-data=5504 ZI-data=198756
+Program Size: Code=208924 RO-data=459928 RW-data=5508 ZI-data=198752
FromELF: creating hex file...
-".\Objects\project.axf" - 0 Error(s), 12 Warning(s).
+".\Objects\project.axf" - 0 Error(s), 42 Warning(s).
Load "E:\\github\\FHQ\\Experiment_Platform\\Experimental_Platform_Based_On_DTR v3.2\\Experimental_Platform_Based_On_DTR v3.2\\projects\\MDK-ARM(uV5)\\Objects\\project.axf"
* JLink Info: Device "STM32F429ZG" selected (1024 KB flash, 192 KB RAM).
Set JLink Project File to "E:\github\FHQ\Experiment_Platform\Experimental_Platform_Based_On_DTR v3.2\Experimental_Platform_Based_On_DTR v3.2\projects\MDK-ARM(uV5)\JLinkSettings.ini"
@@ -73,82 +135,7 @@ Output:
Programming Done.
Verify OK.
Application running ...
-
-