diff --git a/.vscode/settings.json b/.vscode/settings.json
index b9359b5..ae272f8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -26,7 +26,7 @@
"task_game.h": "c",
"app_config.h": "c",
"type_traits": "c",
- "task_btn.h": "c",
+ "L3_task_btn_handler.h": "c",
"bsp_btn.h": "c",
"app_data_save.h": "c",
"task_modbus.h": "c",
diff --git a/keilp/cc_as_stc02_ps5ws.uvprojx b/keilp/cc_as_stc02_ps5ws.uvprojx
index 3c78ad0..2aaadc5 100644
--- a/keilp/cc_as_stc02_ps5ws.uvprojx
+++ b/keilp/cc_as_stc02_ps5ws.uvprojx
@@ -413,6 +413,16 @@
1
..\source\app\task_game.c
+
+ task_btn.c
+ 1
+ ..\source\app\task_btn.c
+
+
+ app_data_save.c
+ 1
+ ..\source\app\app_data_save.c
+
@@ -443,16 +453,16 @@
1
..\source\bsp\bsp_oid.c
+
+ bsp_btn.c
+ 1
+ ..\source\bsp\bsp_btn.c
+
msp
-
- eeprom.c
- 1
- ..\source\msp\eeprom.c
-
iic_sim.c
1
@@ -483,6 +493,11 @@
1
..\source\msp\UARTX.c
+
+ msp_eeprom.c
+ 1
+ ..\source\msp\msp_eeprom.c
+
diff --git a/source/app/main.c b/source/app/main.c
index d54bd9e..7991828 100644
--- a/source/app/main.c
+++ b/source/app/main.c
@@ -186,7 +186,7 @@ void main(void)
//按键处理
- task_btn();
+ L3_task_btn_handler();
// L3_task_key_handle(&s_task_key_handle);
//L3_task_modbus_handler2(&s_uart2_rec);
#if 1
diff --git a/source/app/main.h b/source/app/main.h
index f891d3e..3c5c3de 100644
--- a/source/app/main.h
+++ b/source/app/main.h
@@ -66,7 +66,7 @@
#include "../app/app_task_tcp_control.h"
#include "../app/app_task_speech.h"
#include "../app/task_game.h"
-#include "../app/task_btn.h"
+#include "../app/L3_task_btn_handler.h"
#include "../app/app_data_save.h"
diff --git a/source/app/source.lnk b/source/app/source.lnk
deleted file mode 100644
index e045044..0000000
Binary files a/source/app/source.lnk and /dev/null differ
diff --git a/source/app/task_btn.c b/source/app/task_btn.c
index 0e07d23..acba56b 100644
--- a/source/app/task_btn.c
+++ b/source/app/task_btn.c
@@ -1,11 +1,11 @@
-#include "task_btn.h"
+#include "L3_task_btn_handler.h"
#include "../bsp/bsp_btn.h"
#include "../bsp/bsp_config.h"
#include "../msp/UART0.h"
#include "../app/app_data_save.h"
-void task_btn(void)
+void L3_task_btn_handler(void)
{
switch(g_Key)
{
diff --git a/source/app/task_btn.h b/source/app/task_btn.h
index 0389358..3b2b60e 100644
--- a/source/app/task_btn.h
+++ b/source/app/task_btn.h
@@ -3,8 +3,8 @@
* 状态转换时间为10ms,即每次进入switch case语句的时间差为10ms
* 利用该10ms的间隙跳过按键抖动
*/
-#ifndef _app_task_btn_H
-#define _app_task_btn_H
+#ifndef _app_L3_task_btn_handler_H
+#define _app_L3_task_btn_handler_H
// struct _s_task_key_
// {
@@ -19,5 +19,5 @@
// extern struct _s_task_key_ s_task_key_handle;
// extern void L0_key_init(void);
// extern void L3_task_key_handle(struct _s_task_key_ *p);
-extern void task_btn(void);
+extern void L3_task_btn_handler(void);
#endif
\ No newline at end of file
diff --git a/source/app/task_w600.c b/source/app/task_w600.c
index c1c89d2..6aeaa17 100644
--- a/source/app/task_w600.c
+++ b/source/app/task_w600.c
@@ -256,7 +256,7 @@ void L2_task_gm35_flow_handle(struct _s_task_gm35_gprs_ *s)
TTSS_Task_step(TTSS_TASK_GM35_FLOW_ATEQV)
if(s->send == 0)
{//发送
- L3_gm35_send_str(AT_INS_ATE0);
+ L3_gm35_send_str(AT_INS_ATE0); //"ATE0\r\n" //模块查询+关闭回显
s->ins_ok = 0;
s->ins_stmp = s_nos_tick.t_1s;
s->send = 1;