diff options
| author | QMK Bot <hello@qmk.fm> | 2021-10-11 03:47:11 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-10-11 03:47:11 +0000 |
| commit | d0a3fc3067980e8beebc4a3ec59624e23a5bf99f (patch) | |
| tree | 959c7c010937b3034ed7bf807c70cf265c12b7d2 /keyboards | |
| parent | 9b975065d9203a445bb9109e706271e0a3ef9232 (diff) | |
| parent | 5d7efc71837f1e345bdd299991da04137289bb19 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/a_dux/a_dux.h | 2 | ||||
| -rw-r--r-- | keyboards/a_dux/config.h | 9 | ||||
| -rw-r--r-- | keyboards/a_dux/readme.md | 2 | ||||
| -rw-r--r-- | keyboards/a_dux/rules.mk | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/keyboards/a_dux/a_dux.h b/keyboards/a_dux/a_dux.h index 1edea40332..d143295845 100644 --- a/keyboards/a_dux/a_dux.h +++ b/keyboards/a_dux/a_dux.h @@ -38,7 +38,7 @@ { L01, L02, L03, L04, L05 }, \ { L06, L07, L08, L09, L10 }, \ { L11, L12, L13, L14, L15 }, \ - { L16, L17, ___, ___ , ___}, \ + { L16, L17, ___, ___, ___ }, \ { R01, R02, R03, R04, R05 }, \ { R06, R07, R08, R09, R10 }, \ { R11, R12, R13, R14, R15 }, \ diff --git a/keyboards/a_dux/config.h b/keyboards/a_dux/config.h index bacc4f14c1..b007945774 100644 --- a/keyboards/a_dux/config.h +++ b/keyboards/a_dux/config.h @@ -47,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. { B4, B5, NO_PIN, NO_PIN, NO_PIN } \ } -#define DIRECT_PINS_RIGHT { \ +#define DIRECT_PINS_RIGHT { \ { F4, B2, F7, D2, C6 }, \ { F5, B3, F6, D0, D7 }, \ { B6, B1, D3, D4, E6 }, \ @@ -74,3 +74,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define SOFT_SERIAL_PIN D1 #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 diff --git a/keyboards/a_dux/readme.md b/keyboards/a_dux/readme.md index 7d9956f1ef..aaf678ec74 100644 --- a/keyboards/a_dux/readme.md +++ b/keyboards/a_dux/readme.md @@ -31,7 +31,7 @@ Make examples for this keyboard (after setting up your build environment): 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. * **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/a_dux/rules.mk b/keyboards/a_dux/rules.mk index d7671a17b3..c3712c647a 100644 --- a/keyboards/a_dux/rules.mk +++ b/keyboards/a_dux/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug |