Merge #19806 #19814

bors[bot] · benpicco · maribu · web-flow · commit 7dd7d1e3a771 · 2023-07-12T20:03:13.000Z
19806: ztimer/periodic: remove timer on init if already running r=kaspar030 a=benpicco 19814: boards/sipeed-longan-nano: revert default to variant with TFT r=benpicco a=gschorcht ### Contribution description This PR reverts commit 69fb00b to fix CI compilation. ### Testing procedure Green CI with full build. ### Issues/PRs references Co-authored-by: Benjamin Valentin <benjamin.valentin@ml-pa.com> Co-authored-by: Marian Buschsieweke <marian.buschsieweke@posteo.net> Co-authored-by: Gunar Schorcht <gunar@schorcht.net>
diff --git a/boards/sipeed-longan-nano/Kconfig b/boards/sipeed-longan-nano/Kconfig
@@ -38,7 +38,7 @@ menu "Sipeed Longan Nano Board Configuration"
 
     config SIPEED_LONGAN_NANO_WITH_TFT
         bool "Board with TFT display"
-        default y
+        default y if MODULE_DISP_DEV
         select HAVE_ST7735
         help
             Indicates that a Sipeed Longan Nano board with TFT display is used.
diff --git a/boards/sipeed-longan-nano/Makefile.include b/boards/sipeed-longan-nano/Makefile.include
@@ -1,3 +1,8 @@
 PORT_LINUX ?= /dev/ttyACM0
 PROGRAMMER ?= dfu-util
+
+ifneq (,$(filter st7735,$(USEMODULE)))
+  CFLAGS += '-DCONFIG_SIPEED_LONGAN_NANO_WITH_TFT=1'
+endif
+
 include $(RIOTBOARD)/common/gd32v/Makefile.include
diff --git a/sys/ztimer/periodic.c b/sys/ztimer/periodic.c
@@ -57,6 +57,7 @@ void ztimer_periodic_init(ztimer_clock_t *clock, ztimer_periodic_t *timer,
                           bool (*callback)(
                               void *), void *arg, uint32_t interval)
 {
+    ztimer_remove(clock, &timer->timer);
     *timer =
         (ztimer_periodic_t){ .clock = clock, .interval = interval,
                              .callback = callback, .arg = arg,

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ void ztimer_periodic_init(ztimer_clock_t clock, ztimer_periodic_t timer,`
`57`	`57`	`bool (*callback)(`
`58`	`58`	`void ), void arg, uint32_t interval)`
`59`	`59`	`{`
	`60`	`+ ztimer_remove(clock, &timer->timer);`
`60`	`61`	`*timer =`
`61`	`62`	`(ztimer_periodic_t){ .clock = clock, .interval = interval,`
`62`	`63`	`.callback = callback, .arg = arg,`