BHBF.h命名采取功能维度

RBcore/TL720D.c

@@ -129,7 +129,7 @@ static void decode_TL720D(const char *buf, uint32_t _iSize)
 	{
 		uiLastSendTick = uiNowTick;
 		MsgCenter_SendTo(MODULE_NAME_CUSTOM, GET_TL720D_ROLL, (void *)&g_stTL720D.RF_Angle_Roll, sizeof(int32_t));
-		MsgCenter_SendTo(MODULE_NAME_DAEMON, DAEMON_SET_TL720D, NULL, 0);
+		MsgCenter_SendTo(MODULE_NAME_DAEMON, SET_DAEMON_TL720D, NULL, 0);
 	}
 }
 

RBcore/client_setting.c

@@ -82,8 +82,8 @@ void decode_PV(const char *_pBuffer, uint32_t _iSize)
 
         if(decoded_PV_variable.TimeStamp>decoded_PV.TimeStamp)
         {
-        	MsgCenter_SendTo(MODULE_NAME_DAEMON, DAEMON_SET_MK32_SERIAL, NULL, 0);
-        	MsgCenter_SendTo(MODULE_NAME_DAEMON, DAEMON_SET_MK32_UDP, NULL, 0);// udp还没实现这里先防止报错
+        	MsgCenter_SendTo(MODULE_NAME_DAEMON, SET_DAEMON_MK32_SERIAL, NULL, 0);
+        	MsgCenter_SendTo(MODULE_NAME_DAEMON, SET_DAEMON_MK32_UDP, NULL, 0);// udp还没实现这里先防止报错
         	decoded_PV=decoded_PV_variable;
             MsgCenter_SendTo(MODULE_NAME_CUSTOM, GET_PV, (void *)&decoded_PV, sizeof(decoded_PV));
         }

RBcore/daemon_task.c

@@ -124,37 +124,37 @@ static void daemon_ModuleHandler(const Msg_t *pstMsg)
 
     switch (pstMsg->m_uiMsgID)
     {
-		case DAEMON_SET_MK32_SBUS:
+		case SET_DAEMON_MK32_SBUS:
 		{
 			SET_BIT_1(&g_iCom_Error_Code, ComError_MK32_SBus);
 			break;
 		}
-		case DAEMON_SET_TL720D:
+		case SET_DAEMON_TL720D:
 		{
 			SET_BIT_1(&g_iCom_Error_Code, ComError_TL720D);
 			break;
 		}
-		case DAEMON_SET_LEFT_MOTOR:
+		case SET_DAEMON_LEFT_MOTOR:
 		{
 			SET_BIT_1(&g_iCom_Error_Code, ComError_LS_LeftMotor);
 			break;
 		}
-		case DAEMON_SET_RIGHT_MOTOR:
+		case SET_DAEMON_RIGHT_MOTOR:
 		{
 			SET_BIT_1(&g_iCom_Error_Code, ComError_LS_RightMotor);
 			break;
 		}
-		case DAEMON_SET_BUTTON_RESET:
+		case SET_DAEMON_BUTTON_RESET:
 		{
 			SET_BIT_1(&g_iCom_Error_Code, ComError_Remote_Button_Reset_State);
 			break;
 		}
-		case DAEMON_SET_MK32_SERIAL:
+		case SET_DAEMON_MK32_SERIAL:
 		{
 			SET_BIT_1(&g_iCom_Error_Code, ComError_MK32_Serial);
 			break;
 		}
-		case DAEMON_SET_MK32_UDP:
+		case SET_DAEMON_MK32_UDP:
 		{
 			SET_BIT_1(&g_iCom_Error_Code, ComError_MK32_UDP);
 			break;

RBcore/include/BHBF.h

@@ -99,13 +99,13 @@ typedef enum {
 	CMD_STOP_AFTER_PAINTOFF,     // 先关枪后停车
 	SET_STOP_OFF_PAINT,   		 // 停车关枪CMD_STOP_AFTER_PAINTOFF标志位置1
 	RESET_PAINT,                 // 停车关枪CMD_STOP_AFTER_PAINTOFF逻辑中用于重置开枪状态
-	DAEMON_SET_MK32_SBUS,        // 置位ComError_MK32_SBus
-	DAEMON_SET_TL720D,           // 置位ComError_TL720D
-	DAEMON_SET_LEFT_MOTOR,       // 置位ComError_LS_LeftMotor
-	DAEMON_SET_RIGHT_MOTOR,      // 置位ComError_LS_RightMotor
-	DAEMON_SET_BUTTON_RESET,     // 置位ComError_Remote_Button_Reset_State
-	DAEMON_SET_MK32_SERIAL,      // 置位ComError_MK32_Serial
-	DAEMON_SET_MK32_UDP,         // 置位ComError_MK32_UDP
+	SET_DAEMON_MK32_SBUS,        // 置位ComError_MK32_SBus
+	SET_DAEMON_TL720D,           // 置位ComError_TL720D
+	SET_DAEMON_LEFT_MOTOR,       // 置位ComError_LS_LeftMotor
+	SET_DAEMON_RIGHT_MOTOR,      // 置位ComError_LS_RightMotor
+	SET_DAEMON_BUTTON_RESET,     // 置位ComError_Remote_Button_Reset_State
+	SET_DAEMON_MK32_SERIAL,      // 置位ComError_MK32_Serial
+	SET_DAEMON_MK32_UDP,         // 置位ComError_MK32_UDP
 } BHBF_Cmd_e;
 
 #define THREAD_DEFAULT_STACK 4096

controller/msp_MK32.c

@@ -117,7 +117,7 @@ void decode_MK32(const char *buf, uint32_t _iSize)
     uiLastSendTick = uiNowTick;
     MsgCenter_SendTo(MODULE_NAME_CUSTOM, GET_MK32, (void *)&RB_MK32,
                      sizeof(RB_MK32));
-    MsgCenter_SendTo(MODULE_NAME_DAEMON, DAEMON_SET_MK32_SBUS, NULL, 0);
+    MsgCenter_SendTo(MODULE_NAME_DAEMON, SET_DAEMON_MK32_SBUS, NULL, 0);
   }
 }
 

project/paint_robot_new/paint_robot_new.c

@@ -753,12 +753,12 @@ static void Custom_ModuleHandler(const Msg_t *pstMsg)
 				if (uiFailtCode[0] == 1)
 				{
 					g_stIV.Left_Motor_Err = uiFailtCode[1];
-					MsgCenter_SendTo(MODULE_NAME_DAEMON, DAEMON_SET_LEFT_MOTOR, NULL, 0);
+					MsgCenter_SendTo(MODULE_NAME_DAEMON, SET_DAEMON_LEFT_MOTOR, NULL, 0);
 				}
 				else if (uiFailtCode[0] == 2)
 				{
 					g_stIV.Right_Motor_Err = uiFailtCode[1];
-					MsgCenter_SendTo(MODULE_NAME_DAEMON, DAEMON_SET_RIGHT_MOTOR, NULL, 0);
+					MsgCenter_SendTo(MODULE_NAME_DAEMON, SET_DAEMON_RIGHT_MOTOR, NULL, 0);
 				}
 			}
 			break;
@@ -772,11 +772,11 @@ static void Custom_ModuleHandler(const Msg_t *pstMsg)
 				if (1 == iCurrentSpeed[0])
 				{
 					g_stIV.CurrentSpeed = iCurrentSpeed[1];
-					MsgCenter_SendTo(MODULE_NAME_DAEMON, DAEMON_SET_LEFT_MOTOR, NULL, 0);
+					MsgCenter_SendTo(MODULE_NAME_DAEMON, SET_DAEMON_LEFT_MOTOR, NULL, 0);
 				}
 				else
 				{
-					MsgCenter_SendTo(MODULE_NAME_DAEMON, DAEMON_SET_RIGHT_MOTOR, NULL, 0);
+					MsgCenter_SendTo(MODULE_NAME_DAEMON, SET_DAEMON_RIGHT_MOTOR, NULL, 0);
 				}
 			}
 			break;
@@ -848,7 +848,7 @@ static void Custom_ModuleHandler(const Msg_t *pstMsg)
 			}
 			else
 			{
-				MsgCenter_SendTo(MODULE_NAME_DAEMON, DAEMON_SET_BUTTON_RESET, NULL, 0);
+				MsgCenter_SendTo(MODULE_NAME_DAEMON, SET_DAEMON_BUTTON_RESET, NULL, 0);
 			}
 
 			if (iMotorOK == 0) // 电机还没初始化完，不执行后边