From 722bc88bb1fea161b291ab0d4c88b664ca842c59 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Wed, 16 Dec 2020 20:21:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=A7=E7=94=B5=E5=99=A8?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keilp/cc_as_stc02_gsm_main.uvproj | 5 ++ .../soft_gsm_main.sip_sym | Bin 563192 -> 563192 bytes .../soft_gsm_main.sip_xm | Bin 324 -> 324 bytes .../soft_gsm_main.siwork | Bin 119718 -> 121648 bytes source/app/app_task_485_control.c | 6 +- source/app/main.c | 2 +- source/bsp/bsp_relay.c | 73 ++++++++++-------- 7 files changed, 49 insertions(+), 37 deletions(-) diff --git a/keilp/cc_as_stc02_gsm_main.uvproj b/keilp/cc_as_stc02_gsm_main.uvproj index c314c7e..0d90277 100644 --- a/keilp/cc_as_stc02_gsm_main.uvproj +++ b/keilp/cc_as_stc02_gsm_main.uvproj @@ -491,6 +491,11 @@ 1 ..\source\bsp\bsp_gm35.c + + bsp_relay.c + 1 + ..\source\bsp\bsp_relay.c + 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 8a4f8b0d1e92d1be78e52b82d3dba9c9ca5b4435..2c4bdeda897ecd5cedbe5f26c42fe412b53fa8f9 100644 GIT binary patch delta 384 zcmXYrze_?<6vxj!@A{)O5kd+|NpWzAri{qJpq7YuV1bJ?7n)CfzKAr62!kRJp;O?H zgV1I{U{F(kL2Yd{g-hTN;Skih*ntmxFWo<*JWOIGiK3lEeBTr%HMVe0mUx-cJE)(}2svT{fNe(21tS<61ZXOQ zK}u&aLi;A#Xd{nVVbHvZ3*;|gmR7SkN_vL-<6YEi#=WHRC(Z5p{l5X=@86g(Ff1+Q zjFs3~w!4)QK57Ri!}MriOy*SC<&vHwnjBJfN3HPuP%4Ls{uf@9)@iV|o5x8yGWq$M z$3>bgayl(=`cx@ya%xzdzD$e_mifA8eQkMVngRt}BJYD1rt2bm_msC&#G6|DOjha^ aw(FMW921w7W>sS(V`J=$qus1J6ZSt>rf+rt delta 478 zcmXYrKTBg#5XI-tyDxcY+yp{UcM(k1LL`kK7820LV%2p676#N0phbMi%POlW{8L2K zM&H80P7A?K#a+@^_yH6wEEEJqv=I>(mL;WgH*er~=bSr-VQPn|+F>e@2op^a>1ZQS zZ-l6ih<+U>?-X`>RSa(*!dVRbQ+hSWl^m;Tj`@BDj>|20D{?1}o|T6CgGZ44EGp6! za-y<=JV6PXT7f(#kv_M&kXqnTEPYivY0GR!Fm)mX+5g@=1?=UyA6E;U_0NWMvn7AS z!E{`@$umVTJS)3je5(^{ixPELamA|?}588ZgMVg%O&=B=L})k$T4%M!F;3n3v~-QRM?Lhs6^fmHwi diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm index 9bde1c7de262d21922d03aefba76b8565c8c0567..20f8fa12c28a6520d2daa0832faa5f3163d99d78 100644 GIT binary patch delta 11 TcmX@YbcAWbVn&9EOBMhC8sP+% delta 11 TcmX@YbcAWbVn+6fOBMhC8vO*F diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index 81d8b10d2dfe3b17ce23100fe3e844e24b07b75f..d3baf6b82bd4cf4df8a810d5748f64641b0cb6cc 100644 GIT binary patch delta 11539 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 != G.total_weight) { - G.thrombolytic_val = G.total_weight / 100 * G.p.thrombolytic_ratio; - G.bolus_val = G.thrombolytic_val / 10 * G.p.bolus_ratio; - G.hold_val = G.thrombolytic_val / 10 * G.p.hold_ratio; + 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; diff --git a/source/app/main.c b/source/app/main.c index b48baab..974ae48 100644 --- a/source/app/main.c +++ b/source/app/main.c @@ -53,7 +53,7 @@ stc5ac32s void L0_main_init(void) { - //L2_relay_init(); + L2_relay_init(); ///step : 1>>>>>>>>>引脚选择相关>>>>>>>>> L0_pin_config(); diff --git a/source/bsp/bsp_relay.c b/source/bsp/bsp_relay.c index c014753..48fc8be 100644 --- a/source/bsp/bsp_relay.c +++ b/source/bsp/bsp_relay.c @@ -58,6 +58,7 @@ void _CBC_HANDLER(U8 oper) } } +#if 0 struct _s_relay_oper s_relay_oper[RELAY_NUM] = { //status这里全部为RELAY_BI,如果系统看门狗重启,值会保存在flash_page0,从而读取设定 @@ -86,8 +87,9 @@ U8 L2_relay_convert_and_do(int i,int val) } return oper; } +#endif -#if 1 +#if 0 void L1_relay_on(vU8 n,vU8 val) { U8 i = 0; @@ -114,7 +116,7 @@ void L1_relay_on(vU8 n,vU8 val) } } } -#else +//#else void L1_relay_on(vU8 n,vU8 val) { U8 i = 0; @@ -151,6 +153,7 @@ void L1_relay_on(vU8 n,vU8 val) } #endif +#if 0 void L2_do_relay(U8 *buf) { U8 val = buf[0], index = buf[1] ,i = 0; @@ -178,6 +181,41 @@ void L2_do_relay(U8 *buf) } } } +#endif + +#if 0 +//全关(断开) +void L2_relay_poweroff_all(void) +{ + _CBC_HANDLER(RELAY_KAI); + L1_relay_on(RELAY_PC, RELAY_KAI); + L1_relay_on(RELAY_PRINTER, RELAY_KAI); + L1_relay_on(RELAY_PRINTER_1, RELAY_KAI); +} + +void L2_relay_poweron_all(void) +{ + U8 i = 0; + _CBC_HANDLER(RELAY_BI); + for(i=0;i