diff --git a/.vscode/settings.json b/.vscode/settings.json
index 04a88ab..e96c9d7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -17,6 +17,7 @@
"app_screen_save.h": "c",
"msp_eeprom.h": "c",
"app_weight.h": "c",
- "bsp_msa300.h": "c"
+ "bsp_msa300.h": "c",
+ "c_lib.h": "c"
}
}
\ No newline at end of file
diff --git a/source/app/task_bedalarm.c b/source/app/task_bedalarm.c
index 41e16ad..102367d 100644
--- a/source/app/task_bedalarm.c
+++ b/source/app/task_bedalarm.c
@@ -1,14 +1,3 @@
-////////////////////////////////////////////////////////////////////////////
-///@copyright Copyright (c) 2018, 传控科技 All rights reserved.
-///-------------------------------------------------------------------------
-/// @file bsp_drv.c
-/// @brief bsp @ driver config
-///-------------------------------------------------------------------------
-/// @version 1.0
-/// @author CC
-/// @date 20180331
-/// @note cc_AS_stc02
-//////////////////////////////////////////////////////////////////////////////
#include "task_bedalarm.h"
#include "app_config.h"
@@ -76,6 +65,8 @@ void L3_task_bed_alarm_handler(S_TASK_Bed_ALARM *s)
// D_LED1_OFF();
R.beep_startime = 0;
R.LeaveForbid_flag = LeaveForbid_OFF;
+ //A5 5A 08 83 06 D3 01 00 00 FE AC解除报警时，清除图标
+ // L1_uart1_Array((U8 *)&scrPkgAlarmClearPkg, sizeof(scrPkgAlarmClearPkg));
L2_task_go_Tdelay(D_task_ALARM_JUDGE, D_Tdelay_200ms);
}
else if(R.LeaveForbid_flag == LeaveForbid_OFF)
@@ -86,6 +77,8 @@ void L3_task_bed_alarm_handler(S_TASK_Bed_ALARM *s)
// D_LED1_OFF();
R.beep_startime = 0;
// R.LeaveForbid_flag = LeaveForbid_OFF;
+ //A5 5A 08 83 06 D3 01 00 00 FE AC解除报警时，清除图标
+ // L1_uart1_Array((U8 *)&scrPkgAlarmClearPkg, sizeof(scrPkgAlarmClearPkg));
L2_task_go_Tdelay(D_task_ALARM_JUDGE, D_Tdelay_200ms);
}
else
diff --git a/source/app/task_bedalarm.h b/source/app/task_bedalarm.h
index a14f22c..ede280f 100644
--- a/source/app/task_bedalarm.h
+++ b/source/app/task_bedalarm.h
@@ -16,6 +16,7 @@
#include "../ctask/TTSS_task.h"
#include "../clib/c_lib.h"
+// #include "task_screen.h"
typedef struct _s_task_low_power
diff --git a/source/app/task_screen.c b/source/app/task_screen.c
index 3989e02..c8bb101 100644
--- a/source/app/task_screen.c
+++ b/source/app/task_screen.c
@@ -235,26 +235,6 @@ void constructor_scr_pkg()
scrSetValPkg.weight_kgx100[0] = (R.weight.kgx10_out * 22) >> 8 & 0xFF;
scrSetValPkg.weight_kgx100[1] = (R.weight.kgx10_out * 22) >> 0 & 0xFF;
}
-
- // L0_uart1_str("scrSetValPkg.weight_kgx100= ");
- // L0_uart1_uchex(scrSetValPkg.weight_kgx100[0]);
- // L0_uart1_uchex(scrSetValPkg.weight_kgx100[1]);
- // L0_uart1_0d0a();
-
- // scrSetValPkg.buf.dl[0] = R.dl >> 8 & 0xFF;
- // scrSetValPkg.buf.dl[1] = R.dl >> 0 & 0xFF;
-
- // scrSetValPkg.buf.net_status[0] = R.net_status >> 8 & 0xFF;
- // scrSetValPkg.buf.net_status[1] = R.net_status >> 0 & 0xFF;
- //
- // scrSetValPkg.buf.danwei[0] = R.danwei >> 8 & 0xFF;
- // scrSetValPkg.buf.danwei[1] = R.danwei >> 0 & 0xFF;
-
- // scrSetValPkg.buf.beep[0] = R.beep >> 8 & 0xFF;
- // scrSetValPkg.buf.beep[1] = R.beep >> 0 & 0xFF;
-
- // scrSetValPkg.buf.LeaveForbid_flag[0] = R.LeaveForbid_flag >> 8 & 0xFF;
- // scrSetValPkg.buf.LeaveForbid_flag[1] = R.LeaveForbid_flag >> 0 & 0xFF;
CRC = CRC_16(((U8 *)&scrSetValPkg) + 3, 5);
scrSetValPkg.crc[1] = CRC;
diff --git a/source/app/task_screen.h b/source/app/task_screen.h
index 517b8f5..bb72b33 100644
--- a/source/app/task_screen.h
+++ b/source/app/task_screen.h
@@ -39,44 +39,8 @@ typedef struct
U8 crc[2];
} SCRSaveValPkg;
-// WEIGHT_SAVE weight_save[SCREEN_SAVE_LEN] = {0};
-
-// typedef struct
-// {
-// U8 head[2];
-// U8 num;
-// U8 cmd;
-// U8 start_addr[2];
-// struct
-// {
-// //重量
-// U8 weight_kgx100[2];
-// //电量
-// U8 dl[2];
-// //网络状态
-// U8 net_status[2];
-// //单位
-// U8 danwei[2];
-// //语言
-// U8 language[2];
-// //蜂鸣器状态
-// U8 beep[2];
-// //界面
-// U8 ui[2];
-// //离床报警标志
-// U8 LeaveForbid_flag[2];
-// //重量保持标志
-// U8 WeightKeep_flag[2];
-// } buf;
-// U8 crc[2];
-// } SCRSetValPkg;
// A5 5A 08 83 00 00 01 02 22 00 00
-//A5 5A 08 83 06 D6 01 00 00 FE 60
-// A5 5A 08 83 07 A3 01 05 DC DB 65
-// A5 5A 08 83 07 A1 01 00 00 D8 14
-// A5 5A 08 83 07 A2 01 00 00 D8 50
-// A5 5A 06 81 01 01 40 79 B8
typedef struct
{
U8 head[2]; //A5 5A：帧头
@@ -98,8 +62,13 @@ typedef struct
} SCRControlPkg;
// A5 5A 05 80 02 32 F0 9D 0.5s
+// A5 5A 05 80 02 32 F0 9D 0.5s
+// A5 5A 05 80 02 14 71 47 0.2s
extern SCRControlPkg scrBeepPowOnPkg;
+// A5 5A 08 82 06 D3 01 00 00 FF 7D 清除报警图标
+extern SCReturnPkg scrPkgAlarmClearPkg;
+
// typedef struct _tpc_screen_
// {
// U8 head[2];