From 172ba0d1a0b023ef029025667ee6b865ea9c3f5c Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 25 Sep 2020 18:24:40 +0200 Subject: [PATCH] - added ExtensionBatteryState to ScStw and renamed ReadyStates in timer --- ScStwLibraries/headers/ScStw.hpp | 23 +++++++++++++++++++++++ ScStwLibraries/headers/scstwtimer.h | 5 +++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ScStwLibraries/headers/ScStw.hpp b/ScStwLibraries/headers/ScStw.hpp index e88eee1..e7584dd 100644 --- a/ScStwLibraries/headers/ScStw.hpp +++ b/ScStwLibraries/headers/ScStw.hpp @@ -142,6 +142,9 @@ public: Q_ENUM(ExtensionType); + /*! + * \brief The ExtensionState enum contains all possible states of an extension + */ enum ExtensionState { Disconnected = 0, Connecting = 1, @@ -151,6 +154,26 @@ public: Q_ENUM(ExtensionState); + /*! + * \brief The ExtensionBatteryState enum contains all possible battery states of an extension + */ + enum ExtensionBatteryState { + BatteryUnknown = -1, + BatteryFine = 1, + BatteryCritical = 0 + }; + Q_ENUM(ExtensionBatteryState); + + /*! + * \brief The PadState enum contains whether a pad is currently pressed or not + */ + enum PadState { + PadNotPressed = 0, + PadPressed = 1 + }; + Q_ENUM(PadState); + + /*! * \brief SOCKET_MESSAGE_START_KEY contains the key, a message is supposed to start with */ diff --git a/ScStwLibraries/headers/scstwtimer.h b/ScStwLibraries/headers/scstwtimer.h index ee82a10..51561fa 100644 --- a/ScStwLibraries/headers/scstwtimer.h +++ b/ScStwLibraries/headers/scstwtimer.h @@ -105,8 +105,9 @@ public: IsReady = 0, /*!< Timer is ready for start */ NotInIdleState, /*!< Timer is not in IDLE state */ IsDisabled, /*!< Timer is disabled */ - NotAllExtensionsConnected, /*!< Not all extension of the timer are conneted */ - NotAllClimbersReady /*!< The startpad of the timer is not triggered */ + ExtensionIsNotConnected, /*!< Not all extension of the timer are conneted */ + ExtensionBatteryNotFine, /*!< The battery level of one or more extension is critical or unknown */ + ClimberIsNotReady /*!< The startpad of the timer is not triggered */ }; protected: