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/dmqdesign/spin | |
parent | fc0bf67f372c38f72c303cdec21b1d4afb5e8cb4 (diff) | |
parent | 9b5b0722555891ba94f240760ef3a6d4c870fd13 (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/dmqdesign/spin')
-rw-r--r-- | keyboards/dmqdesign/spin/config.h | 1 | ||||
-rw-r--r-- | keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c | 20 |
2 files changed, 14 insertions, 7 deletions
diff --git a/keyboards/dmqdesign/spin/config.h b/keyboards/dmqdesign/spin/config.h index 8253c6030f..72efc0f556 100644 --- a/keyboards/dmqdesign/spin/config.h +++ b/keyboards/dmqdesign/spin/config.h @@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { F0, F1, F4 } #define MATRIX_COL_PINS { F5, F6, F7, C7, C6 } -#define UNUSED_PINS { D5, D2, D1, D0, B7, B3, B2, B0, E6 } /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c index bdf5dff0df..58aa5554c2 100644 --- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c +++ b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c @@ -20,7 +20,7 @@ #define RGB_LAYER_ACK_DURATION 500 -enum layers { _MACRO, _NUMPAD, _RGB, _FN }; +enum layers { _MACRO, _NUMPAD, _CURSOR, _RGB, _FN }; enum layer_base { LAYER_BASE = _MACRO, @@ -44,18 +44,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUMPAD] = LAYOUT( KC_KP_7, KC_KP_8, KC_KP_9, KC_TRNS, - KC_KP_4, KC_KP_5, KC_KP_6, KC_TRNS, + KC_KP_4, KC_KP_5, KC_KP_6, TO(_CURSOR), KC_KP_1, KC_KP_2, KC_KP_3, KC_TRNS, KC_KP_0, KC_PDOT, KC_PENT), + [_CURSOR] = LAYOUT( + KC_HOME, KC_UP, KC_PGUP, KC_TRNS, + KC_LEFT, KC_NO, KC_RIGHT, TO(_NUMPAD), + KC_END, KC_DOWN, KC_PGDN, KC_TRNS, + KC_INS, KC_DEL, KC_PENT), + [_RGB] = LAYOUT( RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, - RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, + RGB_HUD, RGB_SAD, RGB_VAD, TO(_NUMPAD), RGB_SPD, RGB_SPI, KC_NO, KC_TRNS, RGB_RMOD, RGB_TOG, RGB_MOD), [_FN] = LAYOUT( - KC_TRNS, DEBUG, RESET, KC_TRNS, + KC_TRNS, DEBUG, QK_BOOT, KC_TRNS, KC_NO, KC_NO, EEP_RST, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO), @@ -71,6 +77,7 @@ typedef enum layer_ack { #define LAYER_OFFSET 0 const rgblight_segment_t PROGMEM _macro_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_TEAL}); const rgblight_segment_t PROGMEM _numpad_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_TEAL}); +const rgblight_segment_t PROGMEM _cursor_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_BLUE}); const rgblight_segment_t PROGMEM _rgb_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_TEAL}); const rgblight_segment_t PROGMEM _fn_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 3, HSV_PURPLE}); @@ -83,8 +90,9 @@ const rgblight_segment_t PROGMEM _meh_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 3, H const rgblight_segment_t *const PROGMEM _rgb_layers[] = { [LAYER_OFFSET + 0] = _macro_layer, [LAYER_OFFSET + 1] = _numpad_layer, - [LAYER_OFFSET + 2] = _rgb_layer, - [LAYER_OFFSET + 3] = _fn_layer, + [LAYER_OFFSET + 2] = _cursor_layer, + [LAYER_OFFSET + 3] = _rgb_layer, + [LAYER_OFFSET + 4] = _fn_layer, [ACK_OFFSET + ACK_NO] = _no_layer, [ACK_OFFSET + ACK_YES] = _yes_layer, |