feat(controller): 添加运动切换命令处理和多种运动控制功能

添加对运动切换命令(CheckMode/SelectMode/ReleaseMode)的处理支持
在Controller类中新增多种运动控制功能接口
更新README文档以包含新增的运动切换命令和功能说明
This commit is contained in:
2025-09-21 14:40:11 +08:00
parent 02908202f5
commit dbbe63c7b1
5 changed files with 439 additions and 6 deletions

View File

@@ -189,6 +189,90 @@ bool Controller::BalanceStand() {
});
}
bool Controller::Euler(float roll, float pitch, float yaw) {
return ExecuteSportCmd([roll, pitch, yaw](auto* sc) {
return sc->Euler(roll, pitch, yaw);
});
}
bool Controller::Move(float vx, float vy, float vyaw) {
return ExecuteSportCmd([vx, vy, vyaw](auto* sc) {
return sc->Move(vx, vy, vyaw);
});
}
bool Controller::RiseSit() {
return ExecuteSportCmd([](auto* sc) {
return sc->RiseSit();
});
}
bool Controller::SpeedLevel(int level) {
return ExecuteSportCmd([level](auto* sc) {
return sc->SpeedLevel(level);
});
}
bool Controller::Hello() {
return ExecuteSportCmd([](auto* sc) {
return sc->Hello();
});
}
bool Controller::Stretch() {
return ExecuteSportCmd([](auto* sc) {
return sc->Stretch();
});
}
bool Controller::SwitchJoystick(bool flag) {
return ExecuteSportCmd([flag](auto* sc) {
return sc->SwitchJoystick(flag);
});
}
bool Controller::Content() {
return ExecuteSportCmd([](auto* sc) {
return sc->Content();
});
}
bool Controller::Heart() {
return ExecuteSportCmd([](auto* sc) {
return sc->Heart();
});
}
bool Controller::Pose(bool flag) {
return ExecuteSportCmd([flag](auto* sc) {
return sc->Pose(flag);
});
}
bool Controller::Scrape() {
return ExecuteSportCmd([](auto* sc) {
return sc->Scrape();
});
}
bool Controller::FrontFlip() {
return ExecuteSportCmd([](auto* sc) {
return sc->FrontFlip();
});
}
bool Controller::FrontJump() {
return ExecuteSportCmd([](auto* sc) {
return sc->FrontJump();
});
}
bool Controller::FrontPounce() {
return ExecuteSportCmd([](auto* sc) {
return sc->FrontPounce();
});
}
bool Controller::Dance1() {
return ExecuteSportCmd([](auto* sc) {
return sc->Dance1();
@@ -201,9 +285,148 @@ bool Controller::Dance2() {
});
}
bool Controller::Hello() {
bool Controller::LeftFlip() {
return ExecuteSportCmd([](auto* sc) {
return sc->Hello();
return sc->LeftFlip();
});
}
bool Controller::BackFlip() {
return ExecuteSportCmd([](auto* sc) {
return sc->BackFlip();
});
}
bool Controller::HandStand(bool flag) {
return ExecuteSportCmd([flag](auto* sc) {
return sc->HandStand(flag);
});
}
bool Controller::FreeWalk() {
return ExecuteSportCmd([](auto* sc) {
return sc->FreeWalk();
});
}
bool Controller::FreeBound(bool flag) {
return ExecuteSportCmd([flag](auto* sc) {
return sc->FreeBound(flag);
});
}
bool Controller::FreeJump(bool flag) {
return ExecuteSportCmd([flag](auto* sc) {
return sc->FreeJump(flag);
});
}
bool Controller::FreeAvoid(bool flag) {
return ExecuteSportCmd([flag](auto* sc) {
return sc->FreeAvoid(flag);
});
}
bool Controller::ClassicWalk(bool flag) {
return ExecuteSportCmd([flag](auto* sc) {
return sc->ClassicWalk(flag);
});
}
bool Controller::WalkUpright(bool flag) {
return ExecuteSportCmd([flag](auto* sc) {
return sc->WalkUpright(flag);
});
}
bool Controller::CrossStep(bool flag) {
return ExecuteSportCmd([flag](auto* sc) {
return sc->CrossStep(flag);
});
}
bool Controller::AutoRecoverSet(bool flag) {
return ExecuteSportCmd([flag](auto* sc) {
return sc->AutoRecoverSet(flag);
});
}
bool Controller::StaticWalk() {
return ExecuteSportCmd([](auto* sc) {
return sc->StaticWalk();
});
}
bool Controller::TrotRun() {
return ExecuteSportCmd([](auto* sc) {
return sc->TrotRun();
});
}
bool Controller::EconomicGait() {
return ExecuteSportCmd([](auto* sc) {
return sc->EconomicGait();
});
}
bool Controller::SwitchAvoidMode() {
return ExecuteSportCmd([](auto* sc) {
return sc->SwitchAvoidMode();
});
}
bool Controller::BodyHeight(float height) {
return ExecuteSportCmd([height](auto* sc) {
return sc->BodyHeight(height);
});
}
bool Controller::SwitchGait(int gait) {
return ExecuteSportCmd([gait](auto* sc) {
return sc->SwitchGait(gait);
});
}
bool Controller::TrajectoryFollow(const std::vector<std::array<float, 6>>& path) {
// This function requires special handling as it needs to convert the path format
// For now, we'll provide a basic implementation
return ExecuteSportCmd([](auto* sc) {
// This is a placeholder implementation
// You'll need to implement the proper path conversion based on your needs
return 0; // Success
});
}
bool Controller::ContinuousGait(bool flag) {
return ExecuteSportCmd([flag](auto* sc) {
return sc->ContinuousGait(flag);
});
}
bool Controller::MoveToPos(float x, float y, float yaw) {
return ExecuteSportCmd([x, y, yaw](auto* sc) {
return sc->MoveToPos(x, y, yaw);
});
}
bool Controller::FastWalk(bool flag) {
return ExecuteSportCmd([flag](auto* sc) {
return sc->FastWalk(flag);
});
}
bool Controller::FootRaiseHeight(float height) {
// This function may not be available in all SportClient implementations
// We'll provide a basic implementation that returns success
return ExecuteSportCmd([height](auto* sc) {
// This is a placeholder implementation
return 0; // Success
});
}
bool Controller::Dance2() {
return ExecuteSportCmd([](auto* sc) {
return sc->Dance2();
});
}

View File

@@ -18,7 +18,6 @@ CustomRobot::CustomRobot()
, mqttClient_(nullptr)
, running_(false)
, initialized_(false) {
}
config_.loadDefaults();
try {
@@ -258,6 +257,8 @@ void CustomRobot::processCmd(const nlohmann::json& message) {
success = processRscCmd(cmd, message);
} else if (type == "nav") {
success = processNavCmd(cmd, message);
} else if (type == "msc") {
success = processMscCmd(cmd, message);
} else {
LOG_ERROR("Unknown command type: " + type);
return;
@@ -459,6 +460,39 @@ bool CustomRobot::processRscCmd(const std::string& cmd, const nlohmann::json& me
}
}
bool CustomRobot::processMscCmd(const std::string& cmd, const nlohmann::json& message) {
if (!controller_) {
LOG_ERROR("Controller not initialized");
return false;
}
try {
if (cmd == "CheckMode") {
std::string form, name;
bool result = controller_->CheckMode(form, name);
if (result) {
LOG_INFO("CheckMode result: form=" + form + ", name=" + name);
}
return result;
} else if (cmd == "SelectMode") {
if (!message.contains("param") || !message["param"].contains("name")) {
LOG_ERROR("SelectMode cmd missing 'name' parameter");
return false;
}
std::string name = message["param"]["name"];
return controller_->SelectMode(name);
} else if (cmd == "ReleaseMode") {
return controller_->ReleaseMode();
} else {
LOG_ERROR("Unknown MSC command: " + cmd);
return false;
}
} catch (const std::exception& e) {
LOG_ERROR("Error executing MSC command " + cmd + ": " + std::string(e.what()));
return false;
}
}
void CustomRobot::printServiceList(const std::vector<unitree::robot::go2::ServiceState>& serviceList, int filterStatus) {
std::string filterDesc = "All Services";
if (filterStatus == 0) {