Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
d0a3fc3067
4 changed files with 11 additions and 4 deletions
|
@ -74,3 +74,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define SOFT_SERIAL_PIN D1
|
#define SOFT_SERIAL_PIN D1
|
||||||
|
|
||||||
#define EE_HANDS
|
#define EE_HANDS
|
||||||
|
|
||||||
|
/* Top left key on left half */
|
||||||
|
#define BOOTMAGIC_LITE_ROW 0
|
||||||
|
#define BOOTMAGIC_LITE_COLUMN 0
|
||||||
|
/* Top right key on right half */
|
||||||
|
#define BOOTMAGIC_LITE_ROW_RIGHT 4
|
||||||
|
#define BOOTMAGIC_LITE_COLUMN_RIGHT 4
|
||||||
|
|
|
@ -31,7 +31,7 @@ Make examples for this keyboard (after setting up your build environment):
|
||||||
|
|
||||||
Enter the bootloader in 3 ways:
|
Enter the bootloader in 3 ways:
|
||||||
|
|
||||||
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
|
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard. (With `EE_HANDS` configured, hold down the top right key on the right half to place the right controller in bootloader mode)
|
||||||
* **Physical reset**: Briefly short the RST and GND pins on the microcontroller using tweezers, a paperclip, or any other conductive material.
|
* **Physical reset**: Briefly short the RST and GND pins on the microcontroller using tweezers, a paperclip, or any other conductive material.
|
||||||
* **Keycode in layout**: Press the key mapped to `RESET` if it is available
|
* **Keycode in layout**: Press the key mapped to `RESET` if it is available
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu
|
||||||
# Build Options
|
# Build Options
|
||||||
# change yes to no to disable
|
# change yes to no to disable
|
||||||
#
|
#
|
||||||
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
|
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
|
||||||
MOUSEKEY_ENABLE = yes # Mouse keys
|
MOUSEKEY_ENABLE = yes # Mouse keys
|
||||||
EXTRAKEY_ENABLE = yes # Audio control and System control
|
EXTRAKEY_ENABLE = yes # Audio control and System control
|
||||||
CONSOLE_ENABLE = no # Console for debug
|
CONSOLE_ENABLE = no # Console for debug
|
||||||
|
|
Loading…
Reference in a new issue