From 3d600a1b2328842e7fca436e14caf1e1e11e68f8 Mon Sep 17 00:00:00 2001
From: zhangsan <zezhao_wei@163.com>
Date: Sat, 19 Dec 2020 09:37:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E6=9D=BF?=
 =?UTF-8?q?=E5=86=99=E5=85=A5=E6=A8=A1=E5=BC=8F=E4=B8=BA=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?2s=E5=86=99=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../soft_gsm_main.sip_sym                     | Bin 563192 -> 729512 bytes
 source/app/app_task_485_control.c             |  17 +++++++++++++++++
 source/app/app_task_485_control.h             |   2 ++
 3 files changed, 19 insertions(+)

diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym
index 10d2d860b8cfbb5c751a21e3ef1317a42d91546f..bcc1a08e0319d74991a340f73ea6d51dd3917537 100644
GIT binary patch
delta 1757
zcmeH_F-yZ>5Qgt-E=jRTNgK3oR&mVGp%etcRq9|1u1W<JL68Pf7a<mhE)MDky+tH~
z(2CSHI>g<@L81Kz4&o?r5X8ayrN6=<2M>3{d&k}Jes`u?k5+0_1y}~aL;|3o0oYz@
z%OQ6^HhttezU#27prNCTJL}tPJos7QRYa=1DREf_0F8fYCc7bahjU6i)NJs+SL7uP
z$*QRa$9V&HB>*aUI9u=9F@fZFZCol)r72-1oRSiRF(Y8ZDoqnDyk<I;A0(5V^GnBU
z1}((1E>iVNG6>t~^6WU$=7*G}r#7DOSB`qvEe;w+l9yLaI=DrbC3$TnL-`IKQ*a@n
zJ|+Z)V3?`j!FwT@95MB#0`NN+4EDszMY0=eo?a4cksqe9Zh0ZHK=Cb4eSY_HJr)uD
RAo4)ufye{@#{;Li-XFi1z=!|<

delta 301
zcmZ2+Sm(!jB|%Yk28LJ$1{O|k1_m=828Pm&g4y+xA52zhUQoY%K|SM=4=iQO3=Gq4
zYM271)w1!hG62D|$&KB@(=BqDB&I7AFsZN<f>e9}s+fL3gPBDUq~--k9T5BhVn!fl
zW)J~!!Ju^d!aOE%kXDWM4TVfV%)EU=Axnta^bhlxS*ADSG4XI~09AtYF)@ftmtVoM
zl92~wC*z#S3+siKe^|l7GCg5AP;EdLyTWvlwJZ~+b+fBXKLKP+H_!vJYSytVnBKFU
zMP$0cdX@=5|FBFyvyDYz`jhogao*)@3=IGN|Np-lNPA5$oW^c4{VX@5|KtWCmUf+u
QAj}HHY}<7<vY&Yd0Nt)#_y7O^

diff --git a/source/app/app_task_485_control.c b/source/app/app_task_485_control.c
index f2eee6d..16aa660 100644
--- a/source/app/app_task_485_control.c
+++ b/source/app/app_task_485_control.c
@@ -10,6 +10,7 @@ void L3_task_485_control_init(void)
 	L3_task_s_go(ts_485_control,D_task_init);
 	ts_485_control.total_weight_pool = 0;
 	ts_485_control.rfid_pool = 0;
+	ts_485_control.sendstmp = 0;
 }
 
 #define D_task_485_control_01 0x51
@@ -20,6 +21,21 @@ void L3_task_485_control_handle(TS_485_control *s)
 		L2_task_go(D_task_485_control_01);
 		
 	TTSS_Task_step(D_task_485_control_01)
+		if(s_nos_tick.t_1s - s->sendstmp >= 1)
+		{
+			s->sendstmp = s_nos_tick.t_1s;
+			
+			G.thrombolytic_val = G.total_weight / 10 * G.p.thrombolytic_ratio / 10;
+			G.bolus_val = G.thrombolytic_val * G.p.bolus_ratio / 10;
+			G.hold_val = G.thrombolytic_val * G.p.hold_ratio / 10;
+			
+			G.md_slaver_info[2].mask = 1;
+			s->total_weight_pool = G.total_weight;
+
+			G.md_slaver_info[3].mask = 1;
+			s->rfid_pool = G.rfid;
+		}
+	#if 0
 		if(s->total_weight_pool != G.total_weight)
 		{
 			G.thrombolytic_val = G.total_weight / 10 * G.p.thrombolytic_ratio / 10;
@@ -35,6 +51,7 @@ void L3_task_485_control_handle(TS_485_control *s)
 			G.md_slaver_info[3].mask = 1;
 			s->rfid_pool = G.rfid;
 		}
+	#endif
 		L2_task_go(D_task_485_control_01);
 		
 	TTSS_Task_end();
diff --git a/source/app/app_task_485_control.h b/source/app/app_task_485_control.h
index f4d1f29..f508174 100644
--- a/source/app/app_task_485_control.h
+++ b/source/app/app_task_485_control.h
@@ -10,6 +10,8 @@ typedef struct
 	TS_task task;
 	S32 total_weight_pool;
 	U16 rfid_pool;
+	U32 sendstmp;
+	U8 sendflag;
 }TS_485_control;
 
 extern TS_485_control ts_485_control;