Browse Source

CV改为全局,去掉之前获取CV相关的接口

master
Lizongdi 2 days ago
parent
commit
31f5461b6d
  1. 5
      RBcore/BHBF.c
  2. 3
      RBcore/drv_interface.c
  3. 1
      RBcore/include/BHBF.h
  4. 3
      RBcore/include/drv_interface.h
  5. 9
      project/paint_robot_new/paint_robot_new.c

5
RBcore/BHBF.c

@ -19,8 +19,6 @@
#include "BHBF.h" #include "BHBF.h"
#include "common.h" #include "common.h"
#include "msg_center.h" #include "msg_center.h"
#include "bsp_EEPROM.h"
#include "bsp_CV.pb.h"
/*----------------------------------------------* /*----------------------------------------------*
* * * *
@ -38,7 +36,6 @@
* * * *
*----------------------------------------------*/ *----------------------------------------------*/
static uint32_t g_uiRBcoreModuleID = 0; static uint32_t g_uiRBcoreModuleID = 0;
static CV_struct_define CV = {0};
/*----------------------------------------------* /*----------------------------------------------*
* * * *
@ -92,12 +89,10 @@ static void RBcore_ModuleHandler(const Msg_t *pstMsg)
void RBcore_Task(void *argument) void RBcore_Task(void *argument)
{ {
GF_BSP_EEPROM_ReadBytes((uint8_t *)&CV, GF_BSP_EEPROM_CV_struct_define_Start_Address, sizeof(CV_struct_define));
while(1) while(1)
{ {
// 处理消息 // 处理消息
MsgCenter_ProcessWait(g_uiRBcoreModuleID, 2); MsgCenter_ProcessWait(g_uiRBcoreModuleID, 2);
MsgCenter_SendTo(MODULE_NAME_CUSTOM, CUSTOM_GET_CV, (void *)&CV, sizeof(CV));
} }
} }

3
RBcore/drv_interface.c

@ -48,6 +48,8 @@ TComCtrl *g_ptlpuart;
TComCtrl *g_ptCAN1; TComCtrl *g_ptCAN1;
TComCtrl *g_ptCAN2; TComCtrl *g_ptCAN2;
CV_struct_define g_stCV = {0};
/*----------------------------------------------* /*----------------------------------------------*
* * * *
*----------------------------------------------*/ *----------------------------------------------*/
@ -257,6 +259,7 @@ void Drv_InterfaceInit(void)
{ {
GF_BSP_EEPROM_Init(); GF_BSP_EEPROM_Init();
MsgCenter_Init(); MsgCenter_Init();
GF_BSP_EEPROM_ReadBytes((uint8_t *)&g_stCV, GF_BSP_EEPROM_CV_struct_define_Start_Address, sizeof(CV_struct_define));
SendIV_Init(); SendIV_Init();
// ground_manger_init(); // ground_manger_init();

1
RBcore/include/BHBF.h

@ -93,7 +93,6 @@ typedef enum {
RBCORE_CMD_END = 0x0200, RBCORE_CMD_END = 0x0200,
CUSTOM_GET_PV, // 获取PV CUSTOM_GET_PV, // 获取PV
CUSTOM_GET_CV, // 获取CV
CUSTOM_SET_IV, // 设置IV CUSTOM_SET_IV, // 设置IV
CUSTOM_GET_MK32, // 获取MK32 CUSTOM_GET_MK32, // 获取MK32
CUSTOM_CMD_END = 0x0300, CUSTOM_CMD_END = 0x0300,

3
RBcore/include/drv_interface.h

@ -64,6 +64,7 @@ extern "C"{
#include "bsp_uart.h" #include "bsp_uart.h"
#include "bsp_CAN.h" #include "bsp_CAN.h"
#include "fdcan.h" #include "fdcan.h"
#include "bsp_CV.pb.h"
@ -86,6 +87,8 @@ extern TComCtrl *g_ptlpuart;
extern TComCtrl *g_ptCAN1; extern TComCtrl *g_ptCAN1;
extern TComCtrl *g_ptCAN2; extern TComCtrl *g_ptCAN2;
extern CV_struct_define g_stCV;
/*==============================================* /*==============================================*
* routines' or functions' implementations * * routines' or functions' implementations *
*----------------------------------------------*/ *----------------------------------------------*/

9
project/paint_robot_new/paint_robot_new.c

@ -46,7 +46,6 @@
static uint32_t g_uiCustomModuleID = 0; static uint32_t g_uiCustomModuleID = 0;
static SP_MSP_MK32_Button g_stMK32; static SP_MSP_MK32_Button g_stMK32;
static PV_struct_define g_stPV; static PV_struct_define g_stPV;
static CV_struct_define g_stCV;
static IV_struct_define g_stIV; static IV_struct_define g_stIV;
/*----------------------------------------------* /*----------------------------------------------*
@ -68,14 +67,6 @@ static void Custom_ModuleHandler(const Msg_t *pstMsg)
switch (pstMsg->m_uiMsgID) switch (pstMsg->m_uiMsgID)
{ {
case CUSTOM_GET_CV:
{
if (pstMsg->m_uiDataLen >= sizeof(g_stCV))
{
RD_MEMCPY(&g_stCV, pstMsg->m_aucData, sizeof(g_stCV));
}
break;
}
case CUSTOM_GET_PV: case CUSTOM_GET_PV:
{ {
if (pstMsg->m_uiDataLen >= sizeof(g_stPV)) if (pstMsg->m_uiDataLen >= sizeof(g_stPV))

Loading…
Cancel
Save