diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-08-28 14:23:01 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2022-08-28 14:23:01 +1000 |
| commit | 0a3f7e48690bb2b7b008300a54554979a55be19a (patch) | |
| tree | 7499d52f20040ed7d5a56496ecb81ed114f80719 /keyboards/keyboardio/atreus | |
| parent | fc0bf67f372c38f72c303cdec21b1d4afb5e8cb4 (diff) | |
| parent | 9b5b0722555891ba94f240760ef3a6d4c870fd13 (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/keyboardio/atreus')
5 files changed, 5 insertions, 6 deletions
diff --git a/keyboards/keyboardio/atreus/config.h b/keyboards/keyboardio/atreus/config.h index ad616634b2..6e6e68dcaf 100644 --- a/keyboards/keyboardio/atreus/config.h +++ b/keyboards/keyboardio/atreus/config.h @@ -49,7 +49,6 @@ #define MATRIX_ROW_PINS { F6, F5, F4, F1 } #define MATRIX_COL_PINS { F7, E2, C7, C6, B6, B5, D7, D6, D4, D5, D3, D2 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c index 6faabbc3ed..373438e4b4 100644 --- a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c +++ b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LW] = LAYOUT( /* [> LOWER <] */ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO, KC_NO, KC_NO, KC_NO, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO , - KC_NO, KC_NO, KC_NO, DEBUG, RESET, EEP_RST, _______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO , + KC_NO, KC_NO, KC_NO, DEBUG, QK_BOOT, EEP_RST, _______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO , _______, _______, _______, _______, _______, FN2, FN2, _______, _______, KC_NO, KC_ESC, _______ ) }; diff --git a/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c b/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c index e9daa7fab8..b10d80664c 100644 --- a/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c +++ b/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [FUN] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 , KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, - _______, _______, _______, _______, _______, RESET, EEP_RST, _______, _______, KC_BTN1, KC_BTN2, KC_BTN3, + _______, _______, _______, _______, _______, QK_BOOT, EEP_RST, _______, _______, KC_BTN1, KC_BTN2, KC_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R ) }; diff --git a/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c b/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c index 9e47155f44..2d4685c53a 100644 --- a/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c +++ b/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [L_FN] = LAYOUT( _______,_______,_______,_______,_______, KC_VOLU,KC_F9, KC_F10, KC_F11, KC_F12, _______,_______,_______,_______,_______, KC_MUTE,KC_F5, KC_F6, KC_F7, KC_F8, - _______,K_SECR1,K_SECR2,K_SECR3,K_SECR4,MS_JIGL,RESET, KC_VOLD,KC_F1, KC_F2, KC_F3, KC_F4, + _______,K_SECR1,K_SECR2,K_SECR3,K_SECR4,MS_JIGL,QK_BOOT, KC_VOLD,KC_F1, KC_F2, KC_F3, KC_F4, DF_TYPE,DF_GAME,_______,_______,_______,KC_LCTL,KC_LALT,_______,_______,_______,_______,ooooooo ), diff --git a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c index 2bd30bc586..9d7dc826fb 100644 --- a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c @@ -167,13 +167,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |------+------+------+------+------+------.,------+------+------+------+------+------| | |QWERTY|COLEMK|DVORAK|DVORMC| || | | | | | | |------+------+------+------+------+------||------+------+------+------+------+------| - | | | | | | || | | | | | RESET| + | | | | | | || | | | | | QK_BOOT| `-----------------------------------------'`-----------------------------------------'*/ [_ADJUST] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 , KC_F11, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12 , _______, QWERTY, COLEMAK, DVORAK, DVORMAC, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT ), }; |