Skip to content

Commit

Permalink
Merge pull request #6 from westonrobot/feature-v1.4
Browse files Browse the repository at this point in the history
Feature v1.4
  • Loading branch information
hanskw-weston authored Jun 10, 2024
2 parents 45b740e + a25ef90 commit f76fcb8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- "**"

env:
VERSION: "1.3.*"
VERSION: "1.4.*"

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'main'

env:
TAG_VERSION: "1.3.x"
TAG_VERSION: "1.4.x"

jobs:
tag-release:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})

## Find wrp_sdk and its dependent package wrp_zbus
find_package(wrp_sdk 1.3.0...<1.4.0 REQUIRED)
find_package(wrp_sdk 1.4.0...<1.5.0 REQUIRED)

find_package(PkgConfig REQUIRED)
pkg_check_modules(LelyIO QUIET IMPORTED_TARGET liblely-io2)
Expand Down
6 changes: 5 additions & 1 deletion sample/mobile_base/robooterx_wheelchair_demo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,12 @@ int main(int argc, char const *argv[]) {
<< static_cast<int>(system_state.control_state) << std::endl;

westonrobot::BatteryState bms_data = base.GetBatteryState();
std::cout << "BMS: " << std::endl;
westonrobot::BatteryState bms_data2 = base.GetSecondaryBatteryState();
std::cout << "Primary BMS: " << std::endl;
std::cout << " SOC: " << bms_data.percentage << "%" << std::endl;
std::cout << "Secondary BMS: " << std::endl;
std::cout << " SOC: " << bms_data2.percentage << "%" << std::endl;
std::cout << " voltage: " << bms_data2.voltage << "V" << std::endl;

std::cout << "Controlling robot base..." << std::endl;

Expand Down

0 comments on commit f76fcb8

Please sign in to comment.