修改 : 网口的个数和对应的定值；

README.md

@@ -40,3 +40,6 @@
 
 # 20251120
 01. 修改: 修改系统时钟获取API。
+
+# 202512(08-14)
+01. 修改 : 网口的个数和对应的定值；

app_public/fuxi_public/fuxi_bsp/include/bspconfig.h

@@ -150,14 +150,8 @@
 //CS1,外部AD1
 //--------------------------------  网络  --------------------------------
 //
-#define CFG_ETH_MAX_PHY 		   4
-#if defined NET3_IP5
-  #define CFG_ETH_MAX_LOGIC			5 //逻辑网卡最大数量
-#elif defined NET4_IP5
-  #define CFG_ETH_MAX_LOGIC			5 //逻辑网卡最大数量
-#else
-  #define CFG_ETH_MAX_LOGIC			3 //逻辑网卡最大数量
-#endif
+#define CFG_ETH_MAX_PHY 		    3 // 实体网口phy数量
+#define CFG_ETH_MAX_LOGIC           4 // 逻辑网卡最大数量
 
 //--------------------------------  ADC  --------------------------------
 //

app_public/fuxi_public/fuxi_bsp/source/factor.c

@@ -35,7 +35,7 @@
 
 // 使用次级电阻标识
 #define SCALE_CT_100A_51	(2.526*32768/5.0*1.4142)	// 次级电阻51欧,,加5A相电流二次用万用表测有效值为0.127V
-#define SCALE_CT_10A_51	(0.254*32768/2.5*1.4142)	// 次级电阻51欧,加10A相电流二次用万用表测有效值为0.254V
+#define SCALE_CT_10A_51	    (0.254*32768/2.5*1.4142)	// 次级电阻51欧,加10A相电流二次用万用表测有效值为0.254V
 #define SCALE_CT_10A_120	(1.27*32768/2.5*1.4142)	// 次级电阻249欧,加10A相电流二次用万用表测有效值为0.643V  // 零序穿心5倍 最大量程20A
 #define SCALE_CT_10A_249	(1.265*32768/5.0*1.4142)	//  1ACT 量程20A
 #define SCALE_CT_10A_604	(3.235*32768/5.0*1.4142)	// 次级电阻604欧,加10A相电流二次用万用表测有效值为3.235V

dtu/dtu_main_t536/app/Appconfig.c

@@ -878,7 +878,7 @@ const SOE_DEF tAllSOE[]=
 	{0x45,		{0,	0,	0},			"goose系统通信异常"},
 	
 	{0x05,		{0,	0,	0},			"61850平台库异常"},
-#ifdef GD_AREA_ZHUHAI_V2
+#ifdef GOOSE_NETTYPE_SET
 	{0x45,		{0, 0,	0}, 		"单网通讯异常NET1"},
 	{0x45,		{0,	0,	0},			"单网通讯异常NET2"},
 	{0x45,		{0,	0,	0},			"N侧通讯异常"},

dtu/dtu_main_t536/app/Appconfig.h

@@ -556,7 +556,7 @@ enum
 	EV_GOOSE_DECODE,			// goose 解码错误
 	EV_SYS_GOOSE_ERR,			// 系统通信异常	
 	EV_61850_ERR,			//  61850平台库异常
-#ifdef GD_AREA_ZHUHAI_V2
+#ifdef GOOSE_NETTYPE_SET
 	EV_NET1_DOWN,			//单网通讯异常NET1
 	EV_NET2_DOWN,			//单网通讯异常NET2
 	EV_GOOSE_ERR_N,			//N侧通讯异常

dtu/dtu_main_t536/app/MmiData.c

@@ -7236,18 +7236,7 @@ int mmd_GetDebugInf(int value)
 	version_jdxx = FUN_JDXX_VERSION;
 	#endif
 	acteth = env_get_info(ENV_ETHACT);
-	#ifdef NET3_IP5
-	debug_port = 4;
-	#else
-	if(acteth != NULL && strcmp(acteth,"DM9000") == 0)
-	{
-		debug_port = 2;
-	}
-	else
-	{
-		debug_port = 0;
-	}
-	#endif
+    debug_port = 0;
 	#if LCD_SIZE==128
 	sprintf(strGprsInf[num++],"调试串口:%d",g_con_uart_index);
 	sprintf(strGprsInf[num++],"波特率:115200");
@@ -7263,6 +7252,7 @@ int mmd_GetDebugInf(int value)
 	sprintf(strGprsInf[num++],"调试串口:%d",g_con_uart_index);
 	sprintf(strGprsInf[num++],"波特率:115200 无校验");
 	sprintf(strGprsInf[num++],"调试网口:%d",debug_port+1);
+    printf("[%s:%d] debug_port = %d\r\n", __func__, __LINE__, debug_port);
 	sprintf(strGprsInf[num++],"IP=%s",env_get_info(ENV_IPADDR));
 	sprintf(strGprsInf[num++],"MASK=%s",env_get_info(ENV_NETMASK));
 	sprintf(strGprsInf[num++],"GATE=%s",env_get_info(ENV_GATEWAYIP));	

dtu/dtu_main_t536/app/Sys.c

@@ -120,10 +120,7 @@ const char *ykownerstr[]=
     "1#网络",
     "2#网络",
     "3#网络",
-#if defined NET3_IP5 || defined NET4_IP5
     "4#网络",
-    "5#网络",
-#endif
     "本地维护",
 };
 

dtu/dtu_main_t536/app/defineSys.h

@@ -13,8 +13,6 @@
 #define _DEFINE_SYS_H
 
 #ifdef ___defineSys____//！！！此宏定义不开启，以下宏不直接开启，只用于注释显示
-//内核类型定义
-#define __GOOSE_USING_DOUBLE_ETH__			//网络3驱动
 
 //需要的时候打开宏重新编译
 #define DISP_SET_CH_T3       // 维护工具&&液晶显示重合闸三次
@@ -52,7 +50,6 @@
 #define JZS_FUNCTION                   // 集中式功能
 #define XDL_ZT                         // 小电流接地
 #define FAULT_3_INFO_ADDR              // 故障信息地址3个字节 故障参数电科院模式
-#define NET3_IP5                       // 3Mac5IP
 #define YK_FA_ENBLE                    // 主站需要具备遥控闭锁以及解锁开关自动合闸的功能，由主站发起的闭锁需要由主站解锁，即其他情况的解锁都不能消除此遥控闭锁。
 #define TQ_SOFT_YB                     // 同期软压板
 #define IEC_ERR_LED                    // 规约通信异常灯(主站101&104 级联101)
@@ -265,10 +262,7 @@
 
 // #define IEC_NOLINK_NO_CALLYX
 
-#ifdef __GOOSE_USING_DOUBLE_ETH__ 
-   #define GOOSE_NETTYPE_SET   //goose网络类型设置
-   #define NET3_IP5            //3Mac5IP
-#endif
+// #define GOOSE_NETTYPE_SET   //goose网络类型设置
 
 //区分地区&客户个性化需求定义
  #ifdef GD_AREA_ZHONGSHAN	//中山局要求
@@ -390,7 +384,6 @@
 	#define YB_STHD_CHECK
 	#define JX_YB_SEND_SOE
 	//#undef JX_YB_SEND_SOE			//珠海局要求不发送所有SOE
-	//#define __GOOSE_USING_DOUBLE_ETH__
 
 #elif defined GD_AREA_HEYUAN_KL     //科陆河源
     #define VER_NUM 				16101			// 版本号16.101
@@ -994,7 +987,6 @@
 	#endif
     #define GD_AREA_GOOSE_DKY	//广东电科院测试互操作测试，goose信息发送时刻在故障判段时间后，每个厂家的理解不同，做成兼容设计
     #define YK_FA_S_L_ENBLE 	//分段联络遥控
-    #define NET3_IP5			//3Mac5IP
     #define DISP_SET_67KEY      //6键/7键压板切换
     #define LINK_ERR_LED		//级联灯异常
     #define TZ_STATE_LED		 //跳闸状态灯
@@ -1098,11 +1090,6 @@
 	#error : FUNC_DRIVE and FUNC_DRIVE_JY cannot be set concurrently,please check.
 #endif
 
-//T536 支持4网口 5个IP
-#if defined(CPU_FUXI) && defined(NET4_IP5)
-	#undef NET3_IP5
-#endif
-
 //伏羲暂不支持can、伏羲加密S1芯片
 #ifdef  CPU_FUXI 
 	// #define BSP_CAN_ENABLE		// can bsp

dtu/dtu_main_t536/app/equ.c

@@ -266,10 +266,10 @@ int equ_init_file_config(void)
 	|| (ec->rsc_length != rsc_contrast.length)
 	|| (ec->rsc_crc != rsc_contrast.crc))
 	{
-		rt_printf("equ_version = 0x%8x, rsc_version = 0x%8x\r\n",ec->rsc_version, rsc_contrast.version);
-		rt_printf("equ_signature = 0x%8x, rsc_signature = 0x%8x\r\n",ec->rsc_signature, rsc_contrast.signature);
-		rt_printf("equ_length = 0x%8x, rsc_length = 0x%8x\r\n",ec->rsc_length, rsc_contrast.length);
-		rt_printf("equ_crc = 0x%8x, rsc_crc = 0x%8x\r\n",ec->rsc_crc, rsc_contrast.crc);
+		rt_printf("equ_version = 0x%x, rsc_version = 0x%x\r\n",ec->rsc_version, rsc_contrast.version);
+		rt_printf("equ_signature = 0x%x, rsc_signature = 0x%x\r\n",ec->rsc_signature, rsc_contrast.signature);
+		rt_printf("equ_length = 0x%x, rsc_length = 0x%x\r\n",ec->rsc_length, rsc_contrast.length);
+		rt_printf("equ_crc = 0x%x, rsc_crc = 0x%x\r\n",ec->rsc_crc, rsc_contrast.crc);
 		
 		rt_free(buf);
 		return -6;

dtu/dtu_main_t536/app/main.c

@@ -186,8 +186,6 @@ int app_main (void *unused)
 	}
 #endif
 
-	rt_printf("SW_SET_NUMBER = %d, PARA_NUM = %d\r\n", SW_SET_NUMBER, PARA_NUM);
-
 	us0_sec = bsp_ustimer_get_origin();
 	while(1)
 	{

dtu/dtu_main_t536/app/net_104.c

@@ -220,7 +220,8 @@ void Net_Init(void)
 		}
 		else  //有的话使用虚拟的
 		{
-		 #if defined(NET3_IP5) || defined(NET4_IP5)
+		 #if (1)
+             printf("[%s:%d]\r\n", __func__, __LINE__);
 			 net_if_set2((int)tRunPara.tNetPara[i].ethid, ret+1, 0, ip, mask);
 		 #else
 			 net_if_set2((int)tRunPara.tNetPara[i].ethid, i+1, 0, ip, mask);	
@@ -1381,7 +1382,8 @@ void Net_Init(void)
 		mask[2] = (BYTE)((tRunPara.tNetPara[i].wMask>>8)&0xff);
 		mask[3] = (BYTE)((tRunPara.tNetPara[i].wMask>>0)&0xff);
 
-#if defined(NET3_IP5) || defined(NET4_IP5) 
+#if (1)
+        printf("[%s:%d]\r\n", __func__, __LINE__);
         if(tRunPara.tNetPara[i].old_ethid !=  tRunPara.tNetPara[i].ethid)   //网络号已改变且为物理网卡时
         {
             BYTE count;
@@ -1445,7 +1447,8 @@ void Net_Init(void)
 		}
 		else  //有的话使用虚拟的
 		{
-			 #if defined(NET3_IP5) || defined(NET4_IP5) 
+			 #if (1)
+             printf("[%s:%d]\r\n", __func__, __LINE__);
 			 net_if_set2((int)tRunPara.tNetPara[i].ethid, ret, 0, ip, mask);	
 			 tRunPara.tNetPara[i].index = ret;
 			 #else

dtu/dtu_main_t536/app/set.c

@@ -611,12 +611,7 @@ const  SET_LIST Net_Eth_List[]=  //
 {
 	{"网口1",0,},
 	{"网口2",1,},
-#if defined	__GOOSE_USING_DOUBLE_ETH__ || defined NET3_IP5
 	{"网口3",2,},
-#elif defined NET4_IP5
-	{"网口3",2,},
-	{"网口4",3,},
-#endif
 };
 #define Net_Eth_ListNum  sizeof(Net_Eth_List)/sizeof(SET_LIST) 
 
@@ -2716,78 +2711,30 @@ const  TSETTABLE tEquipParaTable[]=     			// min 	max 			default
 #endif
 
 	{SETTYPE_LABEL,	SET_NULL,	"以太网通道", 		0 , 	0,					0 ,		0,				0,				GROUP_PARA_ETHERNET,0x0000, NULL_R},
-#if defined	__GOOSE_USING_DOUBLE_ETH__ || defined NET3_IP5 || defined NET4_IP5
-	#if defined(NET3_IP5) || defined(NET4_IP5)
-		{SETTYPE_LIST,	SET_NULL,	"1#_网络", 			0 , 	Net_Eth_ListNum-1,	0 ,		Net_Eth_List,	Net_Eth_ListNum,GROUP_PARA_ETHERNET,0x0000, UINT_R},
-		{SETTYPE_IP,	SET_NULL,	"1#IP地址", 		0 , 	0xffffffff,			0 ,	(void *)0xc0a801f0,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // IP 192.168.1.100
-		{SETTYPE_IP,	SET_NULL,	"1#子网掩码", 		0 , 	0xffffffff,			0 ,	(void *)0xffffff00,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 255.255.255.0
-		{SETTYPE_IP,	SET_NULL,	"1#目标网络", 		0 , 	0xffffffff,			0 ,	(void *)0x00000000,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.64.240	
-		{SETTYPE_IP,	SET_NULL,	"1#目标掩码", 		0 , 	0xffffffff,			0 ,	(void *)0x00000000,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0	
-		{SETTYPE_IP,	SET_NULL,	"1#网关", 			0 , 	0xffffffff,			0 ,	(void *)0x00000000,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.64.240	
-		{SETTYPE_LIST,	SET_NULL,	"2#_网络", 			0 , 	Net_Eth_ListNum-1,	1 ,		Net_Eth_List,	Net_Eth_ListNum,GROUP_PARA_ETHERNET,0x0000, UINT_R},
-		{SETTYPE_IP,	SET_NULL,	"2#IP地址", 		0 , 	0xffffffff,			0 ,	(void *)0xc0a80264,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R},// IP 192.168.2.100
-		{SETTYPE_IP,	SET_NULL,	"2#子网掩码", 		0 , 	0xffffffff,			0 ,	(void *)0xffffff00,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R},// 255.255.255.0
-		{SETTYPE_IP,	SET_NULL,	"2#目标网络", 		0 , 	0xffffffff,			0 ,	(void *)0x00000000,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // IP 192.168.2.100	
-		{SETTYPE_IP,	SET_NULL,	"2#目标掩码", 		0 , 	0xffffffff,			0 ,	(void *)0x00000000,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0	
-		{SETTYPE_IP,	SET_NULL,	"2#网关", 			0 , 	0xffffffff,			0 ,	(void *)0x00000000,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.2.100	
-	    {SETTYPE_LIST,  SET_NULL,   "3#_网络",      0 , Net_Eth_ListNum-1,     2 ,     Net_Eth_List,   Net_Eth_ListNum,GROUP_PARA_ETHERNET,0x0000, UINT_R},
-	    {SETTYPE_IP,    SET_NULL,   "3#IP地址",     0 ,     0xffffffff,         0 , (void *)0xc0a80364, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// IP 192.168.3.100
-	    {SETTYPE_IP,    SET_NULL,   "3#子网掩码",       0 ,     0xffffffff,         0 , (void *)0xffffff00, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// 255.255.255.0
-	    {SETTYPE_IP,    SET_NULL,   "3#目标网络",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // IP 192.168.3.100
-	    {SETTYPE_IP,    SET_NULL,   "3#目标掩码",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0
-	    {SETTYPE_IP,    SET_NULL,   "3#网关",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.3.100
-	    {SETTYPE_LIST,  SET_NULL,   "4#_网络",      0 ,     Net_Eth_ListNum-1,  3 ,     Net_Eth_List,   Net_Eth_ListNum,GROUP_PARA_ETHERNET,0x0000, UINT_R},
-	    {SETTYPE_IP,    SET_NULL,   "4#IP地址",     0 ,     0xffffffff,         0 , (void *)0xc0a80464, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// IP 192.168.4.100
-	    {SETTYPE_IP,    SET_NULL,   "4#子网掩码",       0 ,     0xffffffff,         0 , (void *)0xffffff00, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// 255.255.255.0
-	    {SETTYPE_IP,    SET_NULL,   "4#目标网络",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.3.100
-	    {SETTYPE_IP,    SET_NULL,   "4#目标掩码",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0
-	    {SETTYPE_IP,    SET_NULL,   "4#网关",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.3.254
-	    {SETTYPE_LIST,  SET_NULL,   "5#_网络",     0 ,     Net_Eth_ListNum-1,  1 ,     Net_Eth_List,   Net_Eth_ListNum,GROUP_PARA_ETHERNET,0x0000, UINT_R},
-	    {SETTYPE_IP,    SET_NULL,   "5#IP地址",     0 ,     0xffffffff,         0 , (void *)0xc0a840f0, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// IP 192.168.5.100
-	    {SETTYPE_IP,    SET_NULL,   "5#子网掩码",       0 ,     0xffffffff,         0 , (void *)0xffffff00, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// 255.255.255.0
-	    {SETTYPE_IP,    SET_NULL,   "5#目标网络",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.3.100
-	    {SETTYPE_IP,    SET_NULL,   "5#目标掩码",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0
-	    {SETTYPE_IP,    SET_NULL,   "5#网关",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.3.254
-	#else
-	    {SETTYPE_LIST,  SET_NULL,   "1#_网络",          0 ,     Net_Eth_ListNum-1,  0 ,     Net_Eth_List,   Net_Eth_ListNum,GROUP_PARA_ETHERNET,0x0000, UINT_R},
-	    {SETTYPE_IP,    SET_NULL,   "1#IP地址",     0 ,     0xffffffff,         0 , (void *)0xc0a80164, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // IP 192.168.1.100
-	    {SETTYPE_IP,    SET_NULL,   "1#子网掩码",       0 ,     0xffffffff,         0 , (void *)0xffffff00, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 255.255.255.0
-	    {SETTYPE_IP,    SET_NULL,   "1#目标网络",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.64.240
-	    {SETTYPE_IP,    SET_NULL,   "1#目标掩码",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0
-	    {SETTYPE_IP,    SET_NULL,   "1#网关",           0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.64.240
-	    {SETTYPE_LIST,  SET_NULL,   "2#_网络",          0 ,     Net_Eth_ListNum-1,  1 ,     Net_Eth_List,   Net_Eth_ListNum,GROUP_PARA_ETHERNET,0x0000, UINT_R},
-	    {SETTYPE_IP,    SET_NULL,   "2#IP地址",     0 ,     0xffffffff,         0 , (void *)0xc0a80264, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// IP 192.168.2.100
-	    {SETTYPE_IP,    SET_NULL,   "2#子网掩码",       0 ,     0xffffffff,         0 , (void *)0xffffff00, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// 255.255.255.0
-	    {SETTYPE_IP,    SET_NULL,   "2#目标网络",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // IP 192.168.2.100
-	    {SETTYPE_IP,    SET_NULL,   "2#目标掩码",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0
-	    {SETTYPE_IP,    SET_NULL,   "2#网关",           0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.2.100
-	    {SETTYPE_LIST,  SET_NULL,   "3#_网络",      0 , Net_Eth_ListNum-1,  2 ,     Net_Eth_List,   Net_Eth_ListNum,GROUP_PARA_ETHERNET,0x0000, UINT_R},
-	    {SETTYPE_IP,    SET_NULL,   "3#IP地址",     0 ,     0xffffffff,         0 , (void *)0xc0a80364, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// IP 192.168.3.100
-	    {SETTYPE_IP,    SET_NULL,   "3#子网掩码",       0 ,     0xffffffff,         0 , (void *)0xffffff00, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// 255.255.255.0
-	    {SETTYPE_IP,    SET_NULL,   "3#目标网络",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // IP 192.168.3.100
-	    {SETTYPE_IP,    SET_NULL,   "3#目标掩码",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0
-	    {SETTYPE_IP,    SET_NULL,   "3#网关",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.3.100
-	#endif
-#else
-	{SETTYPE_LIST,	SET_NULL,	"1#_网络",			0 , 	Net_Eth_ListNum-1,	0 , 	Net_Eth_List,	Net_Eth_ListNum,GROUP_PARA_ETHERNET,0x0000, UINT_R},
-	{SETTYPE_IP,	SET_NULL,	"1#IP地址",		0 , 	0xffffffff, 		0 , (void *)0xc0a801F0, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // IP 192.168.1.240
-	{SETTYPE_IP,	SET_NULL,	"1#子网掩码",		0 , 	0xffffffff, 		0 , (void *)0xffffff00, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 255.255.255.0
-	{SETTYPE_IP,	SET_NULL,	"1#目标网络",		0 , 	0xffffffff, 		0 , (void *)0x00000000, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.64.240	
-	{SETTYPE_IP,	SET_NULL,	"1#目标掩码",		0 , 	0xffffffff, 		0 , (void *)0x00000000, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0 
-	{SETTYPE_IP,	SET_NULL,	"1#网关", 			0 , 	0xffffffff, 		0 , (void *)0x00000000, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.64.240	
-	{SETTYPE_LIST,	SET_NULL,	"2#_网络",			0 , 	Net_Eth_ListNum-1,	1 , 	Net_Eth_List,	Net_Eth_ListNum,GROUP_PARA_ETHERNET,0x0000, UINT_R},
-	{SETTYPE_IP,	SET_NULL,	"2#IP地址",		0 , 	0xffffffff, 		0 , (void *)0xc0a80264, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R},// IP 192.168.2.100
-	{SETTYPE_IP,	SET_NULL,	"2#子网掩码",		0 , 	0xffffffff, 		0 , (void *)0xffffff00, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R},// 255.255.255.0
-	{SETTYPE_IP,	SET_NULL,	"2#目标网络",		0 , 	0xffffffff, 		0 , (void *)0x00000000, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // IP 192.168.2.100	
-	{SETTYPE_IP,	SET_NULL,	"2#目标掩码",		0 , 	0xffffffff, 		0 , (void *)0x00000000, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0 
-	{SETTYPE_IP,	SET_NULL,	"2#网关", 			0 , 	0xffffffff, 		0 , (void *)0x00000000, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.2.100	
-	{SETTYPE_LIST,	SET_NULL,	"3#_网络",		0 , 	Net_Eth_ListNum-1,	0 , 	Net_Eth_List,	Net_Eth_ListNum,GROUP_PARA_ETHERNET,0x0000, UINT_R},
-	{SETTYPE_IP,	SET_NULL,	"3#IP地址",		0 , 	0xffffffff, 		0 , (void *)0xc0a840f0, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R},// IP 192.168.64.240
-	{SETTYPE_IP,	SET_NULL,	"3#子网掩码",		0 , 	0xffffffff, 		0 , (void *)0xffffff00, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R},// 255.255.255.0
-	{SETTYPE_IP,	SET_NULL,	"3#目标网络",		0 , 	0xffffffff, 		0 , (void *)0x00000000, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.3.100	
-	{SETTYPE_IP,	SET_NULL,	"3#目标掩码",		0 , 	0xffffffff, 		0 , (void *)0x00000000, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0 
-	{SETTYPE_IP,	SET_NULL,	"3#网关", 		0 , 	0xffffffff, 		0 , (void *)0x00000000, 0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.3.254	
-#endif
+    {SETTYPE_LIST,	SET_NULL,	"1#_网络", 			0 , 	Net_Eth_ListNum-1,	0 ,		Net_Eth_List,	Net_Eth_ListNum,GROUP_PARA_ETHERNET,0x0000, UINT_R},
+    {SETTYPE_IP,	SET_NULL,	"1#IP地址", 		0 , 	0xffffffff,			0 ,	(void *)0xc0a80164,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // IP 192.168.1.100
+    {SETTYPE_IP,	SET_NULL,	"1#子网掩码", 		0 , 	0xffffffff,			0 ,	(void *)0xffffff00,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 255.255.255.0
+    {SETTYPE_IP,	SET_NULL,	"1#目标网络", 		0 , 	0xffffffff,			0 ,	(void *)0x00000000,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.64.240	
+    {SETTYPE_IP,	SET_NULL,	"1#目标掩码", 		0 , 	0xffffffff,			0 ,	(void *)0x00000000,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0	
+    {SETTYPE_IP,	SET_NULL,	"1#网关", 			0 , 	0xffffffff,			0 ,	(void *)0x00000000,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.64.240	
+    {SETTYPE_LIST,	SET_NULL,	"2#_网络", 			0 , 	Net_Eth_ListNum-1,	1 ,		Net_Eth_List,	Net_Eth_ListNum,GROUP_PARA_ETHERNET,0x0000, UINT_R},
+    {SETTYPE_IP,	SET_NULL,	"2#IP地址", 		0 , 	0xffffffff,			0 ,	(void *)0xc0a80264,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R},// IP 192.168.2.100
+    {SETTYPE_IP,	SET_NULL,	"2#子网掩码", 		0 , 	0xffffffff,			0 ,	(void *)0xffffff00,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R},// 255.255.255.0
+    {SETTYPE_IP,	SET_NULL,	"2#目标网络", 		0 , 	0xffffffff,			0 ,	(void *)0x00000000,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // IP 192.168.2.100	
+    {SETTYPE_IP,	SET_NULL,	"2#目标掩码", 		0 , 	0xffffffff,			0 ,	(void *)0x00000000,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0	
+    {SETTYPE_IP,	SET_NULL,	"2#网关", 			0 , 	0xffffffff,			0 ,	(void *)0x00000000,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.2.100	
+    {SETTYPE_LIST,  SET_NULL,   "3#_网络",          0 ,     Net_Eth_ListNum-1,  2 , Net_Eth_List,   Net_Eth_ListNum,   GROUP_PARA_ETHERNET,0x0000, UINT_R},
+    {SETTYPE_IP,    SET_NULL,   "3#IP地址",         0 ,     0xffffffff,         0 , (void *)0xc0a80364, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// IP 192.168.3.100
+    {SETTYPE_IP,    SET_NULL,   "3#子网掩码",       0 ,     0xffffffff,         0 , (void *)0xffffff00, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// 255.255.255.0
+    {SETTYPE_IP,    SET_NULL,   "3#目标网络",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // IP 192.168.3.100
+    {SETTYPE_IP,    SET_NULL,   "3#目标掩码",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0
+    {SETTYPE_IP,    SET_NULL,   "3#网关",          0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.3.100
+    {SETTYPE_LIST,  SET_NULL,   "4#_网络",         0 ,     Net_Eth_ListNum-1,  2 , Net_Eth_List,   Net_Eth_ListNum,    GROUP_PARA_ETHERNET,0x0000, UINT_R},
+    {SETTYPE_IP,    SET_NULL,   "4#IP地址",        0 ,     0xffffffff,         0 , (void *)0xc0a840f0, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// IP 192.168.4.100
+    {SETTYPE_IP,    SET_NULL,   "4#子网掩码",       0 ,     0xffffffff,         0 , (void *)0xffffff00, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R},// 255.255.255.0
+    {SETTYPE_IP,    SET_NULL,   "4#目标网络",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.3.100
+    {SETTYPE_IP,    SET_NULL,   "4#目标掩码",       0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 0.0.0.0
+    {SETTYPE_IP,    SET_NULL,   "4#网关",           0 ,     0xffffffff,         0 , (void *)0x00000000, 0,              GROUP_PARA_ETHERNET,0x0000, STR_R}, // 192.168.3.254
 	{SETTYPE_IP,	SET_NULL,	"默认网关", 		0 , 	0xffffffff,			0 ,	(void *)0xc0a840fe,	0,				GROUP_PARA_ETHERNET,0x0000, STR_R},// 192.168.64.254
 	
 	{SETTYPE_LABEL,	SET_NULL,	"对时", 			0 , 	0,					0 ,		0,				0,				GROUP_PARA_TIME,0x0000, NULL_R},
@@ -5608,7 +5555,7 @@ void GetDefDebugNetPara(void)
 
 	
 }
-#if defined	__GOOSE_USING_DOUBLE_ETH__ || defined NET3_IP5
+#if (1)
 void eth0_debug_ip_setup(void)//设置网口1虚拟网络IP地址
 {
 	char *argv[] = {"/sbin/ifconfig", "eth0:3", "192.168.64.240", NULL};
@@ -5719,9 +5666,6 @@ void MakeRunPara(bool bFirstInit, bool bUboot)
 	acteth = env_get_info(ENV_ETHACT);
 	if(acteth != NULL)
 	{
-		#ifdef NET3_IP5
-		debug_port = 2; 
-		#else
 		if(strcmp(acteth,"FEC0") == 0)
 		{
 			debug_port = 0;	
@@ -5736,19 +5680,14 @@ void MakeRunPara(bool bFirstInit, bool bUboot)
 		} 
 		else 
 		{			
-			debug_port = 0;					
+			debug_port = 2;					
 		}
-		#endif
-		
 	}
 	else 
-	{
-		#ifdef NET3_IP5 	
-		debug_port = 2;	
-		#else
-		debug_port = 0;
-		#endif	
+	{	
+		debug_port = 2;
 	}
+
 	//从环境变量得到IP地址
 	ip = string_to_ip(env_get_info(ENV_IPADDR));
 	Swap_32(&ip);
@@ -5858,8 +5797,8 @@ void MakeRunPara(bool bFirstInit, bool bUboot)
 
         if(bFirstInit)
         {
-            pRunPara->tNetPara[i].bInit=true;                   //第一次初始化，置通道初始化标志
-#ifdef NET3_IP5                                                                     //第一次初始化网络号和索引号默认同步
+            pRunPara->tNetPara[i].bInit=true; //第一次初始化，置通道初始化标志
+#if (1) //第一次初始化网络号和索引号默认同步
             pRunPara->tNetPara[i].old_ethid=pRunPara->tNetPara[i].ethid;
             pRunPara->tNetPara[i].old_index=pRunPara->tNetPara[i].index;
 #endif
@@ -5873,7 +5812,7 @@ void MakeRunPara(bool bFirstInit, bool bUboot)
             uint32_t value = 0;
             int bflag = 0;
 
-#ifndef  NET3_IP5
+#ifndef  (0)
             value = pRunPara->tNetPara[i].ethid;
             //UBOOT的ethact与e2prom.bin中保存的不一致
             if(debug_port != value)
@@ -5927,10 +5866,9 @@ void MakeRunPara(bool bFirstInit, bool bUboot)
 #endif
 
 	}
-#if defined	__GOOSE_USING_DOUBLE_ETH__ || defined NET3_IP5
-    #ifndef NET3_IP5 
+
+#if (1)
 	eth0_debug_ip_setup();
-	#endif
 #endif
 
 	//保存调试网口的IP,子网掩码

dtu/dtu_main_t536/app/set.h

@@ -1385,21 +1385,13 @@ enum
 	PARA_MA_NET3,	
 	PARA_ROUTE_NET3,   //网段
 	PARA_ROUTE_NETMASK3,   //掩码
-	PARA_ROUTE_GATE3,   //网关		
-#if defined NET3_IP5 || defined NET4_IP5
+	PARA_ROUTE_GATE3,   //网关
 	PARA_NET4,
 	PARA_IP_NET4,	
 	PARA_MA_NET4,	
 	PARA_ROUTE_NET4,   //网段
 	PARA_ROUTE_NETMASK4,   //掩码
 	PARA_ROUTE_GATE4,   //网关	
-	PARA_NET5,
-	PARA_IP_NET5,	
-	PARA_MA_NET5,	
-	PARA_ROUTE_NET5,   //网段
-	PARA_ROUTE_NETMASK5,   //掩码
-	PARA_ROUTE_GATE5,	//网关	
-#endif	
 	PARA_GATE_NET,			// 网关
 
 	//对时组

dtu/dtu_main_t536/app/switch.c

@@ -633,9 +633,7 @@ const s8 * g_pub_led_name[PUB_LED_NUM]=
 	"485R3",
 	"网口1",
 	"网口2",
-#if defined	__GOOSE_USING_DOUBLE_ETH__ || defined NET3_IP5 
 	"网口3",
-#endif
 #ifdef BAT_STATE_LED
 	"电池欠压灯",
 	"电池活化灯",

dtu/dtu_main_t536/app/switch.h

@@ -579,9 +579,7 @@ enum
 	PUB_LED_485R3,	
 	PUB_LED_NET1,
 	PUB_LED_NET2,
-#if defined	__GOOSE_USING_DOUBLE_ETH__ || defined NET3_IP5 
 	PUB_LED_NET3,
-#endif	
 #ifdef BAT_STATE_LED
 	PUB_LED_BAT_LOW,
 	PUB_LED_BAT_HH,