chore: update check on STM32 core and rtc versions

since lowpower bsp was moved to the library, STM32LowPower API's
are no more compatible with the one provided within old
core version (<2.0.0).

Note: same for STM32RTC

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

examples/AlarmTimedWakeup/AlarmTimedWakeup.ino

@@ -17,14 +17,9 @@
 /* Get the rtc object */
 STM32RTC& rtc = STM32RTC::getInstance();
 
-#if defined(STM32_RTC_VERSION) && (STM32_RTC_VERSION  >= 0x01010000)
 /* Change this value to set alarm match offset in millisecond */
 /* Note that STM32F1xx does not manage subsecond only second */
 static uint32_t atime = 567;
-#else
-// Time in second between blink
-static uint32_t atime = 1;
-#endif
 
 // Declare it volatile since it's incremented inside an interrupt
 volatile int alarmMatch_counter = 0;
@@ -73,7 +68,6 @@ void alarmMatch(void* data)
   // This function will be called once on device wakeup
   // You can do some little operations here (like changing variables which will be used in the loop)
   // Remember to avoid calling delay() and long running functions since this functions executes in interrupt context
-#if defined(STM32_RTC_VERSION) && (STM32_RTC_VERSION  >= 0x01010000)
   uint32_t epoc;
   uint32_t epoc_ms;
   uint32_t sec = 0;
@@ -103,16 +97,4 @@ void alarmMatch(void* data)
 #endif
   alarmMatch_counter++;
   rtc.setAlarmEpoch(epoc + sec, STM32RTC::MATCH_SS, epoc_ms);
-#else
-  uint32_t sec = 1;
-  if(data != NULL) {
-    sec = *(uint32_t*)data;
-    // Minimum is 1 second
-    if (sec == 0){
-      sec = 1;
-    }
-  }
-  alarmMatch_counter++;
-  rtc.setAlarmEpoch( rtc.getEpoch() + sec);
-#endif
 }

src/STM32LowPower.cpp

@@ -206,7 +206,6 @@ void STM32LowPower::programRtcWakeUp(uint32_t ms, LP_Mode lp_mode)
     // Convert millisecond to second
     sec = ms / 1000;
 
-#if defined(STM32_RTC_VERSION) && (STM32_RTC_VERSION  >= 0x01010000)
     uint32_t epoc_ms;
     ms = ms % 1000;
     epoc = rtc.getEpoch(&epoc_ms);
@@ -219,14 +218,5 @@ void STM32LowPower::programRtcWakeUp(uint32_t ms, LP_Mode lp_mode)
     }
 
     rtc.setAlarmEpoch(epoc + sec, STM32RTC::MATCH_DHHMMSS, epoc_ms);
-#else
-    // Minimum is 1 second
-    if (sec == 0) {
-      sec = 1;
-    }
-    epoc = rtc.getEpoch();
-
-    rtc.setAlarmEpoch(epoc + sec);
-#endif
   }
 }

src/STM32LowPower.h

@@ -39,9 +39,7 @@
 
 #include <Arduino.h>
 
-#if defined(STM32_CORE_VERSION) && (STM32_CORE_VERSION  > 0x01090000)
-  #include "low_power.h"
-#endif
+#include "low_power.h"
 
 // Check if PWR HAL enable in variants/board_name/stm32yzxx_hal_conf.h
 #ifndef HAL_PWR_MODULE_ENABLED

src/low_power.c

@@ -22,8 +22,7 @@
 #include "low_power.h"
 #include "stm32yyxx_ll_pwr.h"
 
-#if defined(STM32_CORE_VERSION) && (STM32_CORE_VERSION  > 0x01090000) \
- && defined(HAL_PWR_MODULE_ENABLED) && !defined(HAL_PWR_MODULE_ONLY)
+#if defined(HAL_PWR_MODULE_ENABLED) && !defined(HAL_PWR_MODULE_ONLY)
 
 #if defined(HAL_UART_MODULE_ENABLED) && !defined(HAL_UART_MODULE_ONLY) \
   && (defined(UART_IT_WUF) || defined(LPUART1_BASE))

src/low_power.h

@@ -41,8 +41,7 @@
 #include "stm32_def.h"
 #include "uart.h"
 
-#if defined(STM32_CORE_VERSION) && (STM32_CORE_VERSION  > 0x01090000) &&\
-    defined(HAL_PWR_MODULE_ENABLED) && !defined(HAL_PWR_MODULE_ONLY)
+#if defined(HAL_PWR_MODULE_ENABLED) && !defined(HAL_PWR_MODULE_ONLY)
 
 #ifdef __cplusplus
 extern "C" {