等待时间使用宏定义

TSCP/src/MSCP/Arb/Arb.c

@@ -17,7 +17,10 @@ STRU_AREA_WITH_ARB_CFG_ALL_T g_area_with_arb_cfg = {0}; /**区域控制信息汇
 
 /*===========↓↓↓↓↓宏定义↓↓↓↓↓=============*/
 
-#define AREA_ARB_NOW_USED_TIME ((CM_GetTick() - s_area_arb_start_time) / CM_UNSIGNED_MILLION)
+#define AREA_ARB_NOW_USED_TIME ((CM_GetTick() - s_area_arb_start_time) / CM_UNSIGNED_MILLION) /**记录区域线程耗时 */
+#define AREA_STATE_WAITE_TIME (30u - 7u) /**区域状态请求/应答接收超时时间，30ms减去一次2取耗时 */
+#define AREA_ARB_WAITE_TIME (20u) /**仲裁应答时间 */
+#define AREA_MULTI_WAITE_TIME (10u) /**组播等待时间 */
 /*===========↑↑↑↑↑宏定义↑↑↑↑↑=============*/
 
 /*===========↓↓↓↓↓静态函数声明↓↓↓↓↓=============*/
@@ -400,7 +403,7 @@ static void s_Area_State_Ack_Process(void)
         CM_Memset(ack_flags, 0, sizeof(ack_flags), sizeof(ack_flags));
 
         CM_Sleep(1u);
-    }while(30 >= peer_time && 30 >= used_time);
+    }while(AREA_STATE_WAITE_TIME > peer_time && AREA_STATE_WAITE_TIME > used_time);
 }
 
 static void s_Area_State_Req_Recv_Process(IN const STRU_AREA_WITH_ARB_STATE_PACK_T* state_pack,
@@ -605,7 +608,7 @@ static void s_Area_Arb_Recv_Process(void)
         }
         tick_now = (CM_UINT32)(CM_GetTick() / CM_UNSIGNED_MILLION);
         used_time = tick_now - tick_start;
-    } while(used_time < 20u);
+    } while(AREA_ARB_WAITE_TIME > used_time);
 
     s_Area_2oo2Sync_AfterArbRecv();
 }
@@ -716,7 +719,7 @@ static void s_Area_State_Multi_Recv_Process(void)
             CM_Sleep(1u);  
         }     
         usedTime = tickNow - tickStart;   
-    } while (usedTime < 10u);
+    } while (AREA_MULTI_WAITE_TIME > usedTime);