Skip to content

Commit

Permalink
Merge branch 'master' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
pattacini committed Dec 18, 2023
2 parents f6ad2a6 + e6dbc5f commit 0dc4cc1
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/libraries/icubmod/bcbBattery/bcbBattery.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ class batteryReaderThread : public PeriodicThread
double battery_current = 0;
std::string battery_info = "icub battery system v1.0";
int backpack_status = 0;
IBattery::Battery_status battery_status = IBattery::Battery_status::BATTERY_OK_STANDBY;
#if YARP_VERSION_MAJOR == 3 && YARP_VERSION_MINOR <= 8
IBattery::Battery_status battery_status = IBattery::Battery_status::BATTERY_OK_STANBY;
#else
IBattery::Battery_status battery_status = IBattery::Battery_status::BATTERY_OK_STANDBY;
#endif

batteryReaderThread (ISerialDevice *_iSerial, double period) :
PeriodicThread((double)period),
Expand Down

0 comments on commit 0dc4cc1

Please sign in to comment.