aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c2
-rw-r--r--readme.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c b/os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c
index 9fe6417b2..df4b7e764 100644
--- a/os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c
+++ b/os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c
@@ -137,7 +137,7 @@ static void rtc_decode(uint32_t tv_sec,
t = localtime_r((time_t *)&(tv_sec), &tim);
osalDbgAssert(t != NULL, "conversion failed");
#else
- struct tm *t = localtime(&tv_sec);
+ t = localtime(&tv_sec);
memcpy(&tim, t, sizeof(struct tm));
#endif
diff --git a/readme.txt b/readme.txt
index b369ab8cc..c71db4f1a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -161,6 +161,8 @@
- RT: Merged RT4.
- NIL: Merged NIL2.
- NIL: Added STM32F7 demo.
+- HAL: Duplicated variable definition in STM32 RTCv1 driver (bug #845)
+ (backported to 16.1.9).
- HAL: Fixed wrong ARR initialization in STM32 GPT driver (bug #843)(backported
to 16.1.9).
- HAL: Fixed wrong configuration in STM32L4xx GPT-ADC demo (bug #842)(backported