diff options
| author | tmk <hasu@tmk-kbd.com> | 2015-04-28 11:27:10 +0900 |
|---|---|---|
| committer | tmk <hasu@tmk-kbd.com> | 2015-04-28 11:27:10 +0900 |
| commit | 4d116a04e94cf0d19317d5b44e4fa9f34a3e5594 (patch) | |
| tree | 3a2c044bec35111604aedfd024ab2689b3f40c7c /rules.mk | |
| parent | 1fe4406f374291ab2e86e95a97341fd9c475fcb8 (diff) | |
Squashed 'tmk_core/' changes from b9e0ea0..caca2c0
caca2c0 Add mouse support to ADB
5b0835a Merge commit '1fe4406f374291ab2e86e95a97341fd9c475fcb8'
f2f7556 Remove unneeded tap delays #201
8124195 Fix URL of HID Usage Tables pdf
0bb4679 Fix typo of doc/keycode.txt
b24fa1a Fix handling of consumer usage #199
6ae1a3d Improve anti-ghosting behavior for fast typing
a4c9763 Fix dfu-programmer parameters
b62b3f2 Move ring_buffer.h file
6ec424f Fix debug print
502fb0c Fix ibm4704 protocol with using interrupt
git-subtree-dir: tmk_core
git-subtree-split: caca2c01553394d959550034c817520d575c7fa0
Diffstat (limited to 'rules.mk')
| -rw-r--r-- | rules.mk | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -440,7 +440,11 @@ flip-ee: $(TARGET).hex $(TARGET).eep $(REMOVE) $(TARGET)eep.hex dfu-ee: $(TARGET).hex $(TARGET).eep - dfu-programmer $(MCU) eeprom-flash $(TARGET).eep +ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1))) + dfu-programmer $(MCU) flash --eeprom $(TARGET).eep +else + dfu-programmer $(MCU) flash-eeprom $(TARGET).eep +endif dfu-programmer $(MCU) reset |