From fa158d9aadf91f29ef5833ea90ab5cd76e465a1a Mon Sep 17 00:00:00 2001 From: zhangsan Date: Wed, 28 Jul 2021 11:04:50 +0800 Subject: [PATCH] =?UTF-8?q?v3.1=20=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7v2.0->v3.0=20=E4=BF=AE=E5=A4=8D485=E8=BD=AE=E8=AF=A2?= =?UTF-8?q?=E6=94=B6=E5=88=B0ack=E4=BB=BB=E5=8A=A1=E4=B8=8D=E8=B7=B3?= =?UTF-8?q?=E8=BD=ACbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft_gsm_main.sip_sym | Bin 507932 -> 507932 bytes .../soft_gsm_main.siwork | Bin 51234 -> 60024 bytes source/app/app_common.h | 2 +- source/app/app_task_485.c | 3 ++- source/app/app_task_485_control.c | 6 +++++- 5 files changed, 8 insertions(+), 3 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 e775c5473e88f19da26e1a24ba2ab7915e21dfd3..fe6327bb832a5fd0efed42b306fcbe3930cbbf92 100644 GIT binary patch delta 68 zcmbQ!AU~%;e#4eU+;$8M42(d`%plpke^LAXMT|hqw0-{~X5DD+9;hTYLw5W3zsx|) O0>rG_zyD=ZJp=#>5gA|r delta 68 zcmbQ!AU~%;e#4eU+*S+>42(d`#30(de^LAXMT|hqw0-{~X5DD+Zm1+TLst9uzsx|) O0>rG_zyD=ZJp=#<2N_iW diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index 1139a9aa98e97db9a0659c546bf0fdd66ae60156..8ac5ae01aae1a64e05bf606c07f0606a9a1a9920 100644 GIT binary patch delta 6554 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 M{DQ3~zi`;{Un}6a-T(jq delta 5664 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 diff --git a/source/app/app_common.h b/source/app/app_common.h index 24ef1d0..439318e 100644 --- a/source/app/app_common.h +++ b/source/app/app_common.h @@ -8,7 +8,7 @@ #define D_CAR_HOSPITAL_NO 0x0001 -#define APP_VERSION_HEX 0x20 //高4位主版本,低4位次版本 +#define APP_VERSION_HEX 0x30 //高4位主版本,低4位次版本 // #define BOARD_MAIN03_A9 // #define BOARD_MAIN04_GM35 diff --git a/source/app/app_task_485.c b/source/app/app_task_485.c index 3a08d7e..30eeaa0 100644 --- a/source/app/app_task_485.c +++ b/source/app/app_task_485.c @@ -57,7 +57,7 @@ void L3_task_485_handle(TS_485 *s) { return; } - + if(G.md_slaver_info[s->slaverIndex].mask == 1) { G.md_slaver_info[s->slaverIndex].mask = 0; @@ -113,6 +113,7 @@ void L3_task_485_handle(TS_485 *s) break; } //TODO 这里可以根据modbus协议让代码通用 + L2_task_go(D_task_485_switch_next_slaver); } else if(s_nos_tick.t_5ms - s->sendStamp >= 8) //超时 { diff --git a/source/app/app_task_485_control.c b/source/app/app_task_485_control.c index 87ead66..4fce3a9 100644 --- a/source/app/app_task_485_control.c +++ b/source/app/app_task_485_control.c @@ -48,9 +48,13 @@ void L3_task_485_control_handle(TS_485_control *s) if(G.rfidHospitalNo == D_CAR_HOSPITAL_NO && s->rfid_pool != G.rfidval) { - G.md_slaver_info[3].mask = 1; G._key = (U16)rfid_key_map_out(G.rfidval); + if(G._key) + { + G.md_slaver_info[3].mask = 1; + } s->rfid_pool = G.rfidval; + L0_uart0_uc((U8)G._key & 0xFF); } #endif L2_task_go(D_task_485_control_01);