Update STM32LowPower for ArduinoCore-API integration

.github/workflows/Continuous-Integration.yml

@@ -22,6 +22,8 @@ jobs:
     # First of all, clone the repo using the checkout action.
     - name: Checkout
       uses: actions/checkout@main
+      with:
+        submodules: true
 
     - name: Compilation
       id: Compile

CMakeLists.txt

@@ -0,0 +1,31 @@
+# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
+# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
+cmake_minimum_required(VERSION 3.21)
+
+add_library(STM32LowPower INTERFACE)
+add_library(STM32LowPower_usage INTERFACE)
+
+target_include_directories(STM32LowPower_usage INTERFACE
+  src
+)
+
+
+target_link_libraries(STM32LowPower_usage INTERFACE
+  base_config
+)
+
+target_link_libraries(STM32LowPower INTERFACE STM32LowPower_usage)
+
+
+
+add_library(STM32LowPower_bin OBJECT EXCLUDE_FROM_ALL
+  src/low_power.c
+  src/STM32LowPower.cpp
+)
+target_link_libraries(STM32LowPower_bin PUBLIC STM32LowPower_usage)
+
+target_link_libraries(STM32LowPower INTERFACE
+  STM32LowPower_bin
+  $<TARGET_OBJECTS:STM32LowPower_bin>
+)
+

src/STM32LowPower.cpp

@@ -145,7 +145,7 @@ void STM32LowPower::shutdown(uint32_t ms)
   *         In case of SHUTDOWN_MODE only, Wakeup pin capability is activated
   * @retval None
   */
-void STM32LowPower::attachInterruptWakeup(uint32_t pin, voidFuncPtrVoid callback, uint32_t mode, LP_Mode LowPowerMode)
+void STM32LowPower::attachInterruptWakeup(pin_size_t pin, voidFuncPtr callback, PinStatus mode, LP_Mode LowPowerMode)
 {
   attachInterrupt(pin, callback, mode);
 
@@ -166,7 +166,7 @@ void STM32LowPower::attachInterruptWakeup(uint32_t pin, voidFuncPtrVoid callback
   *                   mode.
   * @retval None
   */
-void STM32LowPower::enableWakeupFrom(HardwareSerial *serial, voidFuncPtrVoid callback)
+void STM32LowPower::enableWakeupFrom(HardwareSerial *serial, voidFuncPtr callback)
 {
   if (serial != NULL) {
     _serial = &(serial->_serial);
@@ -184,7 +184,7 @@ void STM32LowPower::enableWakeupFrom(HardwareSerial *serial, voidFuncPtrVoid cal
   * @param  data: optional pointer to callback data parameters (default NULL).
   * @retval None
   */
-void STM32LowPower::enableWakeupFrom(STM32RTC *rtc, voidFuncPtr callback, void *data)
+void STM32LowPower::enableWakeupFrom(STM32RTC *rtc, voidFuncPtrParam callback, void *data)
 {
   if (rtc == NULL) {
     rtc = &(STM32RTC::getInstance());

src/STM32LowPower.h

@@ -55,7 +55,6 @@ enum LP_Mode : uint8_t {
   SHUTDOWN_MODE
 };
 
-typedef void (*voidFuncPtrVoid)(void) ;
 
 class STM32LowPower {
   public:
@@ -89,10 +88,10 @@ class STM32LowPower {
       shutdown((uint32_t)ms);
     }
 #endif
-    void attachInterruptWakeup(uint32_t pin, voidFuncPtrVoid callback, uint32_t mode, LP_Mode LowPowerMode = SHUTDOWN_MODE);
+    void attachInterruptWakeup(pin_size_t pin, voidFuncPtr callback, PinStatus mode, LP_Mode LowPowerMode = SHUTDOWN_MODE);
 
-    void enableWakeupFrom(HardwareSerial *serial, voidFuncPtrVoid callback);
-    void enableWakeupFrom(STM32RTC *rtc, voidFuncPtr callback, void *data = NULL);
+    void enableWakeupFrom(HardwareSerial *serial, voidFuncPtr callback);
+    void enableWakeupFrom(STM32RTC *rtc, voidFuncPtrParam callback, void *data = NULL);
 
   private:
     bool _configured;     // Low Power mode initialization status

src/low_power.c

@@ -18,7 +18,6 @@
   ******************************************************************************
   */
 
-#include "Arduino.h"
 #include "low_power.h"
 #include "stm32yyxx_ll_cortex.h"
 #include "stm32yyxx_ll_pwr.h"
@@ -202,7 +201,7 @@ void LowPower_init()
   * @param  mode: pin mode (edge or state). The configuration have to be compatible.
   * @retval None
   */
-void LowPower_EnableWakeUpPin(uint32_t pin, uint32_t mode)
+void LowPower_EnableWakeUpPin(pin_size_t pin, PinStatus mode)
 {
   PinName p = digitalPinToPinName(pin);
 #if defined(PWR_WAKEUP_SELECT_0) || defined(PWR_WAKEUP1_SOURCE_SELECTION_0)
@@ -975,10 +974,10 @@ void LowPower_shutdown(bool isRTC)
   *         with which low power mode the UART is compatible.
   * Warning This function will change UART clock source to HSI
   * @param  serial: pointer to serial
-  * @param  FuncPtr: pointer to callback
+  * @param  callback: pointer to callback
   * @retval None
   */
-void LowPower_EnableWakeUpUart(serial_t *serial, void (*FuncPtr)(void))
+void LowPower_EnableWakeUpUart(serial_t *serial, voidFuncPtr callback)
 {
 #if defined(UART_WKUP_SUPPORT)
 #ifdef IS_UART_WAKEUP_SELECTION
@@ -1009,7 +1008,7 @@ void LowPower_EnableWakeUpUart(serial_t *serial, void (*FuncPtr)(void))
   UNUSED(serial);
 #endif
   /* Save callback */
-  WakeUpUartCb = FuncPtr;
+  WakeUpUartCb = callback;
 }
 
 /**

src/low_power.h

@@ -40,6 +40,7 @@
 /* Includes ------------------------------------------------------------------*/
 #include "stm32_def.h"
 #include "uart.h"
+#include "Arduino.h"
 
 #if defined(HAL_PWR_MODULE_ENABLED) && !defined(HAL_PWR_MODULE_ONLY)
 
@@ -53,8 +54,8 @@ extern "C" {
 /* Exported functions ------------------------------------------------------- */
 
 void LowPower_init();
-void LowPower_EnableWakeUpPin(uint32_t pin, uint32_t mode);
-void LowPower_EnableWakeUpUart(serial_t *serial, void (*FuncPtr)(void));
+void LowPower_EnableWakeUpPin(pin_size_t pin, PinStatus mode);
+void LowPower_EnableWakeUpUart(serial_t *serial, voidFuncPtr callback);
 void LowPower_sleep(uint32_t regulator);
 void LowPower_stop(serial_t *obj);
 void LowPower_standby();