ceres-sees-all/qmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2025-11-27 13:37:29 +00:00
commit 9acd127cc1
15 changed files with 1033 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

6
platforms/avr/flash.mk
View file

@ -5,10 +5,10 @@
# Autodetect teensy loader
ifndef TEENSY_LOADER_CLI
ifneq (, $(shell which teensy-loader-cli 2>/dev/null))
TEENSY_LOADER_CLI ?= teensy-loader-cli
else
ifneq (, $(shell which teensy_loader_cli 2>/dev/null))
TEENSY_LOADER_CLI ?= teensy_loader_cli
else
TEENSY_LOADER_CLI ?= teensy-loader-cli
endif
endif

6
platforms/chibios/flash.mk
View file

@ -77,10 +77,10 @@ st-flash: $(BUILD_DIR)/$(TARGET).hex sizeafter
# Autodetect teensy loader
ifndef TEENSY_LOADER_CLI
ifneq (, $(shell which teensy-loader-cli 2>/dev/null))
TEENSY_LOADER_CLI ?= teensy-loader-cli
else
ifneq (, $(shell which teensy_loader_cli 2>/dev/null))
TEENSY_LOADER_CLI ?= teensy_loader_cli
else
TEENSY_LOADER_CLI ?= teensy-loader-cli
endif
endif