diff options
| author | Stephen Tudor <smt@smt.io> | 2017-01-28 00:51:07 -0500 |
|---|---|---|
| committer | Stephen Tudor <smt@smt.io> | 2017-01-28 00:51:07 -0500 |
| commit | fa72689145ccbee120c236111c0e8813afa7881a (patch) | |
| tree | 7eb408d19987ad05c6156331e50d6921c82aea50 /keyboards/s60-x | |
| parent | 63e406eca4da805617889f7ab769a781c0046742 (diff) | |
| parent | ec05f654210a01ef82db2ab54e6065783536b802 (diff) | |
Merge branch 'master' into smt/planck
* master:
Clarify license on abnt2 keymap (#1038)
replace jackhumbert with qmk
Add gitter image, start update to qmk org
Remove COLEMAK from preonic_keycodes enum
layer defines to enum
Update readme for smt Preonic keymap
Add smt keymap for Preonic
updated all the other keymaps to support the new changes.
fix: infinity60 keyboard was not using quantum features.
Compare Makefile with itself instead of using `--help`
Diffstat (limited to 'keyboards/s60-x')
| -rw-r--r-- | keyboards/s60-x/readme.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keyboards/s60-x/readme.md b/keyboards/s60-x/readme.md index 94ce829223..408ad13ac2 100644 --- a/keyboards/s60-x/readme.md +++ b/keyboards/s60-x/readme.md @@ -13,7 +13,7 @@ You only need to flash them onto your keyboard, which is explained below, there' ## Flashing your keyboard The recommended programs for flashing your keyboard are [Atmel FLIP](http://www.atmel.com/tools/FLIP.aspx) (Windows) and [dfu-programmer](http://dfu-programmer.sourceforge.net/) (Linux/Windows). -[QMK Firmware Flasher](https://github.com/jackhumbert/qmk_firmware_flasher/releases) may work, as the S60-X keyboard uses the ATMega32U4 microcontroller, but it is untested. Use at your own risk. +[QMK Firmware Flasher](https://github.com/qmk/qmk_firmware_flasher/releases) may work, as the S60-X keyboard uses the ATMega32U4 microcontroller, but it is untested. Use at your own risk. [Easy AVR USB Keyboard Firmware](https://deskthority.net/wiki/Easy_AVR_USB_Keyboard_Firmware) also supports S60-X, but it is completely unrelated to TMK firmware. Use at your own risk. |