diff options
| author | fauxpark <fauxpark@gmail.com> | 2023-12-20 16:03:14 +1100 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2023-12-20 16:03:14 +1100 |
| commit | 2c191e21c280a78e71767a73f31cd7017382186c (patch) | |
| tree | 9712dc3c8fb836c708ac67a2c4ab0dbf2fa6d674 /keyboards/atlantis | |
| parent | 8812a095814fdad3ab245fa2c00e29cb50ee2e92 (diff) | |
| parent | c8728880de198f5797463efbbba3eba7f1e4444a (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/atlantis')
| -rw-r--r-- | keyboards/atlantis/ps17/keymaps/multimedia/keymap.c | 49 | ||||
| -rw-r--r-- | keyboards/atlantis/ps17/keymaps/multimedia/rules.mk | 1 |
2 files changed, 0 insertions, 50 deletions
diff --git a/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c b/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c deleted file mode 100644 index 8546cfb71f..0000000000 --- a/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2023 mjbogusz (@mjbogusz) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - // Default layer: numpad + volume control - [0] = LAYOUT( - KC_MUTE, - TO(1), KC_PSLS, KC_PAST, KC_PMNS, - KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, - KC_KP_4, KC_KP_5, KC_KP_6, - KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, - KC_KP_0, KC_PDOT - ), - [1] = LAYOUT( - KC_MUTE, - TO(2), XXXXXXX, XXXXXXX, KC_VOLD, - XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, - KC_MRWD, KC_MPLY, KC_MFFD, - KC_MPRV, KC_MSTP, KC_MNXT, KC_MSEL, - XXXXXXX, XXXXXXX - ), - [2] = LAYOUT( - RGB_MOD, - TO(3), KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS - ), - [3] = LAYOUT( - KC_TRNS, - TO(0), KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS - ), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [2] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) }, - [3] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) }, -}; -#endif diff --git a/keyboards/atlantis/ps17/keymaps/multimedia/rules.mk b/keyboards/atlantis/ps17/keymaps/multimedia/rules.mk deleted file mode 100644 index ee32568148..0000000000 --- a/keyboards/atlantis/ps17/keymaps/multimedia/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_MAP_ENABLE = yes |