整理宏GD_AREA_HEYUAN；

dtu/dtu_main_t536/app/MmiData.c

@@ -3134,7 +3134,6 @@ int mmd_GetNextEv(int key)
 	{
 		return M_ERROR;
 	}
-#ifndef GD_AREA_HEYUAN
 	if(key==HA_KEY_LEFT||key==HA_KEY_UP)  // 上一条SOE
 	{
 		DWORD addr;
@@ -3210,171 +3209,7 @@ int mmd_GetNextEv(int key)
 		m_tEvent.wNumber=g_soe_info.wEvNumber;	
 		return M_JUMP0;
 	}
-#else
-    if(key==HA_KEY_UP)  // 上一条SOE
-	{
-		DWORD addr;
-		if(g_soe_info.wEvNumber<=1)
-		{
-			return M_ERROR;
-		}
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wCurrent,g_soe_info.wEvNumber);	
-		if(m_tEvent.wCurrent<=1)
-		{
-			m_tEvent.wCurrent=g_soe_info.wEvNumber;
-		}
-		else
-		{
-			m_tEvent.wCurrent--;
-		}
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wCurrent,g_soe_info.wEvNumber);
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wIndex,g_soe_info.wEvIndex);		
-		if(m_tEvent.wIndex>0)
-		{
-			m_tEvent.wIndex--;
-		}
-		else
-		{
-			if(g_soe_info.wEvNumber==MAX_EVENT_NUMBER)
-			{
-				m_tEvent.wIndex=MAX_EVENT_NUMBER-1;
-			}
-			else
-			{
-				m_tEvent.wIndex=g_soe_info.wEvIndex;
-			}
-		}
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wIndex,g_soe_info.wEvIndex);
-		addr=EEP_SOE_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-		e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT)); 
-		mmd_GetEventShow(&m_tEvent,false);
-		m_tEvent.wNumber=g_soe_info.wEvNumber;	
-		return M_JUMP0;
-
-	}	
-	if(key==HA_KEY_DOWN)  // 下一条SOE
-	{
-		DWORD addr;
-		if(g_soe_info.wEvNumber<=1)
-		{
-			return M_ERROR;
-		}
-		
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wCurrent,g_soe_info.wEvNumber);
-		m_tEvent.wCurrent++;  // 标头个数调整
-		if(m_tEvent.wCurrent>g_soe_info.wEvNumber)
-		{
-			m_tEvent.wCurrent=1;
-		}
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wCurrent,g_soe_info.wEvNumber);
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wIndex,g_soe_info.wEvIndex);
-		m_tEvent.wIndex++;
-		if(g_soe_info.wEvNumber>=MAX_EVENT_NUMBER)
-		{
-			if(m_tEvent.wIndex>=MAX_EVENT_NUMBER)
-			{
-				m_tEvent.wIndex=0;
-			}
-		}
-		else
-		{
-			if(m_tEvent.wIndex>g_soe_info.wEvIndex)
-			{
-				m_tEvent.wIndex=0;
-			}
-		}	
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wIndex,g_soe_info.wEvIndex);
-		addr=EEP_SOE_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-		e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT)); 
-		mmd_GetEventShow(&m_tEvent,false);
-		m_tEvent.wNumber=g_soe_info.wEvNumber;	
-		return M_JUMP0;
-	}
-	if(key==HA_KEY_LEFT)  // 上20条SOE
-	{
-		DWORD addr;
-		if(g_soe_info.wEvNumber<=20)
-		{
-			return M_ERROR;
-		}
-
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wCurrent,g_soe_info.wEvNumber);	
-		if(m_tEvent.wCurrent<=20)//标头个数调整
-		{
-			m_tEvent.wCurrent +=(g_soe_info.wEvNumber-20);
-		}
-		else
-		{
-			m_tEvent.wCurrent -=20;
-		}
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wCurrent,g_soe_info.wEvNumber);
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wIndex,g_soe_info.wEvIndex);		
-		if(m_tEvent.wIndex>=20)
-		{
-			m_tEvent.wIndex -=20;
-		}
-		else
-		{
-			if(g_soe_info.wEvNumber==MAX_EVENT_NUMBER)//full
-			{
-				m_tEvent.wIndex +=(MAX_EVENT_NUMBER-20);
-			}
-			else
-			{
-				m_tEvent.wIndex +=(g_soe_info.wEvIndex-19);
-			}
-		}
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wIndex,g_soe_info.wEvIndex);
-		addr=EEP_SOE_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-		e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT)); 
-		mmd_GetEventShow(&m_tEvent,false);
-		m_tEvent.wNumber=g_soe_info.wEvNumber;	
-		return M_JUMP0;
 
-	}	
-	if(key==HA_KEY_RIGHT)  // 下20条SOE
-	{
-		DWORD addr;
-		if(g_soe_info.wEvNumber<=20)
-		{
-			return M_ERROR;
-		}
-
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wCurrent,g_soe_info.wEvNumber);		
-				
-		m_tEvent.wCurrent +=20;  // 标头个数调整		
-		if(m_tEvent.wCurrent>g_soe_info.wEvNumber)
-		{			
-			m_tEvent.wCurrent -= g_soe_info.wEvNumber;
-		}
-		
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wCurrent,g_soe_info.wEvNumber);
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wIndex,g_soe_info.wEvIndex);
-		
-		m_tEvent.wIndex +=20;
-		if(g_soe_info.wEvNumber>=MAX_EVENT_NUMBER)//full
-		{
-			if(m_tEvent.wIndex>=MAX_EVENT_NUMBER)
-			{
-				m_tEvent.wIndex -=MAX_EVENT_NUMBER;
-			}
-		}
-		else //not full
-		{
-			if(m_tEvent.wIndex>g_soe_info.wEvIndex)
-			{
-				m_tEvent.wIndex -=(g_soe_info.wEvIndex+1);//从0开始
-			}
-		}
-		//rt_printf("D-SOE: %d,%d,\r\n",m_tEvent.wIndex,g_soe_info.wEvIndex);
-		
-		addr=EEP_SOE_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-		e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT)); 
-		mmd_GetEventShow(&m_tEvent,false);
-		m_tEvent.wNumber=g_soe_info.wEvNumber;	
-		return M_JUMP0;
-	}
-#endif
 	return M_ERROR;
 }
 
@@ -3395,8 +3230,7 @@ int mmd_GetNextVip(int key)
 	{
 		return M_ERROR;
 	}	
-	
-#ifndef GD_AREA_HEYUAN
+
 	if(key==HA_KEY_LEFT||key==HA_KEY_UP)  // 上一条SOE
 	{
 		DWORD addr;
@@ -3473,158 +3307,6 @@ int mmd_GetNextVip(int key)
 		return M_JUMP0;
 
 	}
-#else
-	if(key==HA_KEY_UP)  // 上一条SOE
-	{
-		DWORD addr;
-		if(g_soe_info.wVipNumber<=1)
-		{
-			return M_ERROR;
-		}
-
-		if(m_tEvent.wCurrent<=1)
-		{
-			m_tEvent.wCurrent=g_soe_info.wVipNumber;
-		}
-		else
-		{
-			m_tEvent.wCurrent--;
-		}
-		
-		
-		if(m_tEvent.wIndex>0)
-		{
-			m_tEvent.wIndex--;
-		}
-		else
-		{
-			if(g_soe_info.wVipNumber==MAX_VIP_NUMBER)
-			{
-				m_tEvent.wIndex=MAX_VIP_NUMBER-1;
-			}
-			else
-			{
-				m_tEvent.wIndex=g_soe_info.wVipIndex;
-			}
-		}
-		addr=EEP_VIP_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-		e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT)); 
-		mmd_GetEventShow(&m_tEvent,false);
-		m_tEvent.wNumber=g_soe_info.wVipNumber; 
-		return M_JUMP0;
-
-	}
-	if(key==HA_KEY_DOWN)  // 下一条SOE
-	{
-		DWORD addr;
-		if(g_soe_info.wVipNumber<=1)
-		{
-			return M_ERROR;
-		}
-
-		m_tEvent.wCurrent++;  // 标头个数调整
-		if(m_tEvent.wCurrent>g_soe_info.wVipNumber)
-		{
-			m_tEvent.wCurrent=1;
-		}
-		
-		m_tEvent.wIndex++;
-		if(g_soe_info.wVipNumber>=MAX_VIP_NUMBER)
-		{
-			if(m_tEvent.wIndex>=MAX_VIP_NUMBER)
-			{
-				m_tEvent.wIndex=0;
-			}
-		}
-		else
-		{
-			if(m_tEvent.wIndex>g_soe_info.wVipIndex)
-			{
-				m_tEvent.wIndex=0;
-			}
-		}		
-		addr=EEP_VIP_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-		e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT)); 
-		mmd_GetEventShow(&m_tEvent,false);
-		m_tEvent.wNumber=g_soe_info.wVipNumber; 
-		return M_JUMP0;
-
-	}
-	if(key==HA_KEY_LEFT)  // 上20条SOE
-	{
-		DWORD addr;
-		if(g_soe_info.wVipNumber<=20)
-		{
-			return M_ERROR;
-		}
-
-		if(m_tEvent.wCurrent<=20)
-		{
-			m_tEvent.wCurrent +=(g_soe_info.wVipNumber-20);
-		}
-		else
-		{
-			m_tEvent.wCurrent -=20;
-		}
-		
-		
-		if(m_tEvent.wIndex>=20)
-		{
-			m_tEvent.wIndex -=20;
-		}
-		else
-		{
-			if(g_soe_info.wVipNumber==MAX_VIP_NUMBER)//full
-			{
-				m_tEvent.wIndex += (MAX_VIP_NUMBER-20);
-			}
-			else
-			{
-				m_tEvent.wIndex += (g_soe_info.wVipIndex-19);
-			}
-		}
-		addr=EEP_VIP_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-		e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT)); 
-		mmd_GetEventShow(&m_tEvent,false);
-		m_tEvent.wNumber=g_soe_info.wVipNumber; 
-		return M_JUMP0;
-	}
-	if(key==HA_KEY_RIGHT)  // 下20条SOE
-	{
-		DWORD addr;
-		if(g_soe_info.wVipNumber<=20)
-		{
-			return M_ERROR;
-		}
-
-		m_tEvent.wCurrent +=20;  // 标头个数调整
-		if(m_tEvent.wCurrent>g_soe_info.wVipNumber)
-		{
-			m_tEvent.wCurrent -=g_soe_info.wVipNumber;
-		}
-		
-		m_tEvent.wIndex +=20;
-		if(g_soe_info.wVipNumber>=MAX_VIP_NUMBER)//full
-		{
-			if(m_tEvent.wIndex>=MAX_VIP_NUMBER)
-			{
-				m_tEvent.wIndex -= MAX_VIP_NUMBER;
-			}
-		}
-		else//not full
-		{
-			if(m_tEvent.wIndex>g_soe_info.wVipIndex)
-			{
-				m_tEvent.wIndex -=(g_soe_info.wVipIndex+1);//从0开始
-			}
-		}		
-		addr=EEP_VIP_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-		e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT)); 
-		mmd_GetEventShow(&m_tEvent,false);
-		m_tEvent.wNumber=g_soe_info.wVipNumber; 
-		return M_JUMP0;
-	}
-#endif
 	return M_ERROR;
 }
 /**************************************************************************
@@ -3654,7 +3336,6 @@ int mmd_GetNextDebug(int key)
         return M_ERROR;
     }
 
-#ifndef GD_AREA_HEYUAN
     if(key==HA_KEY_LEFT||key==HA_KEY_UP)  // 上一条SOE
     {
         DWORD addr;
@@ -3731,158 +3412,7 @@ int mmd_GetNextDebug(int key)
         return M_JUMP0;
 
     }
-#else
-    if(key==HA_KEY_UP)  // 上一条SOE
-    {
-        DWORD addr;
-        if(g_soe_info.wDebugNumber<=1)
-        {
-            return M_ERROR;
-        }
-
-        if(m_tEvent.wCurrent<=1)
-        {
-            m_tEvent.wCurrent=g_soe_info.wDebugNumber;
-        }
-        else
-        {
-            m_tEvent.wCurrent--;
-        }
-
-
-        if(m_tEvent.wIndex>0)
-        {
-            m_tEvent.wIndex--;
-        }
-        else
-        {
-            if(g_soe_info.wDebugNumber==MAX_DEBUG_RECORD_NUMBER)
-            {
-                m_tEvent.wIndex=MAX_DEBUG_RECORD_NUMBER-1;
-            }
-            else
-            {
-                m_tEvent.wIndex=g_soe_info.wDebugIndex;
-            }
-        }
-        addr=EEP_DEBUG_RECORD_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-        e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT));
-        mmd_GetEventShow(&m_tEvent,false);
-        m_tEvent.wNumber=g_soe_info.wDebugNumber;
-        return M_JUMP0;
 
-    }
-    if(key==HA_KEY_DOWN)  // 下一条SOE
-    {
-        DWORD addr;
-        if(g_soe_info.wDebugNumber<=1)
-        {
-            return M_ERROR;
-        }
-
-        m_tEvent.wCurrent++;  // 标头个数调整
-        if(m_tEvent.wCurrent>g_soe_info.wDebugNumber)
-        {
-            m_tEvent.wCurrent=1;
-        }
-
-        m_tEvent.wIndex++;
-        if(g_soe_info.wDebugNumber>=MAX_DEBUG_RECORD_NUMBER)
-        {
-            if(m_tEvent.wIndex>=MAX_DEBUG_RECORD_NUMBER)
-            {
-                m_tEvent.wIndex=0;
-            }
-        }
-        else
-        {
-            if(m_tEvent.wIndex>g_soe_info.wDebugIndex)
-            {
-                m_tEvent.wIndex=0;
-            }
-        }
-        addr=EEP_DEBUG_RECORD_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-        e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT));
-        mmd_GetEventShow(&m_tEvent,false);
-        m_tEvent.wNumber=g_soe_info.wDebugNumber;
-        return M_JUMP0;
-
-    }
-    if(key==HA_KEY_LEFT)  // 上20条SOE
-    {
-        DWORD addr;
-        if(g_soe_info.wDebugNumber<=20)
-        {
-            return M_ERROR;
-        }
-
-        if(m_tEvent.wCurrent<=20)
-        {
-            m_tEvent.wCurrent +=(g_soe_info.wDebugNumber-20);
-        }
-        else
-        {
-            m_tEvent.wCurrent -=20;
-        }
-
-
-        if(m_tEvent.wIndex>=20)
-        {
-            m_tEvent.wIndex -=20;
-        }
-        else
-        {
-            if(g_soe_info.wDebugNumber==MAX_DEBUG_RECORD_NUMBER)//full
-            {
-                m_tEvent.wIndex += (MAX_DEBUG_RECORD_NUMBER-20);
-            }
-            else
-            {
-                m_tEvent.wIndex += (g_soe_info.wDebugIndex-19);
-            }
-        }
-        addr=EEP_DEBUG_RECORD_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-        e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT));
-        mmd_GetEventShow(&m_tEvent,false);
-        m_tEvent.wNumber=g_soe_info.wDebugNumber;
-        return M_JUMP0;
-    }
-    if(key==HA_KEY_RIGHT)  // 下20条SOE
-    {
-        DWORD addr;
-        if(g_soe_info.wDebugNumber<=20)
-        {
-            return M_ERROR;
-        }
-
-        m_tEvent.wCurrent +=20;  // 标头个数调整
-        if(m_tEvent.wCurrent>g_soe_info.wDebugNumber)
-        {
-            m_tEvent.wCurrent -=g_soe_info.wDebugNumber;
-        }
-
-        m_tEvent.wIndex +=20;
-        if(g_soe_info.wDebugNumber>=MAX_DEBUG_RECORD_NUMBER)//full
-        {
-            if(m_tEvent.wIndex>=MAX_DEBUG_RECORD_NUMBER)
-            {
-                m_tEvent.wIndex -= MAX_DEBUG_RECORD_NUMBER;
-            }
-        }
-        else//not full
-        {
-            if(m_tEvent.wIndex>g_soe_info.wDebugIndex)
-            {
-                m_tEvent.wIndex -=(g_soe_info.wDebugIndex+1);//从0开始
-            }
-        }
-        addr=EEP_DEBUG_RECORD_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-        e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT));
-        mmd_GetEventShow(&m_tEvent,false);
-        m_tEvent.wNumber=g_soe_info.wDebugNumber;
-        return M_JUMP0;
-    }
-#endif
     return M_ERROR;
 
 }
@@ -3914,8 +3444,7 @@ int mmd_GetNextOpe(int key)
 	if(key==((g_tScreen.lcd_type==LCD_TYPE_6KEY)?HA_KEY_LEFT:HA_KEY_ESC))  //   老版本按键6键，左键为取消键
 	{
 		return M_ERROR;
-	}	
-#ifndef GD_AREA_HEYUAN
+	}
 	if(key==HA_KEY_LEFT||key==HA_KEY_UP)  // 上一条SOE
 	{
 		DWORD addr;
@@ -3990,156 +3519,6 @@ int mmd_GetNextOpe(int key)
 		m_tEvent.wNumber=g_soe_info.wOpNumber;	
 		return M_JUMP0;
 	}
-#else
-	if(key==HA_KEY_UP)  // 上一条SOE
-	{
-		DWORD addr;
-		if(g_soe_info.wOpNumber<=1)
-		{
-			return M_ERROR;
-		}
-
-		if(m_tEvent.wCurrent<=1)
-		{
-			m_tEvent.wCurrent=g_soe_info.wOpNumber;
-		}
-		else
-		{
-			m_tEvent.wCurrent--;
-		}
-		
-		
-		if(m_tEvent.wIndex>0)
-		{
-			m_tEvent.wIndex--;
-		}
-		else
-		{
-			if(g_soe_info.wOpNumber==MAX_OPERATE_NUMBER)
-			{
-				m_tEvent.wIndex=MAX_OPERATE_NUMBER-1;
-			}
-			else
-			{
-				m_tEvent.wIndex=g_soe_info.wOpIndex;
-			}
-		}
-		addr=EEP_OPERATE_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-		e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT)); 
-		mmd_GetEventShow(&m_tEvent,false);
-		m_tEvent.wNumber=g_soe_info.wOpNumber;	
-		return M_JUMP0;
-	}
-	if(key==HA_KEY_DOWN)  // 下一条SOE
-	{
-		DWORD addr;
-		if(g_soe_info.wOpNumber<=1)
-		{
-			return M_ERROR;
-		}
-
-		m_tEvent.wCurrent++;  // 标头个数调整
-		if(m_tEvent.wCurrent>g_soe_info.wOpNumber)
-		{
-			m_tEvent.wCurrent=1;
-		}
-		
-		m_tEvent.wIndex++;
-		if(g_soe_info.wOpNumber>=MAX_OPERATE_NUMBER)
-		{
-			if(m_tEvent.wIndex>=MAX_OPERATE_NUMBER)
-			{
-				m_tEvent.wIndex=0;
-			}
-		}
-		else
-		{
-			if(m_tEvent.wIndex>g_soe_info.wOpIndex)
-			{
-				m_tEvent.wIndex=0;
-			}
-		}		
-		addr=EEP_OPERATE_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-		e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT)); 
-		mmd_GetEventShow(&m_tEvent,false);
-		m_tEvent.wNumber=g_soe_info.wOpNumber;	
-		return M_JUMP0;
-	}
-	if(key==HA_KEY_LEFT)  // 上20条SOE
-	{
-		DWORD addr;
-		if(g_soe_info.wOpNumber<=20)
-		{
-			return M_ERROR;
-		}
-
-		if(m_tEvent.wCurrent<=20)
-		{
-			m_tEvent.wCurrent +=(g_soe_info.wOpNumber-20);
-		}
-		else
-		{
-			m_tEvent.wCurrent -=20;
-		}
-		
-		
-		if(m_tEvent.wIndex>=20)
-		{
-			m_tEvent.wIndex -=20;
-		}
-		else
-		{
-			if(g_soe_info.wOpNumber==MAX_OPERATE_NUMBER)//full
-			{
-				m_tEvent.wIndex +=(MAX_OPERATE_NUMBER-20);
-			}
-			else
-			{
-				m_tEvent.wIndex +=(g_soe_info.wOpIndex-19);
-			}
-		}
-		addr=EEP_OPERATE_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-		e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT)); 
-		mmd_GetEventShow(&m_tEvent,false);
-		m_tEvent.wNumber=g_soe_info.wOpNumber;	
-		return M_JUMP0;
-	}
-	if(key==HA_KEY_RIGHT)  // 下20条SOE
-	{
-		DWORD addr;
-		if(g_soe_info.wOpNumber<=20)
-		{
-			return M_ERROR;
-		}
-
-		m_tEvent.wCurrent +=20;  // 标头个数调整
-		if(m_tEvent.wCurrent>g_soe_info.wOpNumber)
-		{
-			m_tEvent.wCurrent -=g_soe_info.wOpNumber;
-		}
-		
-		m_tEvent.wIndex +=20;
-		if(g_soe_info.wOpNumber>=MAX_OPERATE_NUMBER)//full
-		{
-			if(m_tEvent.wIndex>=MAX_OPERATE_NUMBER)
-			{
-				m_tEvent.wIndex -= MAX_OPERATE_NUMBER;
-			}
-		}
-		else//not full
-		{
-			if(m_tEvent.wIndex>g_soe_info.wOpIndex)
-			{
-				m_tEvent.wIndex -=(g_soe_info.wOpIndex+1);//从0开始
-			}
-		}		
-		addr=EEP_OPERATE_ADDR+m_tEvent.wIndex*(sizeof(EVENT_SAVE))+4;
-		e2prom_read(addr,(BYTE *)&m_tEvent.tEv,sizeof(EVENT_STRUCT)); 
-		mmd_GetEventShow(&m_tEvent,false);
-		m_tEvent.wNumber=g_soe_info.wOpNumber;	
-		return M_JUMP0;
-	}
-#endif
 	return M_ERROR;
 }
 /**************************************************************************

dtu/dtu_main_t536/app/defineSys.h

@@ -102,7 +102,6 @@
 #define GD_AREA_FOS_2020      // 佛山局2020要求
 #define GD_AREA_ZHONGSHAN     // 中山局要求
 #define GD_AREA_ZHONGSHAN_FTU          // 中山FTU要求
-#define GD_AREA_HEYUAN                 // 河源局要求
 #define GD_AREA_HEYUAN_KL              // 科陆河源局要求
 #define GD_AREA_GUANGZHOU_FTU          // 广州局要求
 #define GD_AREA_ZHAOQING               // 肇庆局要求
@@ -200,7 +199,6 @@
 #elif defined GD_AREA_HEYUAN_KL     //科陆河源
     #define VER_NUM 				16101			// 版本号16.101
 	#define SOE_RECORD_DELAY
-	#define GD_AREA_HEYUAN
 
 #elif defined  GD_AREA_GUANGZHOU_FTU	//广州
 	#define VER_NUM 				17101			// 版本号17.101
@@ -227,10 +225,6 @@
 	#endif
 	#define BHFA_YB_YK
 
-#elif defined  GD_AREA_HEYUAN		//正超河源版本	
-	#define VER_NUM 				21101			// 版本号21.101
-	#define SOE_RECORD_DELAY
-
 #elif defined  GD_AREA_CHAOZHOUFENGXI		//正超潮州枫溪版本	
     #ifdef __IEC61850_GOOSE_FUNC__
 		#define VER_NUM			 		22201          // 版本号22.201
@@ -321,7 +315,6 @@
 #elif defined  GD_AREA_HEYUAN_2021	//广东标准2020分支-河源
 	#define VER_NUM 				    28106			// 版本号28.106
 	#define SOE_RECORD_DELAY
-	#define GD_AREA_HEYUAN
 	#define IEC_JXYB_DEAL				//“检修压板”此遥信点不受检修功能控制，即任何时刻变位都正常上送。
 	#define YC_QUANTITY			//每间隔遥参数量可通过内部定值设定
 	#define BH_FA_INONE_SW			//功能模块配置定值部分，主要特征为BH/FA/智能FA三合一(在开关定值中)

dtu/dtu_main_t536/app/set.c

@@ -104,13 +104,8 @@ BH_SET_GROUP SetGroups[]=  //
 #ifdef FUNC_SEL_MODE_FA
 	{SETGROUP_TYPE_BH			,1 ,		0,				GROUP_SET_FA_SEL,	"保护定值", 		"FA功能选择控制字", 			},	
 #endif
-#ifdef	GD_AREA_HEYUAN//河源要求名称显示不一致
 	{SETGROUP_TYPE_BH			,1 ,		SET_HYB_FA, 	GROUP_SET_FATT,		"保护定值", 		"馈线自动化控制字", 	},			
 	{SETGROUP_TYPE_BH			,1 ,		SET_HYB_FA, 	GROUP_SET_FADZ,		"保护定值", 		"馈线自动化定值",		},			
-#else
-	{SETGROUP_TYPE_BH			,1 ,		SET_HYB_FA, 	GROUP_SET_FATT,		"保护定值", 		"电压电流型控制字", 	},			
-	{SETGROUP_TYPE_BH			,1 ,		SET_HYB_FA, 	GROUP_SET_FADZ,		"保护定值", 		"电压电流型定值",		},			
-#endif
 #if defined GD_AREA_ECZD_2020 ||defined GD_AREA_HEYUAN_2021
 	{SETGROUP_TYPE_BH			,1 ,		SET_HYB_FA, 	GROUP_SET_FAYB, 	"保护定值", 		"电压电流型软压板",		},			
 #endif
@@ -1276,12 +1271,7 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_LABEL, SET_NULL,	"馈线自动化类功能选择控制字", 			0 , 		0,				0 , 	0,			0,				GROUP_SET_FA_SEL,0X0000, NULL_R},
 	{SETTYPE_LIST,	SET_NULL,	"功能选择", 			0 , 		SelFAListNum-1,	1,		SelFAList,	SelFAListNum,	GROUP_SET_FA_SEL,0x500B, UINT_R},
 #endif
-
-#ifdef	GD_AREA_HEYUAN
 	{SETTYPE_LABEL,	SET_NULL,	"馈线自动化控制字", 			0 , 		0,				0 ,		0,			0,				GROUP_SET_FATT,0X0000, NULL_R},
-#else
-	{SETTYPE_LABEL,	SET_NULL,	"电压电流型控制字", 			0 , 		0,				0 ,		0,			0,				GROUP_SET_FATT,0X0000, NULL_R},
-#endif
 
 #ifdef GD_AREA_ECZD_2020 //2020二次指导意见 2020-9-8
     {SETTYPE_LIST,	SET_NULL,	"通信模式", 			1 , 		TFA_TypeNum-1,	1,		TFA_Type,	TFA_TypeNum,	GROUP_SET_FATT,0x500B, UINT_R},
@@ -1377,11 +1367,7 @@ const  TSETTABLE tSwSetTable[]=
 	#endif
 #endif
 
-#ifdef	GD_AREA_HEYUAN
 	{SETTYPE_LABEL,	SET_NULL,	"馈线自动化定值", 				0 , 		0,				0 ,		0,			0,				GROUP_SET_FADZ,0X0000, NULL_R},
-#else
-	{SETTYPE_LABEL,	SET_NULL,	"电压电流型定值", 				0 , 		0,				0 ,		0,			0,				GROUP_SET_FADZ,0X0000, NULL_R},
-#endif
 
 #ifdef GD_AREA_ECZD_2020
 	{SETTYPE_F, 	SET_PERUN,	"有压定值", 					0.0 ,	100.0,			80.0 ,	0,			0,				GROUP_SET_FADZ,0x501B, FLOAT_R},