-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]> Co-authored-by: Marian Buschsieweke <[email protected]> Co-authored-by: Gunar Schorcht <[email protected]>
- Loading branch information
Showing
3 changed files
with
7 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters