zjk/moos-ivp-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决了冲突

Browse Source
This commit is contained in:
chenlizhi
2023-11-28 11:11:01 +08:00
parent bee3fea02d c71064fcb4
commit faac316a30
24 changed files with 511 additions and 1324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pStateManagement/StateManagement.cpp
View File

@@ -47,12 +47,12 @@ bool StateManagement::OnNewMail(MOOSMSG_LIST &NewMail)
bool mstr = msg.IsString();
Json::Value deviceState;
double manualState;
int missionState;
std::string manualState;
int missionState;
if(key == "uManual_enable_cmd")
{
manualState = msg.GetDouble();
manualState = msg.GetString();
}
if(key == "uMission_task_fb")
{
@@ -69,13 +69,13 @@ bool StateManagement::OnNewMail(MOOSMSG_LIST &NewMail)
missionState = missionStateData["state"].asInt();
}
if(fabs(manualState - 1) < 1e-6) //manualState=1
if(manualState == "true")
{
deviceState["opMode"] = opModeLists.external;
}
else if (fabs(manualState - 0) < 1e-6) //manualState=0
{
switch (missionState)
else if (manualState == "faluse")
{
if(missionState == 0)
{
case 0:
deviceState["opMode"] = opModeLists.error;