diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym
deleted file mode 100644
index b8b2adf..0000000
Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym and /dev/null differ
diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xab b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xab
deleted file mode 100644
index 757863e..0000000
Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xab and /dev/null differ
diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xad b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xad
deleted file mode 100644
index 6d965aa..0000000
Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xad and /dev/null differ
diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xc b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xc
deleted file mode 100644
index 8370ee8..0000000
Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xc and /dev/null differ
diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xf b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xf
deleted file mode 100644
index 9976250..0000000
Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xf and /dev/null differ
diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm
deleted file mode 100644
index 607aaa9..0000000
Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm and /dev/null differ
diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xr b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xr
deleted file mode 100644
index dc7312f..0000000
Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xr and /dev/null differ
diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xsb b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xsb
deleted file mode 100644
index e40fe8b..0000000
Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xsb and /dev/null differ
diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xsd b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xsd
deleted file mode 100644
index fcf63f2..0000000
Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xsd and /dev/null differ
diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siproj b/si4/soft_gsm_main.si4project/soft_gsm_main.siproj
deleted file mode 100644
index 23bc7ba..0000000
Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.siproj and /dev/null differ
diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork
deleted file mode 100644
index e66c771..0000000
Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork and /dev/null differ
diff --git a/si4/soft_gsm_main.si4project/soft_ps5ws.sip_sym b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_sym
new file mode 100644
index 0000000..e5e9674
Binary files /dev/null and b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_sym differ
diff --git a/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xab b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xab
new file mode 100644
index 0000000..99c583b
Binary files /dev/null and b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xab differ
diff --git a/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xad b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xad
new file mode 100644
index 0000000..c917373
Binary files /dev/null and b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xad differ
diff --git a/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xc b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xc
new file mode 100644
index 0000000..9903823
Binary files /dev/null and b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xc differ
diff --git a/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xf b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xf
new file mode 100644
index 0000000..1a4af58
Binary files /dev/null and b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xf differ
diff --git a/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xm b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xm
new file mode 100644
index 0000000..23f26ee
Binary files /dev/null and b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xm differ
diff --git a/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xr b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xr
new file mode 100644
index 0000000..0202d4f
Binary files /dev/null and b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xr differ
diff --git a/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xsb b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xsb
new file mode 100644
index 0000000..4399ec1
Binary files /dev/null and b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xsb differ
diff --git a/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xsd b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xsd
new file mode 100644
index 0000000..4e24ed2
Binary files /dev/null and b/si4/soft_gsm_main.si4project/soft_ps5ws.sip_xsd differ
diff --git a/si4/soft_gsm_main.si4project/soft_ps5ws.siproj b/si4/soft_gsm_main.si4project/soft_ps5ws.siproj
new file mode 100644
index 0000000..df46d3c
Binary files /dev/null and b/si4/soft_gsm_main.si4project/soft_ps5ws.siproj differ
diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siproj_settings.xml b/si4/soft_gsm_main.si4project/soft_ps5ws.siproj_settings.xml
similarity index 95%
rename from si4/soft_gsm_main.si4project/soft_gsm_main.siproj_settings.xml
rename to si4/soft_gsm_main.si4project/soft_ps5ws.siproj_settings.xml
index 17f9050..13b87cb 100644
--- a/si4/soft_gsm_main.si4project/soft_gsm_main.siproj_settings.xml
+++ b/si4/soft_gsm_main.si4project/soft_ps5ws.siproj_settings.xml
@@ -1,22 +1,22 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/si4/soft_gsm_main.si4project/soft_ps5ws.siwork b/si4/soft_gsm_main.si4project/soft_ps5ws.siwork
new file mode 100644
index 0000000..de50550
Binary files /dev/null and b/si4/soft_gsm_main.si4project/soft_ps5ws.siwork differ
diff --git a/source/app/app_common.c b/source/app/app_common.c
index 518b101..c25f91f 100644
--- a/source/app/app_common.c
+++ b/source/app/app_common.c
@@ -15,21 +15,21 @@ U32 code key_rfid_map[KEY_RFID_MAP_SIZE] =
/// key, rfid
//0x01,1, ///S1 ///key_map[0] key_map[1]
//0x02,11, ///S2 ///key_map[n] key_map[n+1]
- 0x02,0x02000020, ///呼叫 S2
- 0x12,0x02000001, ///分诊 S12
- 0x03,0x03010301, ///一线 S3 医生1
- 0x03,0x03010302, ///一线 S3 医生2
- 0x16,0x02000059, ///采血 S13
- 0x04,0x02000025, ///心电 S4
- 0x17,0x02000003, ///CT S14
- 0x08,0x03020301, ///二线 S5 医生1
- 0x08,0x03020302, ///二线 S5 医生2
- 0x18,0x01000008, ///谈话 S15
- 0x09,0x01000009, ///签字 S6
- 0x1D,0x02000060, ///团注 S16
- 0x0A,0x02000005, ///介入 S7
- 0x1F,0x0100000C, ///置鞘（穿刺） S17
- 0x0B,0x02000023, ///病房 S8
+ 0x03,0x02000020, ///呼叫 S2
+ 0x04,0x02000001, ///分诊 S12
+ 0x08,0x03010301, ///一线 S3 医生1
+ 0x08,0x03010302, ///一线 S3 医生2
+ 0x09,0x02000059, ///采血 S13
+ 0x0A,0x02000025, ///心电 S4
+ 0x0B,0x02000003, ///CT S14
+ 0x0F,0x03020301, ///二线 S5 医生1
+ 0x0F,0x03020302, ///二线 S5 医生2
+ 0x10,0x01000008, ///谈话 S15
+ 0x11,0x01000009, ///签字 S6
+ 0x12,0x02000060, ///团注 S16
+ 0x16,0x02000005, ///介入 S7
+ 0x17,0x0100000C, ///置鞘（穿刺） S17
+ 0x18,0x02000023, ///病房 S8
//0x1d,9, ///S16
//0x1f,10, ///S17
//0x1e,0 /// 清零按键，无需亮灯
diff --git a/source/app/app_common.h b/source/app/app_common.h
index 439318e..5715e0c 100644
--- a/source/app/app_common.h
+++ b/source/app/app_common.h
@@ -6,7 +6,7 @@
#include "../tpc/tpc_modbus.h"
#include "../tpc/tpc_ccmodbus.h"
-#define D_CAR_HOSPITAL_NO 0x0001
+#define D_CAR_HOSPITAL_NO 0x0000
#define APP_VERSION_HEX 0x30 //高4位主版本，低4位次版本
diff --git a/source/app/app_drv.c b/source/app/app_drv.c
index 42bed40..b9c3649 100644
--- a/source/app/app_drv.c
+++ b/source/app/app_drv.c
@@ -106,7 +106,8 @@ void L3_UARTcom0_exp_protocol(TS_Handle_PH3 *p)
void L3_UARTcom4_exp_protocol(TS_Handle_PH3 *p)
{
if (1 == p->ok ) //收到消息
- {
+ {
+ L0_uart0_uc('1');
if(p->ts_ccmodbus.slaver == G.p.wisdom_car_no )
{//平车作为slaver，服务器作为master发送的ccmodbus消息
U16 reg = (U16)p->ts_ccmodbus.buf[0] << 8 | p->ts_ccmodbus.buf[1];
@@ -133,7 +134,12 @@ void L3_UARTcom4_exp_protocol(TS_Handle_PH3 *p)
{//0x90
G.authed = 1;
}
- else
+ else if(p->ts_ccmodbus.oper == 0x91)
+ {//0x90
+ G.flowStarted = 1;
+ }
+ #if 1
+ else//与服务器不匹配，暂时废弃
{//0x03,0x06,0x10
U16 reg = (U16)p->ts_ccmodbus.buf[0] << 8 | p->ts_ccmodbus.buf[1];
if(reg == 0x0003)
@@ -141,6 +147,7 @@ void L3_UARTcom4_exp_protocol(TS_Handle_PH3 *p)
G.flowStarted = 1;
}
}
+ #endif
}
p->ok = 0;
}
diff --git a/source/app/main.c b/source/app/main.c
index a6a0f75..0f8e588 100644
--- a/source/app/main.c
+++ b/source/app/main.c
@@ -119,8 +119,9 @@ void main(void)
G.pi_weight = G.total_weight;
L0_uart0_uc('#');
}
+ //P55 ^=1;
}
-
+#if 1
//看门狗
L3_task_wdt_handle(&s_task_wdt);
@@ -142,6 +143,7 @@ void main(void)
//服务端(4G)协议处理
L3_UARTcom4_exp_protocol(&s_uart4_tcp_rec);
+#endif
}
}//end main
diff --git a/source/tpc/tpc_ccmodbus.c b/source/tpc/tpc_ccmodbus.c
index 4b40fc1..44b590f 100644
--- a/source/tpc/tpc_ccmodbus.c
+++ b/source/tpc/tpc_ccmodbus.c
@@ -168,6 +168,7 @@ void L1_s2b_PH3(TS_Handle_PH3 *p)// reentrant
crc16(p->crc,p->sp + p->crcOffset,p->num - 1 - p->crcOffset); //p->num + 1 - 2 - p->crcOffset
if(p->crc[0] == p->sp[p->num-1] && p->crc[1] == p->sp[p->num])
{
+ //P55 ^= 1;
if (p->ok != 1)
{
byte_copy_uc((U8*)&p->ts_ccmodbus,(U8*)p->sp,p->num + 1);