Skip to content

Commit

Permalink
boards/wemos-zero: fix flashing and doc
Browse files Browse the repository at this point in the history
Fix flashing with `MOST_RECENT_PORT=1` by detecting the board when
either in RIOT mode or in bootloader mode (which matches different
USB vendor and model strings).

Support for programming with the nrf52-u2f bootloader was dropped
apparently, but the documentation still recommends that over the
Arduino Bootloader. This brings doc and code in sync.
  • Loading branch information
maribu committed Dec 13, 2023
1 parent 4370d93 commit 1d11a2a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
15 changes: 13 additions & 2 deletions boards/wemos-zero/Makefile.include
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
CFLAGS += -DBOOTLOADER_UF2

# Include all definitions for flashing with bossa other USB
include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.include
include $(RIOTBOARD)/common/arduino-zero/Makefile.include

# Depending on whether the board is running RIOT or the bootloader, it has
# registers using a different vendor and model. We try to detect either.
TTY_BOARD_FILTER := --model $(BOARD) --vendor 'RIOT-os\.org'
PROG_TTY_BOARD_FILTER := --vendor 'Arduino LLC' --model 'Arduino Zero'
TTY_SELECT_CMD := $(RIOTTOOLS)/usb-serial/ttys.py \
--most-recent \
--format path serial \
$(TTY_BOARD_FILTER) || \
$(RIOTTOOLS)/usb-serial/ttys.py \
--most-recent \
--format path serial \
$(PROG_TTY_BOARD_FILTER_CLONE)
3 changes: 1 addition & 2 deletions boards/wemos-zero/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ Metro M0 Express should also work with board definition.

## Flashing the device

Assuming the [UF2 Bootloader](https://github.com/microsoft/uf2-samdx1) is
installed, just run:
Assuming the Arduino Bootloader is installed, just run:

```
make BOARD=wemos-zero flash
Expand Down

0 comments on commit 1d11a2a

Please sign in to comment.