aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/daisy/keymaps
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2020-01-26 07:43:43 +1100
committerDrashna Jaelre <drashna@live.com>2020-01-25 12:43:43 -0800
commit480a391929de9e66d36c84df900c49297c7dfec0 (patch)
treed37d22e5dcca10c4560650be99c0cd85158d6f70 /keyboards/daisy/keymaps
parent154336ee2747eafee23a13073203cd984dc999b5 (diff)
downloadfirmware-480a391929de9e66d36c84df900c49297c7dfec0.tar.gz
firmware-480a391929de9e66d36c84df900c49297c7dfec0.tar.bz2
firmware-480a391929de9e66d36c84df900c49297c7dfec0.zip
[Keyboard] Daisy refactor (#7985)
Diffstat (limited to 'keyboards/daisy/keymaps')
-rw-r--r--keyboards/daisy/keymaps/default/keymap.c159
-rw-r--r--keyboards/daisy/keymaps/default/readme.md6
2 files changed, 76 insertions, 89 deletions
diff --git a/keyboards/daisy/keymaps/default/keymap.c b/keyboards/daisy/keymaps/default/keymap.c
index adc3298d0..f07680376 100644
--- a/keyboards/daisy/keymaps/default/keymap.c
+++ b/keyboards/daisy/keymaps/default/keymap.c
@@ -1,92 +1,83 @@
-#include QMK_KEYBOARD_H
-
+/* Copyright 2020
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
-// Layer shorthand
-#define _BL 0
-#define _LW 1
-#define _RS 2
+#include QMK_KEYBOARD_H
-enum layer_keycodes {
- QWERTY = SAFE_RANGE, LOWER, RAISE
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+ _BL,
+ _LW,
+ _RS
};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- /* Base Layer
- * .-----------------------------------------------------------------------.
- * | ESC | Q | W | E | R | T | Y | U | I | O | P | \| |
- * |-----------------------------------------------------------------------|
- * | TAB | A | S | D | F | G | H | J | K | L | ENTER |
- * |-----------------------------------------------------------------------|
- * | LSHIFT | Z | X | C | V | B | N | M | ,< | .> | /? |
- * |-----------------------------------------------------------------------|
- * | LCTRL | LGUI | LALT | SPACE | BACKSPACE | LW | RS | RALT |
- * '-----------------------------------------------------------------------'
- */
- [_BL] = LAYOUT(
- GRAVE_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_BSPC, LOWER, RAISE, KC_RALT
- ),
+#define LOWER MO(_LW)
+#define RAISE MO(_RS)
- /* Function Layer
- * .-----------------------------------------------------------------------.
- * | GRV | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | -_ |
- * |-----------------------------------------------------------------------|
- * | | =+ | UP | | | | [{ | ]} | ;: | '" | |
- * |-----------------------------------------------------------------------|
- * | | LEFT| DOWN |RIGHT| | | | | | | |
- * |-----------------------------------------------------------------------|
- * | | | | | DELETE | | | |
- * '-----------------------------------------------------------------------'
- */
-
- [_LW] = LAYOUT(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- KC_TRNS, KC_EQL, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_TRNS,
- KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
- /* Second Function Layer
- * .-----------------------------------------------------------------------.
- * | RST | F1 | F2 | F3 | F4 | F5 | F6 | | HOME| PGUP| | |
- * |-----------------------------------------------------------------------|
- * | | F7 | F8 | F9 | F10 | F11 | F12 | | END | PGDN| |
- * |-----------------------------------------------------------------------|
- * | |RGBtog|RGBmod|RGBhud|RGBhui|RGBvad|RGBvai|RGBsad|RGBsai|BL| |
- * |-----------------------------------------------------------------------|
- * | | | | | | | | |
- * '-----------------------------------------------------------------------'
- */
- [_RS] = LAYOUT(
- RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_END, KC_PGDN, KC_TRNS,
- KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, BL_STEP, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Base Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ \ │
+ * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │Tab │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Enter│
+ * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
+ * │Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │  / │
+ * ├────┬─┴─┬─┴──┬┴───┴───┼───┴───┴──┬┴───┼───┼────┤
+ * │Ctrl│GUI│Alt │        │ Backspace│Lowr│Rse│ Alt│
+ * └────┴───┴────┴────────┴──────────┴────┴───┴────┘
+ */
+ [_BL] = LAYOUT(
+ KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_BSPC, LOWER, RAISE, KC_RALT
+ ),
-};
+ /* Function Layer 1 (Lower)
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │
+ * └───┴┬──┴┬──┴┬──┴───┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴───┘
+ * │    │ = │ ▴ │   │   │   │ [ │ ] │ ; │ ' │      │
+ * ├────└─┬─┴─┬─┴─┬───┐─┴─┬─└───┴───┴───┴───┘─┬────┤
+ * │      │ ◂ │ ▾ │ ▸ │   │   │   │   │   │   │    │
+ * ├────┬─└───┴───┴───┘───┌──────────┐┴───┼───┼────┤
+ * │    │   │    │        │   Delete │    │   │    │
+ * └────┴───┴────┴────────└──────────┘────┴───┴────┘
+ */
+ [_LW] = LAYOUT(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ _______, KC_EQL, KC_UP, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, KC_DEL, _______, _______, _______
+ ),
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case LOWER:
- if(record->event.pressed){
- layer_on(_LW);
- } else {
- layer_off(_LW);
- }
- return false;
- break;
- case RAISE:
- if(record->event.pressed){
- layer_on(_RS);
- } else {
- layer_off(_RS);
- }
- return false;
- break;
- }
- return true;
+ /* Function Layer 2 (Raise)
+ * ┌───┬───┬───┬───┬───┬───┬───┐───┌───┬───┐───┬───┐
+ * │Rst│F1 │F2 │F3 │F4 │F5 │F6 │   │Hom│PgU│   │   │
+ * └───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐──└┬──┴┬──┴┐──┴───┤
+ * │    │F7 │F8 │F9 │F10│F11│F12│   │ ; │ ' │      │
+ * ├────└─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴───┴───┴───┴─┐────┤
+ * │      │RGB│Mod│HuD│HuI│VaD│VaI│SaD│SaI│BLS│    │
+ * ├────┬─└───┴───┴───┴───┴───┴───┴───┴───┴───┘────┤
+ * │    │   │    │        │          │    │   │    │
+ * └────┴───┴────┴────────┴──────────┴────┴───┴────┘
+ */
+ [_RS] = LAYOUT(
+ RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_HOME, KC_PGUP, _______, _______,
+ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_END, KC_PGDN, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, BL_STEP, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______
+ )
};
diff --git a/keyboards/daisy/keymaps/default/readme.md b/keyboards/daisy/keymaps/default/readme.md
index dff0dcbde..b8c7d17f2 100644
--- a/keyboards/daisy/keymaps/default/readme.md
+++ b/keyboards/daisy/keymaps/default/readme.md
@@ -1,5 +1 @@
-![Daisy Layout Image](https://imgur.com/9mSF0yf)
-
-# Default Daisy Layout
-
-This is the default layout as offered by KPRepublic's TMK firmware for the Daisy with a few minor tweaks for usability made by me.
+# The default keymap for Daisy