diff options
author | Balz Guenat <balz.guenat@gmail.com> | 2017-08-07 21:54:06 +0200 |
---|---|---|
committer | Balz Guenat <balz.guenat@gmail.com> | 2017-08-07 21:54:06 +0200 |
commit | d18df8ef7a7e0528a29fdc96d4843ace54605121 (patch) | |
tree | 44f75b9bccd3efa130d622736726a5f1c83531f6 /keyboards/orthodox | |
parent | 308bec28bb76f4305d0f084252d7cf207f1b3d83 (diff) | |
parent | 933701c2129c0c585ecd8ba37c41b091a7dc687f (diff) | |
download | qmk_firmware-d18df8ef7a7e0528a29fdc96d4843ace54605121.tar.gz qmk_firmware-d18df8ef7a7e0528a29fdc96d4843ace54605121.zip |
Merge remote-tracking branch 'upstream/master' into bananasplit
# Conflicts:
# keyboards/bananasplit/Makefile
# keyboards/bananasplit/bananasplit.c
# keyboards/bananasplit/bananasplit.h
# keyboards/bananasplit/config.h
# keyboards/bananasplit/keymaps/default/keymap.c
# keyboards/bananasplit/rules.mk
Diffstat (limited to 'keyboards/orthodox')
-rw-r--r-- | keyboards/orthodox/readme.md | 2 | ||||
-rw-r--r-- | keyboards/orthodox/rules.mk | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/keyboards/orthodox/readme.md b/keyboards/orthodox/readme.md index 57e940b0f4..e1fbf94baf 100644 --- a/keyboards/orthodox/readme.md +++ b/keyboards/orthodox/readme.md @@ -96,7 +96,7 @@ the two halves, i.e. if your split keyboard has 3 rows in each half, then Flashing ------- -From the keymap directory run `make SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing. +From the `orthodox` directory run `make SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing. Example: `make rev2-default-avrdude` diff --git a/keyboards/orthodox/rules.mk b/keyboards/orthodox/rules.mk index dfcff1d902..3f40ff2f82 100644 --- a/keyboards/orthodox/rules.mk +++ b/keyboards/orthodox/rules.mk @@ -73,15 +73,3 @@ USE_I2C = yes SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes - -avrdude: build - ls /dev/tty* > /tmp/1; \ - echo "Reset your Pro Micro now"; \ - while [[ -z $$USB ]]; do \ - sleep 1; \ - ls /dev/tty* > /tmp/2; \ - USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \ - done; \ - avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex - -.PHONY: avrdude |