moved asyncio source files to folder src/asyncio, removed unused variable in scout_base.hpp

This commit is contained in:
Ruixiang Du
2020-08-20 22:03:11 +08:00
parent 7daef9893a
commit 310ea758a3
7 changed files with 8 additions and 11 deletions

View File

@@ -2,12 +2,14 @@
## 0.1.5 (2020-06-17)
-------------------
* Merged multiple small libraries into one "wrpsdk"
* Merged multiple small libraries into one "wrp_sdk"
* Changed to "plain" project structure
* Contributors: Ruixiang Du
## 0.1.4 (2020-04-01)
-------------------
* Added initial support of Hunter
* Contributors: Ruixiang Du
## 0.1.3 (2019-09-15)
------------------

View File

@@ -10,6 +10,8 @@ project(wrp_sdk VERSION 0.1.5)
## Project Options
option(BUILD_TESTS ON)
# set(CMAKE_BUILD_TYPE Release)
# set(CMAKE_BUILD_TYPE Debug)
## Check if pkg is built with ROS catkin
if(CATKIN_DEVEL_PREFIX)
@@ -35,9 +37,6 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
## Chosse build type
# set(CMAKE_BUILD_TYPE Release)
# set(CMAKE_BUILD_TYPE Debug)
set(default_build_type "Release")
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
@@ -63,9 +62,9 @@ endif()
find_package(Threads REQUIRED)
add_library(${PROJECT_NAME}
src/async_serial.cpp
src/async_can.cpp
src/asyncio_utils.cpp
src/asyncio/async_serial.cpp
src/asyncio/async_can.cpp
src/asyncio/asyncio_utils.cpp
# agilex mobile platforms
src/platforms/mobile_base.cpp
src/platforms/hunter_base.cpp

View File

@@ -48,7 +48,6 @@ class ScoutBase : public MobileBase {
uint8_t tx_buffer_[SCOUT_CMD_BUF_LEN];
// cmd/status update related variables
std::thread cmd_thread_;
std::mutex scout_state_mutex_;
std::mutex motion_cmd_mutex_;
std::mutex light_cmd_mutex_;
@@ -57,9 +56,6 @@ class ScoutBase : public MobileBase {
ScoutMotionCmd current_motion_cmd_;
ScoutLightCmd current_light_cmd_;
bool light_ctrl_enabled_ = false;
bool light_ctrl_requested_ = false;