Use new target identifier for M4

Author: sebromero

src/Battery.h

@@ -269,7 +269,7 @@ class Battery {
 
         #if defined(ARDUINO_PORTENTA_C33)
             TwoWire *wire = &Wire3;
-        #elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4)
+        #elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_GENERIC_STM32H747_M4)
             TwoWire *wire = &Wire1;
         #elif defined(ARDUINO_NICLA_VISION)
             TwoWire *wire = &Wire1;

src/Board.cpp

@@ -117,7 +117,7 @@ void Board::enableWakeupFromPin(uint8_t pin, PinStatus direction){
 }
 #endif
 
-#if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_NICLA_VISION)
+#if defined(ARDUINO_PORTENTA_H7) || defined(ARDUINO_NICLA_VISION)
 void Board::enableWakeupFromPin(){
     standbyType |= StandbyType::untilPinActivity;
 }
@@ -160,7 +160,7 @@ void Board::enableWakeupFromRTC(uint32_t hours, uint32_t minutes, uint32_t secon
 }
 #endif
 
-#if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_NICLA_VISION)
+#if defined(ARDUINO_PORTENTA_H7) || defined(ARDUINO_NICLA_VISION)
 void Board::enableWakeupFromRTC(uint32_t hours, uint32_t minutes, uint32_t seconds){
     standbyType |= StandbyType::untilTimeElapsed;
     wakeupDelayHours = hours;
@@ -178,7 +178,9 @@ void Board::sleepUntilWakeupEvent(){
 void Board::standByUntilWakeupEvent(){
     #if defined(ARDUINO_PORTENTA_C33)
         lowPower -> deepSleep();
-    #elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_NICLA_VISION)
+    #elif defined(ARDUINO_GENERIC_STM32H747_M4)
+        LowPower.standbyM4();
+    #elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
         RTCWakeupDelay rtcWakeupDelay = RTCWakeupDelay(wakeupDelayHours, wakeupDelayMinutes, wakeupDelaySeconds);
         if(standbyType == StandbyType::untilEither)
             LowPower.standbyM7(LowPowerStandbyType::untilPinActivity | LowPowerStandbyType::untilTimeElapsed, rtcWakeupDelay);
@@ -197,7 +199,7 @@ void Board::setAllPeripheralsPower(bool on){
         // I2C needs to be shut down because the PMIC would still try
         // to communicate with the MCU.
         Wire3.end();
-    #else if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4)
+    #else if defined(ARDUINO_PORTENTA_H7)
     // TODO Can we extract this into functions?
     if(on){
         PMIC.getControl() -> turnLDO2On(Ldo2Mode::Normal);

src/Board.h

@@ -5,11 +5,12 @@
 #include <Arduino_PF1550.h>
 #include "WireUtils.h"
 
+#define ARDUINO_PORTENTA_H7 defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_GENERIC_STM32H747_M4)
 
 #if defined(ARDUINO_PORTENTA_C33) 
     #include "Arduino_Portenta_C33_LowPower.h"
     #include "RTC.h"
-#elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_NICLA_VISION)
+#elif defined(ARDUINO_PORTENTA_H7) || defined(ARDUINO_NICLA_VISION)
     #include "Arduino_LowPowerPortentaH7.h"
 #endif 
 
@@ -92,7 +93,7 @@ class Board {
         void setCameraPowerEnabled(bool enabled); 
 
 
-        #if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4)
+        #if defined(ARDUINO_PORTENTA_H7)
 
         /**
          * Enables wakeup from pin GPIO0 on Portenta H7.
@@ -132,7 +133,7 @@ class Board {
         void enableWakeupFromRTC(uint32_t hours, uint32_t minutes, uint32_t seconds, void (* const callbackFunction)() = nullptr, RTClock * rtc = &RTC);
         #endif
 
-        #if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4)
+        #if defined(ARDUINO_PORTENTA_H7)
         void enableWakeupFromRTC(uint32_t hours, uint32_t minutes, uint32_t seconds);
         #endif