|
@@ -156,7 +156,8 @@ namespace saturn_ros2
|
|
{
|
|
{
|
|
SPDLOG_INFO("cur_scene {}", common_status_data_.cur_scene);
|
|
SPDLOG_INFO("cur_scene {}", common_status_data_.cur_scene);
|
|
if ((common_status_data_.cur_scene == robot_control::common::SCENE_TYPE::WALKING) ||
|
|
if ((common_status_data_.cur_scene == robot_control::common::SCENE_TYPE::WALKING) ||
|
|
- (common_status_data_.cur_scene == robot_control::common::SCENE_TYPE::STAIRS))
|
|
|
|
|
|
+ (common_status_data_.cur_scene == robot_control::common::SCENE_TYPE::STAIRS) ||
|
|
|
|
+ (common_status_data_.cur_scene == robot_control::common::SCENE_TYPE::STONE))
|
|
{
|
|
{
|
|
result = rcClientInterfaceSetScene(robot_control::common::NAV_OR_JOY_MODE::nav_control,
|
|
result = rcClientInterfaceSetScene(robot_control::common::NAV_OR_JOY_MODE::nav_control,
|
|
common::SCENE_TYPE::LIE_DOWN);
|
|
common::SCENE_TYPE::LIE_DOWN);
|
|
@@ -205,8 +206,9 @@ namespace saturn_ros2
|
|
}
|
|
}
|
|
else if ("SlopeGait" == request->comamnd_name)
|
|
else if ("SlopeGait" == request->comamnd_name)
|
|
{
|
|
{
|
|
- SPDLOG_WARN("SlopeGait is not supported yet.");
|
|
|
|
- result = false;
|
|
|
|
|
|
+ SPDLOG_INFO("SlopeGait is called");
|
|
|
|
+ result = rcClientInterfaceSetScene(robot_control::common::NAV_OR_JOY_MODE::nav_control,
|
|
|
|
+ common::SCENE_TYPE::STONE);
|
|
}
|
|
}
|
|
else if ("VstairsGait" == request->comamnd_name)
|
|
else if ("VstairsGait" == request->comamnd_name)
|
|
{
|
|
{
|
|
@@ -494,6 +496,10 @@ namespace saturn_ros2
|
|
{
|
|
{
|
|
gait_scene_state.data = 4;
|
|
gait_scene_state.data = 4;
|
|
}
|
|
}
|
|
|
|
+ else if (common_status_data_.cur_scene == robot_control::common::SCENE_TYPE::STONE)
|
|
|
|
+ {
|
|
|
|
+ gait_scene_state.data = 5;
|
|
|
|
+ }
|
|
else
|
|
else
|
|
{
|
|
{
|
|
gait_scene_state.data = 0;
|
|
gait_scene_state.data = 0;
|