From 7fb542a877040df49e4d45fda2362c41d9ad576e Mon Sep 17 00:00:00 2001 From: hanskw-weston Date: Mon, 10 Jun 2024 18:00:41 +0800 Subject: [PATCH 1/2] bangbang: update demo for secondary battery --- sample/mobile_base/robooterx_wheelchair_demo.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sample/mobile_base/robooterx_wheelchair_demo.cpp b/sample/mobile_base/robooterx_wheelchair_demo.cpp index 2338c25..9add51c 100644 --- a/sample/mobile_base/robooterx_wheelchair_demo.cpp +++ b/sample/mobile_base/robooterx_wheelchair_demo.cpp @@ -77,8 +77,12 @@ int main(int argc, char const *argv[]) { << static_cast(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; From a25ef904a8ef04ea112fe1e1841eb3fbdfceeb8c Mon Sep 17 00:00:00 2001 From: hanskw-weston Date: Mon, 10 Jun 2024 18:00:53 +0800 Subject: [PATCH 2/2] [Release] bump version to 1.4.x --- .github/workflows/default.yml | 2 +- .github/workflows/release.yml | 2 +- CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 485ce16..89a2e54 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -10,7 +10,7 @@ on: - "**" env: - VERSION: "1.3.*" + VERSION: "1.4.*" jobs: build: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 754c942..0453e74 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: - 'main' env: - TAG_VERSION: "1.3.x" + TAG_VERSION: "1.4.x" jobs: tag-release: diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a999b1..3c37c93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)