From fa805721f0aa89e8fa9101eda904f75f2f46cdc3 Mon Sep 17 00:00:00 2001 From: Ugo Pattacini Date: Mon, 18 Dec 2023 14:39:40 +0100 Subject: [PATCH] reinstated the previous fix for BATTERY_OK_STANDBY --- src/libraries/icubmod/bcbBattery/bcbBattery.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libraries/icubmod/bcbBattery/bcbBattery.h b/src/libraries/icubmod/bcbBattery/bcbBattery.h index 5e9113ced1..b793342f18 100644 --- a/src/libraries/icubmod/bcbBattery/bcbBattery.h +++ b/src/libraries/icubmod/bcbBattery/bcbBattery.h @@ -45,11 +45,7 @@ class batteryReaderThread : public PeriodicThread double battery_current = 0; std::string battery_info = "icub battery system v1.0"; int backpack_status = 0; -#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),