STM32RTC library configure the alarm depending on the MIX mode

In case the RTC is running in MIX mode (BINary and calendar),
the subsecond register is a 32-bit value (and not msec)

Author: FRASTM

src/STM32RTC.cpp

@@ -237,13 +237,27 @@ void STM32RTC::enableAlarm(Alarm_Match match, Alarm name)
         RTC_StopAlarm(::ALARM_A);
       }
       break;
+    case MATCH_SUBSEC:
+      /* force _alarmday to 0 to go to the right alarm config in MIX mode */
+#ifdef RTC_ALARM_B
+      if (name == ALARM_B) {
+        RTC_StartAlarm(::ALARM_B, 0, _alarmBHours, _alarmBMinutes, _alarmBSeconds,
+                       (UINT32_MAX - _alarmBSubSeconds), (_alarmBPeriod == AM) ? HOUR_AM : HOUR_PM,
+                       static_cast<uint8_t>(32UL));
+      } else
+#endif
+      {
+        RTC_StartAlarm(::ALARM_A, 0, _alarmHours, _alarmMinutes, _alarmSeconds,
+                       (UINT32_MAX -_alarmSubSeconds), (_alarmPeriod == AM) ? HOUR_AM : HOUR_PM,
+                       static_cast<uint8_t>(32UL));
+      }
+      break;
     case MATCH_YYMMDDHHMMSS://kept for compatibility
     case MATCH_MMDDHHMMSS:  //kept for compatibility
     case MATCH_DHHMMSS:
     case MATCH_HHMMSS:
     case MATCH_MMSS:
     case MATCH_SS:
-    case MATCH_SUBSEC:
 #ifdef RTC_ALARM_B
       if (name == ALARM_B) {
         RTC_StartAlarm(::ALARM_B, _alarmBDay, _alarmBHours, _alarmBMinutes, _alarmBSeconds,
@@ -845,16 +859,30 @@ void STM32RTC::setDate(uint8_t weekDay, uint8_t day, uint8_t month, uint8_t year
   */
 void STM32RTC::setAlarmSubSeconds(uint32_t subSeconds, Alarm name)
 {
-  if (subSeconds < 1000) {
+
+  if (getRTCMode() == MODE_MIX) {
 #ifdef RTC_ALARM_B
-    if (name == ALARM_B) {
-      _alarmBSubSeconds = subSeconds;
-    }
+      if (name == ALARM_B) {
+        _alarmBSubSeconds = subSeconds;
+      }
 #else
-    UNUSED(name);
+      UNUSED(name);
 #endif
-    {
-      _alarmSubSeconds = subSeconds;
+      {
+        _alarmSubSeconds = subSeconds;
+      }
+  } else {
+    if (subSeconds < 1000) {
+#ifdef RTC_ALARM_B
+      if (name == ALARM_B) {
+        _alarmBSubSeconds = subSeconds;
+      }
+#else
+      UNUSED(name);
+#endif
+      {
+        _alarmSubSeconds = subSeconds;
+      }
     }
   }
 }
@@ -1268,7 +1296,8 @@ bool STM32RTC::isAlarmEnabled(Alarm name)
 void STM32RTC::syncTime(void)
 {
   hourAM_PM_t p = HOUR_AM;
-  RTC_GetTime(&_hours, &_minutes, &_seconds, &_subSeconds, &p);
+  rtcMode_t mode = (getRTCMode() == MODE_MIX) ? MODE_BINARY_MIX : MODE_BINARY_ONLY;
+  RTC_GetTime(mode, &_hours, &_minutes, &_seconds, &_subSeconds, &p);
   _hoursPeriod = (p == HOUR_AM) ? AM : PM;
 }
 
@@ -1292,18 +1321,19 @@ void STM32RTC::syncDate(void)
 void STM32RTC::syncAlarmTime(Alarm name)
 {
   hourAM_PM_t p = HOUR_AM;
+  rtcMode_t mode = (getRTCMode() == MODE_MIX) ? MODE_BINARY_MIX : MODE_BINARY_ONLY;
   uint8_t match;
 #ifdef RTC_ALARM_B
   if (name == ALARM_B) {
-    RTC_GetAlarm(::ALARM_B, &_alarmBDay, &_alarmBHours, &_alarmBMinutes, &_alarmBSeconds,
+    RTC_GetAlarm(mode, ::ALARM_B, &_alarmBDay, &_alarmBHours, &_alarmBMinutes, &_alarmBSeconds,
                  &_alarmBSubSeconds, &p, &match);
     _alarmBPeriod = (p == HOUR_AM) ? AM : PM;
   } else
 #else
   UNUSED(name);
 #endif
   {
-    RTC_GetAlarm(::ALARM_A, &_alarmDay, &_alarmHours, &_alarmMinutes, &_alarmSeconds,
+    RTC_GetAlarm(mode, ::ALARM_A, &_alarmDay, &_alarmHours, &_alarmMinutes, &_alarmSeconds,
                  &_alarmSubSeconds, &p, &match);
     _alarmPeriod = (p == HOUR_AM) ? AM : PM;
   }