网络自适应

middleware/easyflash/port/ef_port.c

@@ -30,6 +30,7 @@
 #include <stdarg.h>
 #include <sfud.h>
 #include <rtthread.h>
+#include "user_config.h"
 
 
 
@@ -43,17 +44,23 @@ static const ef_env default_env_set[] = {
 		{"boot_times",					"0"},
 		{"jump_boot_time",				"10"}, // BOOT 等待时间 10s
 		// 基础参数设置
-        {"device_id",					"7322070012"},
+        {"device_id",					"0000000003"},
 		{"app_id",						"220000"}, // 业务ID
 		{"user_pass",					"123456"},
 		{"sys_pass",					"898909"},
 		{"mqtt_user",					"admin"},
 		{"mqtt_pass",					"admin"},
-		{"mqtt_addr",					"mqtt.zyjzjs.cn"},
+#ifdef USER_MINLE_CHAN2  
+		{"mqtt_addr",					"minle.zyjzjs.cn"},
+		{"mqtt_port",					"8102"},
+#else
+
+ 		{"mqtt_addr",					"mqtt.zyjzjs.cn"},
 		{"mqtt_port",					"1883"},
-		{"mqtt_topic",					"syksk"}, //订阅topic
+#endif 		
+		{"mqtt_topic",					"sluice"}, //订阅topic
         
-		{"net_drv",						"dtu"}, // mqtt dtu ec200    eth
+		{"net_drv",						"ec200"}, // mqtt dtu ec200    eth
 		{"eth2_chann",					"0"}, //以太网通道2  支持modbus
 		
 		// 传感器基础参数配置
@@ -85,7 +92,7 @@ static const ef_env default_env_set[] = {
 		{"max_open",					"1600"}, //  最大开度
 		{"max_ecode",					"25712"},   //  编码器最大编码
 		{"min_ecode",					"31770"},   //  编码器最小编码
-		{"exec_time",					"50"},   //  异常检测时间 单位100ms    50 就是 5s
+		{"exec_time",					"50"},   //  开度异常监测 异常检测时间 单位100ms    50 就是 5s
 		
 		// 闸门参数设置
 		{"ctrl_mode",					"0"}, //  控制模式   // 1 直接开度控制，0 反馈开度控制
@@ -93,20 +100,25 @@ static const ef_env default_env_set[] = {
 		{"simu_flow",					"0"}, //  0 未启动 1 水位流量关系表 2巴歇尔槽启动流量关系表
 		{"parshall",					"7"}, //  巴歇尔槽规格
 		// 流量数据存储
-		{"ttflow",						"0"}, //  累计流量
+		{"ttflow",						"[0,0,0,0,0,0]"}, //  累计流量
 		{"chancnt",						"1"}, //  流量计通道数
 		{"site_type",					"sluice"}, //  0,闸门站，1，流量站，2，渗流渗压站，3，自动化采集站，4，串口服务器
 		{"level","[0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1.0]"},
 		{"flow", "[0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1.0]"},
-		{"wsid","[1,2,3,4,5,6]"},
-		{"sl427ip","116.176.77.72"},
-		{"sl427port","6200"},
-		{"sl427code","0000000002"},
+		{"wsid","[128,2,3,4,5,6]"},
 		
+		//EF_ENV_VER_NUM      4
+		{"curr1","0.6"}, // 保护电流1    开度 > openk 时的保护电流    //  V4
+		{"curr2","3"}, // 保护电流2    开度 < openk 时的保护电流      //  V4
+		{"openk","50"},    // 开度限制，开度 < 50mm 不限制荷重   V5
+		{"curr_count","3"},  // 电流三次报警，就停止，除非重启设备   V5
+		{"sl427open","0"},   // 是否打开427 配置 V5
+		{"sl427ip","116.176.77.72"},       //  V4
+		{"sl427port","6200"},              //  V4
+		{"sl427code","0000000002"},        //  V4
+		//EF_ENV_VER_NUM      5
+		{"loadp","2600"},  // 荷重系数，电流*k = load 单位kg     V5
 		// 水位流量关系表  配置10 个点
-		
-		
-		
 
 };