Use new standby enum

Author: sebromero

Diff for: src/Board.cpp

@@ -122,13 +122,7 @@ void Board::enableWakeupFromPin(uint8_t pin, PinStatus direction){
 
 #if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_NICLA_VISION)
 void Board::enableWakeupFromPin(){
-    // If no wake up method is selected yet, set it to wake up from pin activity
-    if(standbyType == LowPowerStandbyType::None){
-        standbyType = LowPowerStandbyType::UntilPinActivity;
-    // If there is already a wake up method selected, set it to wake up from both pin activity and time elapsed
-    } else if (standbyType == LowPowerStandbyType::UntilTimeElapsed){
-        standbyType = LowPowerStandbyType::UntilBothAreTrue;
-    }
+    standbyType |= StandbyType::untilPinActivity;
 }
 
 void Board::enableSleepWhenIdle(){
@@ -141,12 +135,7 @@ void Board::enableWakeupFromRTC(){
     #if defined(ARDUINO_PORTENTA_C33)
         lowPower->enableWakeupFromRTC();
     #elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_NICLA_VISION)
-       // If no wake up method is selected yet, set it to wake up from RTC
-        if(standbyType == LowPowerStandbyType::None){
-            standbyType = LowPowerStandbyType::UntilTimeElapsed;
-        } else if (standbyType == LowPowerStandbyType::UntilPinActivity){
-            standbyType = LowPowerStandbyType::UntilBothAreTrue;
-        }
+       standbyType |= StandbyType::untilTimeElapsed;
     #endif
 }
 
@@ -210,12 +199,12 @@ void Board::deepSleepUntilWakeupEvent(){
     #if defined(ARDUINO_PORTENTA_C33)
         lowPower -> deepSleep();
     #elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_NICLA_VISION)
-        if(standbyType == LowPowerStandbyType::UntilBothAreTrue)
-            LowPower.standbyM7(LowPowerStandbyType::UntilPinActivity | LowPowerStandbyType::UntilTimeElapsed, rtcWakeupDelay);
-        else if (standbyType == LowPowerStandbyType::UntilPinActivity)
-            LowPower.standbyM7(LowPowerStandbyType::UntilPinActivity);
-        else if (standbyType == LowPowerStandbyType::UntilTimeElapsed)
-           LowPower.standbyM7(LowPowerStandbyType::UntilTimeElapsed, rtcWakeupDelay);
+        if(standbyType == StandbyType::untilEither)
+            LowPower.standbyM7(LowPowerStandbyType::untilPinActivity | LowPowerStandbyType::untilTimeElapsed, rtcWakeupDelay);
+        else if (standbyType == StandbyType::untilPinActivity)
+            LowPower.standbyM7(LowPowerStandbyType::untilPinActivity);
+        else if (standbyType == StandbyType::untilTimeElapsed)
+           LowPower.standbyM7(LowPowerStandbyType::untilTimeElapsed, rtcWakeupDelay);
     #endif
 }
 

Diff for: src/Board.h

@@ -17,13 +17,22 @@
 #define CONTEXT_SW1 3 
 #define CONTEXT_SW2 4 
 
-enum class LowPowerStandbyType {
-    None = 0,
-    UntilPinActivity = 1,
-    UntilTimeElapsed = 2,
-    UntilBothAreTrue = 3
+enum class StandbyType : uint8_t {
+    none = 0,
+    untilPinActivity = 1,
+    untilTimeElapsed = 2,
+    untilEither = 3
+
 };
 
+inline constexpr StandbyType operator|(StandbyType x, StandbyType y){
+    return static_cast<StandbyType>(static_cast<int>(x) | static_cast<int>(y));
+}
+
+inline constexpr StandbyType operator|=(StandbyType& x, StandbyType y){
+    return x = x | y;
+}
+
 constexpr int EMPTY_REGISTER = 0xFF;
 
 /**
@@ -225,7 +234,7 @@ class Board {
         #if defined(ARDUINO_PORTENTA_C33)
             LowPower * lowPower;
         #elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_NICLA_VISION)
-            LowPowerStandbyType standbyType = LowPowerStandbyType::None;
+            StandbyType standbyType = StandbyType::none;
             RTCWakeupDelay rtcWakeupDelay = RTCWakeupDelay(0, 0, 0);
         #endif         
 };