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 e775c54..fe6327b 100644 Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym and b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym differ diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index 1139a9a..8ac5ae0 100644 Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork and b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork differ 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);