From b6dd533face2b7e0531f56f4e238f9d2f6fe38fc Mon Sep 17 00:00:00 2001 From: Francois Ramu Date: Mon, 22 Nov 2021 11:25:47 +0100 Subject: [PATCH 1/2] chore: adapt the RTC nonReg test in case of stm32F1xx With the stm32F1 device, the set/get prediv functions use a 32bit param. Only the Asynchronous prescaler exists. Signed-off-by: Francois Ramu --- examples/NonReg/RTC/RTC_Tests/RTC_Tests.ino | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/examples/NonReg/RTC/RTC_Tests/RTC_Tests.ino b/examples/NonReg/RTC/RTC_Tests/RTC_Tests.ino index 34c2599..955e8d1 100644 --- a/examples/NonReg/RTC/RTC_Tests/RTC_Tests.ino +++ b/examples/NonReg/RTC/RTC_Tests/RTC_Tests.ino @@ -38,7 +38,11 @@ static const char* mytime = __TIME__; clk = RTCCLK / ((predA +1) * (predS +1)) clk = 1000000 / ((99 +1) * (9999+1)) = 1 Hz */ +#if defined(STM32F1xx) +static uint32_t userPredA = 99; +#else static int8_t userPredA = 99; +#endif /* STM32F1xx */ static int16_t userPredS = 9999; /* */ @@ -105,9 +109,15 @@ void loop() } break; } + +#if defined(STM32F1xx) + Serial.println("Testing only asynchronous prescaler setting"); + uint32_t a; +#else Serial.println("Testing asynchronous and synchronous prescaler setting"); int8_t a; - int16_t s; +#endif /* STM32F1xx */ + int16_t s = 0; rtc.getPrediv(&a, &s); Serial.print("Async/Sync for default LSI clock: "); Serial.printf("%i/%i\n", a, s); From 8f4e3574c8f67954441c0e2f41e40dfbc0a55290 Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Tue, 23 Nov 2021 16:22:27 +0100 Subject: [PATCH 2/2] fix: typo and Arduino formatting Signed-off-by: Frederic Pillon --- examples/NonReg/RTC/RTC_Tests/RTC_Tests.ino | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/examples/NonReg/RTC/RTC_Tests/RTC_Tests.ino b/examples/NonReg/RTC/RTC_Tests/RTC_Tests.ino index 955e8d1..d034413 100644 --- a/examples/NonReg/RTC/RTC_Tests/RTC_Tests.ino +++ b/examples/NonReg/RTC/RTC_Tests/RTC_Tests.ino @@ -59,9 +59,9 @@ static STM32RTC::Hour_Format hourFormat = STM32RTC::HOUR_24; static STM32RTC::AM_PM period = STM32RTC::AM; #ifndef STM32F1xx - static STM32RTC::Alarm_Match SS_MATCH = STM32RTC::MATCH_SS; - static STM32RTC::Alarm_Match MMSS_MATCH = STM32RTC::MATCH_MMSS; - static STM32RTC::Alarm_Match HHMMSS_MATCH = STM32RTC::MATCH_HHMMSS; +static STM32RTC::Alarm_Match SS_MATCH = STM32RTC::MATCH_SS; +static STM32RTC::Alarm_Match MMSS_MATCH = STM32RTC::MATCH_MMSS; +static STM32RTC::Alarm_Match HHMMSS_MATCH = STM32RTC::MATCH_HHMMSS; #endif static STM32RTC::Alarm_Match DHHMMSS_MATCH = STM32RTC::MATCH_DHHMMSS; @@ -128,11 +128,7 @@ void loop() rtc.end(); if (clkSource == rtc.HSE_CLOCK) { - Serial.print("User Async/Sync set to "); - Serial.print(userPredA); - Serial.print("/"); - Serial.print(userPredS); - Serial.print(": "); + Serial.printf("User Async/Sync set to %i/%i:", userPredA, userPredS); rtc.setPrediv(userPredA, userPredS); rtc_config(clkSource, rtc.HOUR_24, mydate, mytime); rtc.getPrediv(&a, &s); @@ -140,7 +136,7 @@ void loop() printDateTime(10, 1000, false); } - Serial.print("User Async/Sync reset use the computed one: "); + Serial.print("User Async/Sync reset to use the computed one: "); rtc.setPrediv(-1, -1); rtc_config(clkSource, rtc.HOUR_24, mydate, mytime); rtc.getPrediv(&a, &s); @@ -264,4 +260,4 @@ void alarmMatch(void *data) Serial.println("Unknown STM32RTC::Alarm_Match type"); break; } -} \ No newline at end of file +}