From f6c715fabd536693289a0cdf3fd13c82f48d3840 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Sat, 19 Dec 2020 13:29:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft_gsm_main.sip_sym | Bin 729512 -> 563192 bytes .../soft_gsm_main.sip_xm | Bin 324 -> 324 bytes .../soft_gsm_main.siwork | Bin 121683 -> 121605 bytes source/app/app_task_485.c | 40 ++++++++++-------- source/app/app_task_485_control.c | 4 +- source/app/app_task_485_control.h | 2 - 6 files changed, 24 insertions(+), 22 deletions(-) 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 bcc1a08e0319d74991a340f73ea6d51dd3917537..fef1fb703c0982378c6fd1cf0b7b4f7cf47bf862 100644 GIT binary patch delta 65 zcmZ2+Sm(!jrG^&97N!>FEi4-*bLTKHFfal!Cxg%S-IG}&MYye?B1{Y-?eZ&FfS47C M*|y8CV88hu0BhP3Qvd(} delta 1500 zcmeydUTMW)orV_17N!>FEi4-*b7wFxFfal!2ZQJK-IG}&MYt`YA`A>d?eZ&FfS47C j*|y8CV88i(qrnBnQ9K$3qiJ9?4UDFN!IK6i8e9MX51w-2 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 20f8fa12c28a6520d2daa0832faa5f3163d99d78..210a773a03373345b012b93e68362c3ff26a688a 100644 GIT binary patch delta 16 XcmX@YbcAVwGAp|m0|Wa;4H-rNCE5d% delta 16 XcmX@YbcAVwGAn}@0|UcG4H-rNC3pjc diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index 66280f876b3934d62e0704bbf301f3810c02a12e..8a3d955d6157d30db70d4036c42163cebb918e5a 100644 GIT binary patch literal 121605 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 KD?X6f@Bati`UQJ#n5lOFp8nu?Rr49Xh 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 diff --git a/source/app/app_task_485.c b/source/app/app_task_485.c index 6ac80fc..5672e78 100644 --- a/source/app/app_task_485.c +++ b/source/app/app_task_485.c @@ -57,24 +57,32 @@ void L3_task_485_handle(TS_485 *s) if(s->pAckPkg->salver == G.md_slaver_info[s->slaverIndex].slaver) { s->ackFlag = 1; - //TODO 这里可以根据modbus协议让代码通用, - if(s->pAckPkg->salver == G.md_slaver_info[0].slaver && s->pAckPkg->oper == MODBUS_OPER_READ) - { - G.total_weight = - (S32)(s->pAckPkg->buf[1]) << 24 | (S32)(s->pAckPkg->buf[2]) << 16 | (S32)(s->pAckPkg->buf[3]) << 8 - | (S32)(s->pAckPkg->buf[4]); - } - else if(s->pAckPkg->salver == G.md_slaver_info[1].slaver && s->pAckPkg->oper == MODBUS_OPER_READ) + if(G.md_slaver_info[s->slaverIndex].mask == 1) { - G.asga.xaxis = (U16)(s->pAckPkg->buf[1]) << 8 | (U16)(s->pAckPkg->buf[2]); - G.asga.yaxis = (U16)(s->pAckPkg->buf[3]) << 8 | (U16)(s->pAckPkg->buf[4]); - G.asga.zaxis = (U16)(s->pAckPkg->buf[5]) << 8 | (U16)(s->pAckPkg->buf[6]); + G.md_slaver_info[s->slaverIndex].mask = 0; } - else if(s->pAckPkg->salver == G.md_slaver_info[4].slaver && s->pAckPkg->oper == MODBUS_OPER_READ) + + //TODO 这里可以根据modbus协议让代码通用, + if(s->pAckPkg->oper == MODBUS_OPER_READ) { - if(s->pAckPkg->buf[1] != 0 || s->pAckPkg->buf[2] != 0) //按键不为0 + if(s->pAckPkg->salver == G.md_slaver_info[0].slaver) + { + G.total_weight = + (S32)(s->pAckPkg->buf[1]) << 24 | (S32)(s->pAckPkg->buf[2]) << 16 | (S32)(s->pAckPkg->buf[3]) << 8 + | (S32)(s->pAckPkg->buf[4]); + } + else if(s->pAckPkg->salver == G.md_slaver_info[1].slaver) + { + G.asga.xaxis = (U16)(s->pAckPkg->buf[1]) << 8 | (U16)(s->pAckPkg->buf[2]); + G.asga.yaxis = (U16)(s->pAckPkg->buf[3]) << 8 | (U16)(s->pAckPkg->buf[4]); + G.asga.zaxis = (U16)(s->pAckPkg->buf[5]) << 8 | (U16)(s->pAckPkg->buf[6]); + } + else if(s->pAckPkg->salver == G.md_slaver_info[4].slaver) { - G.rfid = (U16)(s->pAckPkg->buf[1]) << 8 | (U16)(s->pAckPkg->buf[2]); + if(s->pAckPkg->buf[1] != 0 || s->pAckPkg->buf[2] != 0) //按键不为0 + { + G.rfid = (U16)(s->pAckPkg->buf[1]) << 8 | (U16)(s->pAckPkg->buf[2]); + } } } } @@ -82,10 +90,6 @@ void L3_task_485_handle(TS_485 *s) s->retryTimes++; if(s->ackFlag || s->retryTimes >= MODBUS_SLAVER_RETRY_MAX_TIME) { - if(G.md_slaver_info[s->slaverIndex].mask == 1) - { - G.md_slaver_info[s->slaverIndex].mask = 0; - } L2_task_go(D_task_485_switch_next_slaver); } else diff --git a/source/app/app_task_485_control.c b/source/app/app_task_485_control.c index 16aa660..034b719 100644 --- a/source/app/app_task_485_control.c +++ b/source/app/app_task_485_control.c @@ -10,7 +10,6 @@ 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 @@ -21,6 +20,7 @@ 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 0 if(s_nos_tick.t_1s - s->sendstmp >= 1) { s->sendstmp = s_nos_tick.t_1s; @@ -35,7 +35,7 @@ void L3_task_485_control_handle(TS_485_control *s) G.md_slaver_info[3].mask = 1; s->rfid_pool = G.rfid; } - #if 0 + #else if(s->total_weight_pool != G.total_weight) { G.thrombolytic_val = G.total_weight / 10 * G.p.thrombolytic_ratio / 10; diff --git a/source/app/app_task_485_control.h b/source/app/app_task_485_control.h index f508174..f4d1f29 100644 --- a/source/app/app_task_485_control.h +++ b/source/app/app_task_485_control.h @@ -10,8 +10,6 @@ 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;