refactor: update STM32RTC interrupt callbacks and examples

Signed-off-by: Aymane Bahssain <aymane.bahssain@st.com>

Author: Aymane-ST

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(STM32RTC INTERFACE)
+add_library(STM32RTC_usage INTERFACE)
+
+target_include_directories(STM32RTC_usage INTERFACE
+  src
+)
+
+
+target_link_libraries(STM32RTC_usage INTERFACE
+  base_config
+)
+
+target_link_libraries(STM32RTC INTERFACE STM32RTC_usage)
+
+
+
+add_library(STM32RTC_bin OBJECT EXCLUDE_FROM_ALL
+  src/rtc.c
+  src/STM32RTC.cpp
+)
+target_link_libraries(STM32RTC_bin PUBLIC STM32RTC_usage)
+
+target_link_libraries(STM32RTC INTERFACE
+  STM32RTC_bin
+  $<TARGET_OBJECTS:STM32RTC_bin>
+)
+

examples/RTCReset/RTCReset.ino

@@ -56,7 +56,7 @@ static STM32RTC::AM_PM period = STM32RTC::AM;
 #define USER_BTN PA0
 #endif
 
-static uint8_t conv2d(const char* p) {
+uint8_t conv2d(const char* p) {
   uint8_t v = 0;
   if ('0' <= *p && *p <= '9')
     v = *p - '0';

examples/RTC_Seconds/RTC_Seconds.ino

@@ -100,7 +100,7 @@ void loop()
    Serial.printf("%02d %02d %02d\n", hrs, mn, sec);
   }
 #if defined(LED_BUILTIN)
-  digitalWrite(pin, toggling);
+  digitalWrite(pin, (PinStatus)toggling);
 #endif /* LED_BUILTIN */
   delay(1000);
 }

src/STM32RTC.cpp

@@ -303,7 +303,7 @@ void STM32RTC::disableAlarm(Alarm name)
   *        ALARM_A or ALARM_B if exists
   * @retval None
   */
-void STM32RTC::attachInterrupt(voidFuncPtr callback, Alarm name)
+void STM32RTC::attachInterrupt(voidFuncPtrParam callback, Alarm name)
 {
   attachInterrupt(callback, nullptr, name);
 }
@@ -316,7 +316,7 @@ void STM32RTC::attachInterrupt(voidFuncPtr callback, Alarm name)
   *        ALARM_A or ALARM_B if exists
   * @retval None
   */
-void STM32RTC::attachInterrupt(voidFuncPtr callback, void *data, Alarm name)
+void STM32RTC::attachInterrupt(voidFuncPtrParam callback, void *data, Alarm name)
 {
   attachAlarmCallback(callback, data, static_cast<alarm_t>(name));
 }
@@ -338,7 +338,7 @@ void STM32RTC::detachInterrupt(Alarm name)
   * @param callback: pointer to the callback
   * @retval None
   */
-void STM32RTC::attachSecondsInterrupt(voidFuncPtr callback)
+void STM32RTC::attachSecondsInterrupt(voidFuncPtrParam callback)
 {
   attachSecondsIrqCallback(callback);
 }
@@ -361,7 +361,7 @@ void STM32RTC::detachSecondsInterrupt(void)
   * @param callback: pointer to the callback
   * @retval None
   */
-void STM32RTC::attachSubSecondsUnderflowInterrupt(voidFuncPtr callback)
+void STM32RTC::attachSubSecondsUnderflowInterrupt(voidFuncPtrParam callback)
 {
   attachSubSecondsUnderflowIrqCallback(callback);
 }

src/STM32RTC.h

@@ -66,7 +66,6 @@
                                         |(STM32_RTC_VERSION_PATCH << 8U )\
                                         |(STM32_RTC_VERSION_EXTRA))
 
-typedef void(*voidFuncPtr)(void *);
 
 #if defined(RCC_RTC_WDG_BLEWKUP_CLKSOURCE_HSI64M_DIV2048) || defined(RCC_RTC_WDG_SUBG_LPAWUR_LCD_LCSC_CLKSOURCE_DIV512)
 #define IS_CLOCK_SOURCE(SRC) (((SRC) == STM32RTC::LSI_CLOCK) || ((SRC) == STM32RTC::LSE_CLOCK) ||\
@@ -158,19 +157,19 @@ class STM32RTC {
     void enableAlarm(Alarm_Match match, Alarm name = ALARM_A);
     void disableAlarm(Alarm name = ALARM_A);
 
-    void attachInterrupt(voidFuncPtr callback, Alarm name);
-    void attachInterrupt(voidFuncPtr callback, void *data = nullptr, Alarm name = ALARM_A);
+    void attachInterrupt(voidFuncPtrParam callback, Alarm name);
+    void attachInterrupt(voidFuncPtrParam callback, void *data = nullptr, Alarm name = ALARM_A);
     void detachInterrupt(Alarm name = ALARM_A);
 
 #ifdef ONESECOND_IRQn
     // Other mcu than stm32F1 will use the WakeUp feature to interrupt each second.
-    void attachSecondsInterrupt(voidFuncPtr callback);
+    void attachSecondsInterrupt(voidFuncPtrParam callback);
     void detachSecondsInterrupt(void);
 
 #endif /* ONESECOND_IRQn */
 #ifdef STM32WLxx
     // STM32WLxx has a dedicated IRQ
-    void attachSubSecondsUnderflowInterrupt(voidFuncPtr callback);
+    void attachSubSecondsUnderflowInterrupt(voidFuncPtrParam callback);
     void detachSubSecondsUnderflowInterrupt(void);
 #endif /* STM32WLxx */
     // Kept for compatibility: use STM32LowPower library.