Huyi 1 年之前
父节点
当前提交
d7aaa84600
共有 4 个文件被更改,包括 10 次插入2 次删除
  1. 2 0
      Drivers/Business/PumpBusiness.c
  2. 2 2
      Drivers/CONFIG.h
  3. 5 0
      Drivers/Utils/Pump_Dicts_Util.c
  4. 1 0
      Drivers/Utils/Pump_Dicts_Util.h

+ 2 - 0
Drivers/Business/PumpBusiness.c

@@ -26,6 +26,7 @@ struct PUMPDICTS_ParamsStruct pump_params; 	// 
 static uint16_t Data_Number = 0; 			// 数据编号
 static uint16_t Data_success_Number = 0;	// 成功包
 static uint16_t Data_fail_Number = 0; 		// 失败包
+static uint16_t version_Number = 5001; // 版本号-网络泵
 
 int RSRP1=0;
 int RSRQ2=0; 
@@ -93,6 +94,7 @@ void PUMPBUSINESS_ParamsRefresh(void)
 	pump_params.forcast_WillFinished =1;
 	pump_params.forcast_InsufficientAnalgesia = 0;
 	pump_params.forcast_LowPowerForecast = 0;
+	pump_params.version = version_Number;
 }
 
 

+ 2 - 2
Drivers/CONFIG.h

@@ -12,9 +12,9 @@
 
 
 
-#define EC800M 1 //4G开关,不能数字开头
+//#define EC800M 1 //4G开关,不能数字开头
 //#define BC260Y 1  // NB
-//#define ESP32 1		//WiFi
+#define ESP32 1		//WiFi
 //#define AIWB2	1	//WIFI_AIWB2-32S
 
 

+ 5 - 0
Drivers/Utils/Pump_Dicts_Util.c

@@ -321,6 +321,11 @@ void PUMPDICTS_ProtocolEncode(struct PUMPDICTS_ParamsStruct * pump_params, uint8
 	pump_data[length++] = (uint8_t)( ( pump_params->bedNo & 0xff00 ) >> 8 );
 	pump_data[length++] = (uint8_t)( pump_params->bedNo & 0x00ff );
 	
+	//°æ±¾ºÅ
+	setPumpOption(136,2,pump_data,&length);
+	pump_data[length++] = (uint8_t)( ( pump_params->version & 0xff00 ) >> 8 );
+	pump_data[length++] = (uint8_t)( pump_params->version & 0x00ff );
+	
 	*pump_data_length = length;
 }
 

+ 1 - 0
Drivers/Utils/Pump_Dicts_Util.h

@@ -47,6 +47,7 @@ struct PUMPDICTS_ParamsStruct{
 	uint8_t pulseDose; // 编号123,脉冲量。
 	uint16_t ward; // 编号124,病区。
 	uint16_t bedNo; // 编号125,床号。
+	uint16_t version; // 编号136,版本号。
 };