gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-25 20:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
QMK Bot 2021-10-11 03:47:11 +00:00
commit d0a3fc3067
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/a_dux/a_dux.h
View File

@ -38,7 +38,7 @@
{ L01, L02, L03, L04, L05 }, \ { L01, L02, L03, L04, L05 }, \
{ L06, L07, L08, L09, L10 }, \ { L06, L07, L08, L09, L10 }, \
{ L11, L12, L13, L14, L15 }, \ { L11, L12, L13, L14, L15 }, \
{ L16, L17, ___, ___ , ___}, \ { L16, L17, ___, ___, ___ }, \
{ R01, R02, R03, R04, R05 }, \ { R01, R02, R03, R04, R05 }, \
{ R06, R07, R08, R09, R10 }, \ { R06, R07, R08, R09, R10 }, \
{ R11, R12, R13, R14, R15 }, \ { R11, R12, R13, R14, R15 }, \

9
keyboards/a_dux/config.h
View File

@ -47,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{ B4, B5, NO_PIN, NO_PIN, NO_PIN } \ { B4, B5, NO_PIN, NO_PIN, NO_PIN } \
} }
#define DIRECT_PINS_RIGHT { \ #define DIRECT_PINS_RIGHT { \
{ F4, B2, F7, D2, C6 }, \ { F4, B2, F7, D2, C6 }, \
{ F5, B3, F6, D0, D7 }, \ { F5, B3, F6, D0, D7 }, \
{ B6, B1, D3, D4, E6 }, \ { 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 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

2
keyboards/a_dux/readme.md
View File

@ -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

2
keyboards/a_dux/rules.mk
View File

@ -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