@@ -38,7 +38,11 @@ static const char* mytime = __TIME__;
38
38
clk = RTCCLK / ((predA +1) * (predS +1))
39
39
clk = 1000000 / ((99 +1) * (9999+1)) = 1 Hz
40
40
*/
41
+ #if defined(STM32F1xx)
42
+ static uint32_t userPredA = 99 ;
43
+ #else
41
44
static int8_t userPredA = 99 ;
45
+ #endif /* STM32F1xx */
42
46
static int16_t userPredS = 9999 ;
43
47
44
48
/* */
@@ -55,9 +59,9 @@ static STM32RTC::Hour_Format hourFormat = STM32RTC::HOUR_24;
55
59
static STM32RTC::AM_PM period = STM32RTC::AM;
56
60
57
61
#ifndef STM32F1xx
58
- static STM32RTC::Alarm_Match SS_MATCH = STM32RTC::MATCH_SS;
59
- static STM32RTC::Alarm_Match MMSS_MATCH = STM32RTC::MATCH_MMSS;
60
- static STM32RTC::Alarm_Match HHMMSS_MATCH = STM32RTC::MATCH_HHMMSS;
62
+ static STM32RTC::Alarm_Match SS_MATCH = STM32RTC::MATCH_SS;
63
+ static STM32RTC::Alarm_Match MMSS_MATCH = STM32RTC::MATCH_MMSS;
64
+ static STM32RTC::Alarm_Match HHMMSS_MATCH = STM32RTC::MATCH_HHMMSS;
61
65
#endif
62
66
static STM32RTC::Alarm_Match DHHMMSS_MATCH = STM32RTC::MATCH_DHHMMSS;
63
67
@@ -105,9 +109,15 @@ void loop()
105
109
}
106
110
break ;
107
111
}
112
+
113
+ #if defined(STM32F1xx)
114
+ Serial.println (" Testing only asynchronous prescaler setting" );
115
+ uint32_t a;
116
+ #else
108
117
Serial.println (" Testing asynchronous and synchronous prescaler setting" );
109
118
int8_t a;
110
- int16_t s;
119
+ #endif /* STM32F1xx */
120
+ int16_t s = 0 ;
111
121
rtc.getPrediv (&a, &s);
112
122
Serial.print (" Async/Sync for default LSI clock: " );
113
123
Serial.printf (" %i/%i\n " , a, s);
@@ -118,19 +128,15 @@ void loop()
118
128
rtc.end ();
119
129
120
130
if (clkSource == rtc.HSE_CLOCK ) {
121
- Serial.print (" User Async/Sync set to " );
122
- Serial.print (userPredA);
123
- Serial.print (" /" );
124
- Serial.print (userPredS);
125
- Serial.print (" : " );
131
+ Serial.printf (" User Async/Sync set to %i/%i:" , userPredA, userPredS);
126
132
rtc.setPrediv (userPredA, userPredS);
127
133
rtc_config (clkSource, rtc.HOUR_24 , mydate, mytime);
128
134
rtc.getPrediv (&a, &s);
129
135
Serial.printf (" %i/%i\n " , a, s);
130
136
printDateTime (10 , 1000 , false );
131
137
}
132
138
133
- Serial.print (" User Async/Sync reset use the computed one: " );
139
+ Serial.print (" User Async/Sync reset to use the computed one: " );
134
140
rtc.setPrediv (-1 , -1 );
135
141
rtc_config (clkSource, rtc.HOUR_24 , mydate, mytime);
136
142
rtc.getPrediv (&a, &s);
@@ -254,4 +260,4 @@ void alarmMatch(void *data)
254
260
Serial.println (" Unknown STM32RTC::Alarm_Match type" );
255
261
break ;
256
262
}
257
- }
263
+ }
0 commit comments