From e5c0553f4850ea9a8e34f91edfc50d1d2a8df1b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Sat, 10 Oct 2020 18:48:42 -0400 Subject: [PATCH 01/14] basic keys working --- keyboards/moonlander/keymaps/shahn/config.h | 21 ++++ keyboards/moonlander/keymaps/shahn/keymap.c | 107 ++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 keyboards/moonlander/keymaps/shahn/config.h create mode 100644 keyboards/moonlander/keymaps/shahn/keymap.c diff --git a/keyboards/moonlander/keymaps/shahn/config.h b/keyboards/moonlander/keymaps/shahn/config.h new file mode 100644 index 000000000000..95b05a5a61bc --- /dev/null +++ b/keyboards/moonlander/keymaps/shahn/config.h @@ -0,0 +1,21 @@ +/* Copyright 2020 ZSA Technology Labs, Inc <@zsa> + * Copyright 2020 Jack Humbert + * Copyright 2020 Drashna Jael're + * + * 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 . + */ + +#pragma once + +#define ORYX_CONFIGURATOR diff --git a/keyboards/moonlander/keymaps/shahn/keymap.c b/keyboards/moonlander/keymaps/shahn/keymap.c new file mode 100644 index 000000000000..633f22506b7f --- /dev/null +++ b/keyboards/moonlander/keymaps/shahn/keymap.c @@ -0,0 +1,107 @@ +/* Copyright 2020 ZSA Technology Labs, Inc <@zsa> + * Copyright 2020 Jack Humbert + * Copyright 2020 Drashna Jael're + * + * 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 . + */ + +#include QMK_KEYBOARD_H +#include "version.h" + +enum layers { + BASE, // default layer + SYMB, // symbols + MDIA, // media keys +}; + +enum custom_keycodes { + VRSN = ML_SAFE_RANGE, +}; + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = LAYOUT_moonlander( + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_TAB, KC_X, KC_V, KC_L, KC_C, KC_W, TG(SYMB), TG(SYMB), KC_K, KC_H, KC_F, KC_Q, KC_P, KC_BSLS, + KC_BSPC, KC_U, KC_I, KC_A, KC_E, KC_O, KC_HYPR, KC_MEH, KC_S, KC_R, KC_T, KC_D, LT(MDIA, KC_SCLN), GUI_T(KC_QUOT), + KC_LSFT, LCTL_T(KC_Z),KC_X,KC_C, KC_P, KC_Z, KC_B, KC_M, KC_COMM, KC_DOT, LCTL_T(KC_SLSH), KC_LSFT, + LT(SYMB,KC_GRV),WEBUSB_PAIR,A(KC_LSFT),KC_LEFT, KC_RGHT, LALT_T(KC_APP), RCTL_T(KC_ESC), KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB), + KC_SPC, KC_BSPC, KC_LGUI, KC_RALT, KC_TAB, KC_ENT + ), + + [SYMB] = LAYOUT_moonlander( + VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, + KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_TRNS, KC_TRNS, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, + KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, + EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, RGB_TOG, KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, + RGB_HUD, RGB_VAD, RGB_HUI, TOGGLE_LAYER_COLOR,KC_TRNS, KC_TRNS + ), + + [MDIA] = LAYOUT_moonlander( + 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, KC_TRNS, KC_MS_U, 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_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; + +layer_state_t layer_state_set_user(layer_state_t state) { + ML_LED_1(false); + ML_LED_2(false); + ML_LED_3(false); + ML_LED_4(false); + ML_LED_5(false); + ML_LED_6(false); + + switch (get_highest_layer(state)) { + case 1: + ML_LED_1(1); + ML_LED_4(1); + break; + case 2: + ML_LED_2(1); + ML_LED_5(1); + break; + case 3: + ML_LED_3(1); + break; + case 4: + ML_LED_4(1); + break; + case 5: + ML_LED_5(1); + break; + case 6: + ML_LED_6(1); + break; + default: + break; + } + + return state; +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (record->event.pressed) { + switch (keycode) { + case VRSN: + SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + return false; + } + } + return true; +} From cf7204fbfe876cadecb02b9fa3361dd762e2c17a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Sat, 10 Oct 2020 19:14:32 -0400 Subject: [PATCH 02/14] more stuff --- keyboards/moonlander/keymaps/shahn/keymap.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/keyboards/moonlander/keymaps/shahn/keymap.c b/keyboards/moonlander/keymaps/shahn/keymap.c index 633f22506b7f..882a65d942e1 100644 --- a/keyboards/moonlander/keymaps/shahn/keymap.c +++ b/keyboards/moonlander/keymaps/shahn/keymap.c @@ -21,6 +21,7 @@ enum layers { BASE, // default layer + LAYER_4, SYMB, // symbols MDIA, // media keys }; @@ -33,13 +34,22 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT_moonlander( KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, - KC_TAB, KC_X, KC_V, KC_L, KC_C, KC_W, TG(SYMB), TG(SYMB), KC_K, KC_H, KC_F, KC_Q, KC_P, KC_BSLS, - KC_BSPC, KC_U, KC_I, KC_A, KC_E, KC_O, KC_HYPR, KC_MEH, KC_S, KC_R, KC_T, KC_D, LT(MDIA, KC_SCLN), GUI_T(KC_QUOT), + KC_TAB, KC_X, KC_V, KC_L, KC_C, KC_W, TG(SYMB), TG(SYMB), KC_K, KC_H, KC_G, KC_F, KC_Q, KC_BSLS, + KC_BSPC, KC_U, KC_I, KC_A, KC_E, KC_O, KC_HYPR, KC_MEH, KC_S, KC_N, KC_R, KC_T, KC_D, KC_Y, KC_LSFT, LCTL_T(KC_Z),KC_X,KC_C, KC_P, KC_Z, KC_B, KC_M, KC_COMM, KC_DOT, LCTL_T(KC_SLSH), KC_LSFT, - LT(SYMB,KC_GRV),WEBUSB_PAIR,A(KC_LSFT),KC_LEFT, KC_RGHT, LALT_T(KC_APP), RCTL_T(KC_ESC), KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB), + LT(SYMB,KC_GRV),WEBUSB_PAIR,A(KC_LSFT),KC_LEFT, KC_RGHT, LALT_T(KC_APP), RCTL_T(KC_ESC), MO(LAYER_4), KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB), KC_SPC, KC_BSPC, KC_LGUI, KC_RALT, KC_TAB, KC_ENT ), + [LAYER_4] = LAYOUT_moonlander( + VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_TRNS, KC_EXLM, KC_BSPC, KC_UP, KC_RCBR, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, + KC_TRNS, KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_GRV, KC_TRNS, KC_TRNS, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, + KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_ENT, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, + EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, RGB_TOG, KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, + RGB_HUD, RGB_VAD, RGB_HUI, TOGGLE_LAYER_COLOR,KC_TRNS, KC_TRNS + ), + [SYMB] = LAYOUT_moonlander( VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, From 3283dd04f63fa23bc39cd2403a45d3f12b41f22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Sat, 10 Oct 2020 20:06:53 -0400 Subject: [PATCH 03/14] more stuff --- keyboards/moonlander/keymaps/shahn/keymap.c | 33 +++++++++++++++------ 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/keyboards/moonlander/keymaps/shahn/keymap.c b/keyboards/moonlander/keymaps/shahn/keymap.c index 882a65d942e1..fc0fe151218b 100644 --- a/keyboards/moonlander/keymaps/shahn/keymap.c +++ b/keyboards/moonlander/keymaps/shahn/keymap.c @@ -21,6 +21,7 @@ enum layers { BASE, // default layer + LAYER_3, LAYER_4, SYMB, // symbols MDIA, // media keys @@ -33,19 +34,33 @@ enum custom_keycodes { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT_moonlander( - KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, - KC_TAB, KC_X, KC_V, KC_L, KC_C, KC_W, TG(SYMB), TG(SYMB), KC_K, KC_H, KC_G, KC_F, KC_Q, KC_BSLS, - KC_BSPC, KC_U, KC_I, KC_A, KC_E, KC_O, KC_HYPR, KC_MEH, KC_S, KC_N, KC_R, KC_T, KC_D, KC_Y, - KC_LSFT, LCTL_T(KC_Z),KC_X,KC_C, KC_P, KC_Z, KC_B, KC_M, KC_COMM, KC_DOT, LCTL_T(KC_SLSH), KC_LSFT, - LT(SYMB,KC_GRV),WEBUSB_PAIR,A(KC_LSFT),KC_LEFT, KC_RGHT, LALT_T(KC_APP), RCTL_T(KC_ESC), MO(LAYER_4), KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB), - KC_SPC, KC_BSPC, KC_LGUI, KC_RALT, KC_TAB, KC_ENT + XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, XXXXXXX, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX, + XXXXXXX, KC_X, KC_V, KC_L, KC_C, KC_W, XXXXXXX, XXXXXXX, KC_K, KC_H, KC_G, KC_F, KC_Q, XXXXXXX, + XXXXXXX, KC_U, KC_I, KC_A, KC_E, KC_O, XXXXXXX, XXXXXXX, KC_S, KC_N, KC_R, KC_T, KC_D, KC_Y, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P, KC_Z, KC_B, KC_M, KC_COMM, KC_DOT, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MO(LAYER_4), KC_RGUI, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LSFT, MO(LAYER_3), KC_SPC, KC_SPC, MO(LAYER_3), KC_RSFT + ), + + // copied from my planck layout + // XXXXXXX, XXXXXXX, KC_UNDS, KC_LBRC, KC_RBRC, KC_CIRC, KC_EXLM, KC_LABK, KC_RABK, KC_EQL , KC_AMPR, XXXXXXX, + // XXXXXXX, KC_BSLS, KC_SLSH, KC_LCBR, KC_RCBR, KC_ASTR, KC_QUES, KC_LPRN, KC_RPRN, KC_MINS, KC_COLN, KC_AT , + // XXXXXXX, KC_HASH, KC_DLR , KC_PIPE, KC_TILD, KC_GRV , KC_PLUS, KC_PERC, KC_DQUO, KC_QUOT, KC_SCLN, XXXXXXX, + // XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC , KC_SPC , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + [LAYER_3] = LAYOUT_moonlander( + VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_TRNS, KC_EXLM, KC_BSPC, KC_UP, KC_DEL, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, + KC_TRNS, KC_BSLS, KC_SLSH, KC_LCBR, KC_RCBR, KC_ASTR, KC_TRNS, KC_TRNS, KC_DOWN, KC_LPRN, KC_RPRN, KC_MINS, KC_COLN, KC_TRNS, + KC_TRNS, KC_ESC, KC_CIRC, KC_LBRC, KC_ENT, KC_TILD, KC_AMPR, KC_PERC, KC_2, KC_3, KC_BSLS, KC_TRNS, + EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, RGB_TOG, KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, + RGB_HUD, KC_TRNS, RGB_HUI, TOGGLE_LAYER_COLOR,KC_TRNS, KC_TRNS ), [LAYER_4] = LAYOUT_moonlander( VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - KC_TRNS, KC_EXLM, KC_BSPC, KC_UP, KC_RCBR, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, - KC_TRNS, KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_GRV, KC_TRNS, KC_TRNS, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, - KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_ENT, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, + KC_TRNS, KC_EXLM, KC_BSPC, KC_UP, KC_DEL, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, + KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_TRNS, KC_TRNS, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, + KC_TRNS, KC_ESC, KC_CIRC, KC_LBRC, KC_ENT, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, RGB_TOG, KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, RGB_HUD, RGB_VAD, RGB_HUI, TOGGLE_LAYER_COLOR,KC_TRNS, KC_TRNS ), From 68c6fe47e4ade97b87053070875eea164d330494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Sat, 10 Oct 2020 20:27:18 -0400 Subject: [PATCH 04/14] empty upper layers --- keyboards/moonlander/keymaps/shahn/keymap.c | 29 ++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/keyboards/moonlander/keymaps/shahn/keymap.c b/keyboards/moonlander/keymaps/shahn/keymap.c index fc0fe151218b..e2fb2aea08db 100644 --- a/keyboards/moonlander/keymaps/shahn/keymap.c +++ b/keyboards/moonlander/keymaps/shahn/keymap.c @@ -48,21 +48,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // XXXXXXX, KC_HASH, KC_DLR , KC_PIPE, KC_TILD, KC_GRV , KC_PLUS, KC_PERC, KC_DQUO, KC_QUOT, KC_SCLN, XXXXXXX, // XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC , KC_SPC , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX [LAYER_3] = LAYOUT_moonlander( - VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - KC_TRNS, KC_EXLM, KC_BSPC, KC_UP, KC_DEL, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, - KC_TRNS, KC_BSLS, KC_SLSH, KC_LCBR, KC_RCBR, KC_ASTR, KC_TRNS, KC_TRNS, KC_DOWN, KC_LPRN, KC_RPRN, KC_MINS, KC_COLN, KC_TRNS, - KC_TRNS, KC_ESC, KC_CIRC, KC_LBRC, KC_ENT, KC_TILD, KC_AMPR, KC_PERC, KC_2, KC_3, KC_BSLS, KC_TRNS, - EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, RGB_TOG, KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, - RGB_HUD, KC_TRNS, RGB_HUI, TOGGLE_LAYER_COLOR,KC_TRNS, KC_TRNS + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX ), + // copied from my planck layout + // XXXXXXX, KC_PGUP, KC_BSPC, KC_UP, KC_DEL , KC_PGDN, XXXXXXX, KC_7 , KC_8 , KC_9 , XXXXXXX, XXXXXXX, + // XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , XXXXXXX, KC_4 , KC_5 , KC_6 , XXXXXXX, XXXXXXX, + // XXXXXXX, KC_ESC , KC_TAB , XXXXXXX, KC_ENT , XXXXXXX, XXXXXXX, KC_1 , KC_2 , KC_3 , XXXXXXX, XXXXXXX, + // RESET , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_0 , KC_0 , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX [LAYER_4] = LAYOUT_moonlander( - VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - KC_TRNS, KC_EXLM, KC_BSPC, KC_UP, KC_DEL, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, - KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_TRNS, KC_TRNS, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, - KC_TRNS, KC_ESC, KC_CIRC, KC_LBRC, KC_ENT, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, - EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, RGB_TOG, KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, - RGB_HUD, RGB_VAD, RGB_HUI, TOGGLE_LAYER_COLOR,KC_TRNS, KC_TRNS + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), [SYMB] = LAYOUT_moonlander( From 3592efe6bb830e4c35fc2f7d424699344e1ef04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Sun, 11 Oct 2020 15:15:04 -0400 Subject: [PATCH 05/14] more stuff --- keyboards/moonlander/keymaps/shahn/keymap.c | 54 +++++++-------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/keyboards/moonlander/keymaps/shahn/keymap.c b/keyboards/moonlander/keymaps/shahn/keymap.c index e2fb2aea08db..375bef6bc9b8 100644 --- a/keyboards/moonlander/keymaps/shahn/keymap.c +++ b/keyboards/moonlander/keymaps/shahn/keymap.c @@ -21,10 +21,8 @@ enum layers { BASE, // default layer - LAYER_3, - LAYER_4, - SYMB, // symbols - MDIA, // media keys + L_3, + L_4, }; enum custom_keycodes { @@ -34,12 +32,12 @@ enum custom_keycodes { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT_moonlander( - XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, XXXXXXX, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX, - XXXXXXX, KC_X, KC_V, KC_L, KC_C, KC_W, XXXXXXX, XXXXXXX, KC_K, KC_H, KC_G, KC_F, KC_Q, XXXXXXX, - XXXXXXX, KC_U, KC_I, KC_A, KC_E, KC_O, XXXXXXX, XXXXXXX, KC_S, KC_N, KC_R, KC_T, KC_D, KC_Y, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P, KC_Z, KC_B, KC_M, KC_COMM, KC_DOT, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MO(LAYER_4), KC_RGUI, XXXXXXX, XXXXXXX, XXXXXXX, - KC_LSFT, MO(LAYER_3), KC_SPC, KC_SPC, MO(LAYER_3), KC_RSFT + XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, XXXXXXX, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX, + KC_TAB , KC_X, KC_V, KC_L, KC_C, KC_W, XXXXXXX, XXXXXXX, KC_K, KC_H, KC_G, KC_F, KC_Q, XXXXXXX, + XXXXXXX, KC_U, KC_I, KC_A, KC_E, KC_O, XXXXXXX, XXXXXXX, KC_S, KC_N, KC_R, KC_T, KC_D, KC_Y, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P, KC_Z, KC_B, KC_M, KC_COMM, KC_DOT, XXXXXXX, XXXXXXX, + XXXXXXX, KC_LCTL, XXXXXXX, KC_LGUI, MO(L_4), XXXXXXX, XXXXXXX, MO(L_4), KC_RGUI, XXXXXXX, KC_RCTL, XXXXXXX, + KC_SPC , KC_LSFT, MO(L_3), MO(L_3), KC_RSFT, KC_SPC ), // copied from my planck layout @@ -47,11 +45,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // XXXXXXX, KC_BSLS, KC_SLSH, KC_LCBR, KC_RCBR, KC_ASTR, KC_QUES, KC_LPRN, KC_RPRN, KC_MINS, KC_COLN, KC_AT , // XXXXXXX, KC_HASH, KC_DLR , KC_PIPE, KC_TILD, KC_GRV , KC_PLUS, KC_PERC, KC_DQUO, KC_QUOT, KC_SCLN, XXXXXXX, // XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC , KC_SPC , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - [LAYER_3] = LAYOUT_moonlander( + [L_3] = LAYOUT_moonlander( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, KC_UNDS, KC_LBRC, KC_RBRC, KC_CIRC, XXXXXXX, XXXXXXX, KC_EXLM, KC_LABK, KC_RABK, KC_EQL , KC_AMPR, XXXXXXX, + XXXXXXX, KC_BSLS, KC_SLSH, KC_LCBR, KC_RCBR, KC_ASTR, XXXXXXX, XXXXXXX, KC_QUES, KC_LPRN, KC_RPRN, KC_MINS, KC_COLN, KC_AT, + XXXXXXX, KC_HASH, KC_DLR , KC_PIPE, KC_TILD, KC_GRV, KC_PLUS, KC_PERC, KC_DQUO, KC_QUOT, KC_SCLN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX ), @@ -61,31 +59,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , XXXXXXX, KC_4 , KC_5 , KC_6 , XXXXXXX, XXXXXXX, // XXXXXXX, KC_ESC , KC_TAB , XXXXXXX, KC_ENT , XXXXXXX, XXXXXXX, KC_1 , KC_2 , KC_3 , XXXXXXX, XXXXXXX, // RESET , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_0 , KC_0 , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - [LAYER_4] = LAYOUT_moonlander( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + [L_4] = LAYOUT_moonlander( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, KC_PGUP, KC_BSPC, KC_UP, KC_DEL , KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, KC_7 , KC_8 , KC_9, XXXXXXX, XXXXXXX, + XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, KC_4 , KC_5 , KC_6, XXXXXXX, XXXXXXX, + XXXXXXX, KC_ESC , KC_TAB , XXXXXXX, KC_ENT, XXXXXXX, XXXXXXX, KC_1 , KC_2 , KC_3, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - ), - - [SYMB] = LAYOUT_moonlander( - VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - KC_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, - KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_TRNS, KC_TRNS, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, - KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, - EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, RGB_TOG, KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, - RGB_HUD, RGB_VAD, RGB_HUI, TOGGLE_LAYER_COLOR,KC_TRNS, KC_TRNS - ), - - [MDIA] = LAYOUT_moonlander( - 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, KC_TRNS, KC_MS_U, 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_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + XXXXXXX, XXXXXXX, KC_TRNS, KC_TRNS, XXXXXXX, XXXXXXX ), }; From 3b76b5cf6dd580be6fdd72d4314ed6b764e1401d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Sun, 11 Oct 2020 15:18:13 -0400 Subject: [PATCH 06/14] cleanup --- keyboards/moonlander/keymaps/shahn/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/moonlander/keymaps/shahn/keymap.c b/keyboards/moonlander/keymaps/shahn/keymap.c index 375bef6bc9b8..36766734751e 100644 --- a/keyboards/moonlander/keymaps/shahn/keymap.c +++ b/keyboards/moonlander/keymaps/shahn/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, KC_BSLS, KC_SLSH, KC_LCBR, KC_RCBR, KC_ASTR, XXXXXXX, XXXXXXX, KC_QUES, KC_LPRN, KC_RPRN, KC_MINS, KC_COLN, KC_AT, XXXXXXX, KC_HASH, KC_DLR , KC_PIPE, KC_TILD, KC_GRV, KC_PLUS, KC_PERC, KC_DQUO, KC_QUOT, KC_SCLN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), // copied from my planck layout @@ -64,8 +64,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, KC_PGUP, KC_BSPC, KC_UP, KC_DEL , KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, KC_7 , KC_8 , KC_9, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, KC_4 , KC_5 , KC_6, XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC , KC_TAB , XXXXXXX, KC_ENT, XXXXXXX, XXXXXXX, KC_1 , KC_2 , KC_3, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, KC_TRNS, KC_TRNS, XXXXXXX, XXXXXXX + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), }; From 5eb4afc02becbaf47f6b0cdd4386729c84ca102f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Sun, 11 Oct 2020 16:28:21 -0400 Subject: [PATCH 07/14] more stuff --- keyboards/moonlander/keymaps/shahn/keymap.c | 32 +++++++-------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/keyboards/moonlander/keymaps/shahn/keymap.c b/keyboards/moonlander/keymaps/shahn/keymap.c index 36766734751e..066e62029fc1 100644 --- a/keyboards/moonlander/keymaps/shahn/keymap.c +++ b/keyboards/moonlander/keymaps/shahn/keymap.c @@ -32,38 +32,28 @@ enum custom_keycodes { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT_moonlander( - XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, XXXXXXX, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX, - KC_TAB , KC_X, KC_V, KC_L, KC_C, KC_W, XXXXXXX, XXXXXXX, KC_K, KC_H, KC_G, KC_F, KC_Q, XXXXXXX, - XXXXXXX, KC_U, KC_I, KC_A, KC_E, KC_O, XXXXXXX, XXXXXXX, KC_S, KC_N, KC_R, KC_T, KC_D, KC_Y, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P, KC_Z, KC_B, KC_M, KC_COMM, KC_DOT, XXXXXXX, XXXXXXX, - XXXXXXX, KC_LCTL, XXXXXXX, KC_LGUI, MO(L_4), XXXXXXX, XXXXXXX, MO(L_4), KC_RGUI, XXXXXXX, KC_RCTL, XXXXXXX, - KC_SPC , KC_LSFT, MO(L_3), MO(L_3), KC_RSFT, KC_SPC + XXXXXXX, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , XXXXXXX, XXXXXXX, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , XXXXXXX, + KC_TAB , KC_X , KC_V , KC_L , KC_C , KC_W , XXXXXXX, XXXXXXX, KC_K , KC_H , KC_G , KC_F , KC_Q , XXXXXXX, + XXXXXXX, KC_U , KC_I , KC_A , KC_E , KC_O , XXXXXXX, XXXXXXX, KC_S , KC_N , KC_R , KC_T , KC_D , KC_Y , + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P , KC_Z , KC_B , KC_M , KC_COMM, KC_DOT , XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, MO(L_4), XXXXXXX, XXXXXXX, MO(L_4), KC_RGUI, XXXXXXX, KC_RCTL, XXXXXXX, + KC_LCTL, KC_LSFT, MO(L_3), MO(L_3), KC_RSFT, KC_SPC ), - // copied from my planck layout - // XXXXXXX, XXXXXXX, KC_UNDS, KC_LBRC, KC_RBRC, KC_CIRC, KC_EXLM, KC_LABK, KC_RABK, KC_EQL , KC_AMPR, XXXXXXX, - // XXXXXXX, KC_BSLS, KC_SLSH, KC_LCBR, KC_RCBR, KC_ASTR, KC_QUES, KC_LPRN, KC_RPRN, KC_MINS, KC_COLN, KC_AT , - // XXXXXXX, KC_HASH, KC_DLR , KC_PIPE, KC_TILD, KC_GRV , KC_PLUS, KC_PERC, KC_DQUO, KC_QUOT, KC_SCLN, XXXXXXX, - // XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC , KC_SPC , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX [L_3] = LAYOUT_moonlander( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_LBRC, KC_RBRC, KC_CIRC, XXXXXXX, XXXXXXX, KC_EXLM, KC_LABK, KC_RABK, KC_EQL , KC_AMPR, XXXXXXX, - XXXXXXX, KC_BSLS, KC_SLSH, KC_LCBR, KC_RCBR, KC_ASTR, XXXXXXX, XXXXXXX, KC_QUES, KC_LPRN, KC_RPRN, KC_MINS, KC_COLN, KC_AT, - XXXXXXX, KC_HASH, KC_DLR , KC_PIPE, KC_TILD, KC_GRV, KC_PLUS, KC_PERC, KC_DQUO, KC_QUOT, KC_SCLN, XXXXXXX, + XXXXXXX, KC_BSLS, KC_SLSH, KC_LCBR, KC_RCBR, KC_ASTR, XXXXXXX, XXXXXXX, KC_QUES, KC_LPRN, KC_RPRN, KC_MINS, KC_COLN, KC_AT , + XXXXXXX, KC_HASH, KC_DLR , KC_PIPE, KC_TILD, KC_GRV , KC_PLUS, KC_PERC, KC_DQUO, KC_QUOT, KC_SCLN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), - // copied from my planck layout - // XXXXXXX, KC_PGUP, KC_BSPC, KC_UP, KC_DEL , KC_PGDN, XXXXXXX, KC_7 , KC_8 , KC_9 , XXXXXXX, XXXXXXX, - // XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , XXXXXXX, KC_4 , KC_5 , KC_6 , XXXXXXX, XXXXXXX, - // XXXXXXX, KC_ESC , KC_TAB , XXXXXXX, KC_ENT , XXXXXXX, XXXXXXX, KC_1 , KC_2 , KC_3 , XXXXXXX, XXXXXXX, - // RESET , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_0 , KC_0 , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX [L_4] = LAYOUT_moonlander( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, KC_PGUP, KC_BSPC, KC_UP, KC_DEL , KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, KC_7 , KC_8 , KC_9, XXXXXXX, XXXXXXX, - XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, KC_4 , KC_5 , KC_6, XXXXXXX, XXXXXXX, - XXXXXXX, KC_ESC , KC_TAB , XXXXXXX, KC_ENT, XXXXXXX, XXXXXXX, KC_1 , KC_2 , KC_3, XXXXXXX, XXXXXXX, + XXXXXXX, KC_PGUP, KC_BSPC, KC_UP , KC_DEL , KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, KC_7 , KC_8 , KC_9 , XXXXXXX, XXXXXXX, + XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , XXXXXXX, XXXXXXX, XXXXXXX, KC_4 , KC_5 , KC_6 , XXXXXXX, XXXXXXX, + XXXXXXX, KC_ESC , KC_TAB , XXXXXXX, KC_ENT , XXXXXXX, XXXXXXX, KC_1 , KC_2 , KC_3 , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), From 031804bda370e85a646a50d846178297ab06978e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Sun, 11 Oct 2020 16:30:05 -0400 Subject: [PATCH 08/14] add the letter 'j' --- keyboards/moonlander/keymaps/shahn/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/moonlander/keymaps/shahn/keymap.c b/keyboards/moonlander/keymaps/shahn/keymap.c index 066e62029fc1..67a73f1f5e40 100644 --- a/keyboards/moonlander/keymaps/shahn/keymap.c +++ b/keyboards/moonlander/keymaps/shahn/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , XXXXXXX, XXXXXXX, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , XXXXXXX, KC_TAB , KC_X , KC_V , KC_L , KC_C , KC_W , XXXXXXX, XXXXXXX, KC_K , KC_H , KC_G , KC_F , KC_Q , XXXXXXX, XXXXXXX, KC_U , KC_I , KC_A , KC_E , KC_O , XXXXXXX, XXXXXXX, KC_S , KC_N , KC_R , KC_T , KC_D , KC_Y , - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P , KC_Z , KC_B , KC_M , KC_COMM, KC_DOT , XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P , KC_Z , KC_B , KC_M , KC_COMM, KC_DOT , KC_J , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, MO(L_4), XXXXXXX, XXXXXXX, MO(L_4), KC_RGUI, XXXXXXX, KC_RCTL, XXXXXXX, KC_LCTL, KC_LSFT, MO(L_3), MO(L_3), KC_RSFT, KC_SPC ), From 7b18bdc69c37e599dcbd9f6b8bfb990ea06d653c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Mon, 12 Oct 2020 20:41:18 -0400 Subject: [PATCH 09/14] add '0' to layer 4 --- keyboards/moonlander/keymaps/shahn/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/moonlander/keymaps/shahn/keymap.c b/keyboards/moonlander/keymaps/shahn/keymap.c index 67a73f1f5e40..03af6ae8d400 100644 --- a/keyboards/moonlander/keymaps/shahn/keymap.c +++ b/keyboards/moonlander/keymaps/shahn/keymap.c @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , XXXXXXX, XXXXXXX, XXXXXXX, KC_4 , KC_5 , KC_6 , XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC , KC_TAB , XXXXXXX, KC_ENT , XXXXXXX, XXXXXXX, KC_1 , KC_2 , KC_3 , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_0 ), }; From 6500fd4a43f3805e8bdb89ce70807f9129103109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Thu, 15 Oct 2020 17:29:27 -0400 Subject: [PATCH 10/14] implement umlauts and eszett with menu key as compose key --- keyboards/moonlander/keymaps/shahn/keymap.c | 34 +++++++++++++++------ 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/keyboards/moonlander/keymaps/shahn/keymap.c b/keyboards/moonlander/keymaps/shahn/keymap.c index 03af6ae8d400..3b4e06273a14 100644 --- a/keyboards/moonlander/keymaps/shahn/keymap.c +++ b/keyboards/moonlander/keymaps/shahn/keymap.c @@ -26,18 +26,21 @@ enum layers { }; enum custom_keycodes { - VRSN = ML_SAFE_RANGE, + a_umlaut = ML_SAFE_RANGE, + o_umlaut, + u_umlaut, + eszett, }; // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT_moonlander( - XXXXXXX, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , XXXXXXX, XXXXXXX, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , XXXXXXX, - KC_TAB , KC_X , KC_V , KC_L , KC_C , KC_W , XXXXXXX, XXXXXXX, KC_K , KC_H , KC_G , KC_F , KC_Q , XXXXXXX, - XXXXXXX, KC_U , KC_I , KC_A , KC_E , KC_O , XXXXXXX, XXXXXXX, KC_S , KC_N , KC_R , KC_T , KC_D , KC_Y , - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P , KC_Z , KC_B , KC_M , KC_COMM, KC_DOT , KC_J , XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, MO(L_4), XXXXXXX, XXXXXXX, MO(L_4), KC_RGUI, XXXXXXX, KC_RCTL, XXXXXXX, - KC_LCTL, KC_LSFT, MO(L_3), MO(L_3), KC_RSFT, KC_SPC + XXXXXXX, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , XXXXXXX, XXXXXXX, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , XXXXXXX, + KC_TAB , KC_X , KC_V , KC_L , KC_C , KC_W , XXXXXXX, XXXXXXX, KC_K , KC_H , KC_G , KC_F , KC_Q , eszett , + XXXXXXX, KC_U , KC_I , KC_A , KC_E , KC_O , XXXXXXX, XXXXXXX, KC_S , KC_N , KC_R , KC_T , KC_D , KC_Y , + XXXXXXX, u_umlaut, o_umlaut, a_umlaut, KC_P , KC_Z , KC_B , KC_M , KC_COMM, KC_DOT , KC_J , XXXXXXX, + XXXXXXX, XXXXXXX , XXXXXXX , KC_LGUI , MO(L_4), XXXXXXX, XXXXXXX, MO(L_4), KC_RGUI, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LCTL, KC_LSFT, MO(L_3), MO(L_3), KC_RSFT, KC_SPC ), [L_3] = LAYOUT_moonlander( @@ -95,11 +98,24 @@ layer_state_t layer_state_set_user(layer_state_t state) { return state; } +// only works after executing +// $ xmodmap -e "keycode 138 = Multi_key" +#define compose_key SS_TAP(X_MENU) + bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { switch (keycode) { - case VRSN: - SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + case a_umlaut: + SEND_STRING(compose_key "\"a"); + return false; + case o_umlaut: + SEND_STRING(compose_key "\"o"); + return false; + case u_umlaut: + SEND_STRING(compose_key "\"u"); + return false; + case eszett: + SEND_STRING(compose_key "ss"); return false; } } From 0df7819580159ef653d5e7bf287dbb4b497f05bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Fri, 16 Oct 2020 16:27:22 -0400 Subject: [PATCH 11/14] add comment --- keyboards/moonlander/keymaps/shahn/keymap.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/keyboards/moonlander/keymaps/shahn/keymap.c b/keyboards/moonlander/keymaps/shahn/keymap.c index 3b4e06273a14..3cefce9a5e65 100644 --- a/keyboards/moonlander/keymaps/shahn/keymap.c +++ b/keyboards/moonlander/keymaps/shahn/keymap.c @@ -16,6 +16,21 @@ * along with this program. If not, see . */ +/* This is my personal keyboard layout based on the Neo keyboard layout: + * https://en.wikipedia.org/wiki/Neo_(keyboard_layout) + * This layout is not meant as a general layout for other people using the + * Neo keyboard layout. It's very specific to my personal needs. + * It still might be useful as inspiration to other people that want to + * create a Neo layout. + * + * Some notes: + * - I've put the ctrl key, the shift keys and the modifiers to switch to + * layer 4 in the middle to be operated by the thumbs. I wanted to avoid + * having to use my pinkies on the outer rows of the keyboard. + * - The umlauts (äöü) and the ß only work on linux when configuring the + * compose key properly. See 'compose_key' below. + */ + #include QMK_KEYBOARD_H #include "version.h" From 28cf23d18a622619b49c92965f81f4b9aaf1e7c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Fri, 16 Oct 2020 16:31:06 -0400 Subject: [PATCH 12/14] renamed layout --- keyboards/moonlander/keymaps/{shahn => shahn-neo}/config.h | 0 keyboards/moonlander/keymaps/{shahn => shahn-neo}/keymap.c | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/moonlander/keymaps/{shahn => shahn-neo}/config.h (100%) rename keyboards/moonlander/keymaps/{shahn => shahn-neo}/keymap.c (100%) diff --git a/keyboards/moonlander/keymaps/shahn/config.h b/keyboards/moonlander/keymaps/shahn-neo/config.h similarity index 100% rename from keyboards/moonlander/keymaps/shahn/config.h rename to keyboards/moonlander/keymaps/shahn-neo/config.h diff --git a/keyboards/moonlander/keymaps/shahn/keymap.c b/keyboards/moonlander/keymaps/shahn-neo/keymap.c similarity index 100% rename from keyboards/moonlander/keymaps/shahn/keymap.c rename to keyboards/moonlander/keymaps/shahn-neo/keymap.c From de16c6419d2576f6568b7d03592ce7b0a5138363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Fri, 16 Oct 2020 16:41:25 -0400 Subject: [PATCH 13/14] change copyright notice --- keyboards/moonlander/keymaps/shahn-neo/config.h | 4 +--- keyboards/moonlander/keymaps/shahn-neo/keymap.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/keyboards/moonlander/keymaps/shahn-neo/config.h b/keyboards/moonlander/keymaps/shahn-neo/config.h index 95b05a5a61bc..1fbac3251744 100644 --- a/keyboards/moonlander/keymaps/shahn-neo/config.h +++ b/keyboards/moonlander/keymaps/shahn-neo/config.h @@ -1,6 +1,4 @@ -/* Copyright 2020 ZSA Technology Labs, Inc <@zsa> - * Copyright 2020 Jack Humbert - * Copyright 2020 Drashna Jael're +/* Copyright 2020 Sönke Hahn * * 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 diff --git a/keyboards/moonlander/keymaps/shahn-neo/keymap.c b/keyboards/moonlander/keymaps/shahn-neo/keymap.c index 3cefce9a5e65..395f5be51748 100644 --- a/keyboards/moonlander/keymaps/shahn-neo/keymap.c +++ b/keyboards/moonlander/keymaps/shahn-neo/keymap.c @@ -1,6 +1,4 @@ -/* Copyright 2020 ZSA Technology Labs, Inc <@zsa> - * Copyright 2020 Jack Humbert - * Copyright 2020 Drashna Jael're +/* Copyright 2020 Sönke Hahn * * 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 From 33cd5c02ae42304939422aaaf2f82c7fd0a77fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Fri, 16 Oct 2020 16:53:50 -0400 Subject: [PATCH 14/14] add separate readme file --- keyboards/moonlander/keymaps/shahn-neo/keymap.c | 15 --------------- keyboards/moonlander/keymaps/shahn-neo/readme.md | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 keyboards/moonlander/keymaps/shahn-neo/readme.md diff --git a/keyboards/moonlander/keymaps/shahn-neo/keymap.c b/keyboards/moonlander/keymaps/shahn-neo/keymap.c index 395f5be51748..27ccdbb62928 100644 --- a/keyboards/moonlander/keymaps/shahn-neo/keymap.c +++ b/keyboards/moonlander/keymaps/shahn-neo/keymap.c @@ -14,21 +14,6 @@ * along with this program. If not, see . */ -/* This is my personal keyboard layout based on the Neo keyboard layout: - * https://en.wikipedia.org/wiki/Neo_(keyboard_layout) - * This layout is not meant as a general layout for other people using the - * Neo keyboard layout. It's very specific to my personal needs. - * It still might be useful as inspiration to other people that want to - * create a Neo layout. - * - * Some notes: - * - I've put the ctrl key, the shift keys and the modifiers to switch to - * layer 4 in the middle to be operated by the thumbs. I wanted to avoid - * having to use my pinkies on the outer rows of the keyboard. - * - The umlauts (äöü) and the ß only work on linux when configuring the - * compose key properly. See 'compose_key' below. - */ - #include QMK_KEYBOARD_H #include "version.h" diff --git a/keyboards/moonlander/keymaps/shahn-neo/readme.md b/keyboards/moonlander/keymaps/shahn-neo/readme.md new file mode 100644 index 000000000000..d2c9c887469f --- /dev/null +++ b/keyboards/moonlander/keymaps/shahn-neo/readme.md @@ -0,0 +1,16 @@ +# Sönke Hahn's Neo layout for the Moonlander keyboard + +This is my personal keyboard layout based on the Neo keyboard layout: +https://en.wikipedia.org/wiki/Neo_(keyboard_layout) +This layout is not meant as a general layout for other people using the +Neo keyboard layout. It's very specific to my personal needs. +It still might be useful as inspiration to other people who want to +create a Neo layout. + +Some notes: + +- I've put the ctrl key, the shift keys and the modifiers to switch to + layer 4 in the middle to be operated by the thumbs. I wanted to avoid + having to use my pinkies on the outer rows of the keyboard. +- The umlauts (äöü) and the ß only work on linux when configuring the + compose key properly. See `compose_key` in `./keymap.c`.