diff options
| author | Ryan Ascheman <rascheman@groupon.com> | 2016-10-18 12:42:02 -0700 |
|---|---|---|
| committer | Ryan Ascheman <rascheman@groupon.com> | 2016-10-18 12:42:02 -0700 |
| commit | 55b8b8477cc6aee82dfe6792eea4e589cac433d5 (patch) | |
| tree | ce5bfbd1b0ee59dbffdc2044bcf90c89614392ed /quantum/tools | |
| parent | d1c70328f8d8ded6ce1e5422b468fc41ef315e7d (diff) | |
| parent | 04df74f6360464661bcc1e6794e9fd3549084390 (diff) | |
Merge remote-tracking branch 'upstream/master'
* upstream/master: (1239 commits)
Update ez.c
removes planck/rev3 temporarily
Move hand_swap_config to ez.c, removes error for infinity
Update Makefile
ergodox: Update algernon's keymap to v1.9
Added VS Code dir to .gitignore
Support the Pegasus Hoof controller.
[Jack & Erez] Simplifies and documents TO
add readme
use wait_ms instead of _delay_ms
add messenger
init keymap
Add example keymap
Adding whiskey_tango_foxtrot_capslock ergodox keymap
Unicode map framework. Allow unicode up to 0xFFFFF using separate mapping table
CIE 1931 dim curve
Apply the dim curve to the RGB output
Update the Cluecard readme files
Tune snake and knight intervals for Cluecard
Tunable RGB light intervals
...
Diffstat (limited to 'quantum/tools')
| -rw-r--r-- | quantum/tools/readme.md (renamed from quantum/tools/README.md) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/quantum/tools/README.md b/quantum/tools/readme.md index 0702144238..5f355256de 100644 --- a/quantum/tools/README.md +++ b/quantum/tools/readme.md @@ -1,6 +1,6 @@ `eeprom_reset.hex` is to reset the eeprom on the Atmega32u4, like this: dfu-programmer atmega32u4 erase - dfu-programmer atmega32u4 flash --eeprom eeprom-reset.bin + dfu-programmer atmega32u4 flash --eeprom eeprom_reset.hex - You'll need to reflash afterwards, because DFU requires the flash to be erased before messing with the eeprom.
\ No newline at end of file + You'll need to reflash afterwards, because DFU requires the flash to be erased before messing with the eeprom. |