diff options
| -rw-r--r-- | data/mappings/keyboard_aliases.hjson | 3 | ||||
| -rw-r--r-- | keyboards/moonlander/keymaps/shahn-neo/config.h | 19 | ||||
| -rw-r--r-- | keyboards/moonlander/keymaps/shahn-neo/keymap.c | 121 | ||||
| -rw-r--r-- | keyboards/moonlander/keymaps/shahn-neo/readme.md | 16 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/config.h (renamed from keyboards/moonlander/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/halconf.h (renamed from keyboards/moonlander/halconf.h) | 0 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/info.json (renamed from keyboards/moonlander/info.json) | 0 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/keymaps/default/config.h (renamed from keyboards/moonlander/keymaps/default/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/keymaps/default/keymap.c (renamed from keyboards/moonlander/keymaps/default/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/keymaps/via/keymap.c (renamed from keyboards/moonlander/keymaps/via/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/keymaps/via/readme.md (renamed from keyboards/moonlander/keymaps/via/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/keymaps/via/rules.mk (renamed from keyboards/moonlander/keymaps/via/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/matrix.c (renamed from keyboards/moonlander/matrix.c) | 0 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/mcuconf.h (renamed from keyboards/moonlander/mcuconf.h) | 0 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/moonlander.c (renamed from keyboards/moonlander/moonlander.c) | 0 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/moonlander.h (renamed from keyboards/moonlander/moonlander.h) | 0 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/readme.md (renamed from keyboards/moonlander/readme.md) | 8 | ||||
| -rw-r--r-- | keyboards/zsa/moonlander/rules.mk (renamed from keyboards/moonlander/rules.mk) | 0 |
18 files changed, 7 insertions, 160 deletions
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index fed6018b9b..cd870405ef 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -464,6 +464,9 @@ "montsinger/rebound": { "target": "montsinger/rebound/rev1" }, + "moonlander": { + "target": "zsa/moonlander" + }, "mschwingen/modelm": { "target": "ibm/model_m/mschwingen" }, diff --git a/keyboards/moonlander/keymaps/shahn-neo/config.h b/keyboards/moonlander/keymaps/shahn-neo/config.h deleted file mode 100644 index 1fbac32517..0000000000 --- a/keyboards/moonlander/keymaps/shahn-neo/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Sönke Hahn <SoenkeHahn@gmail.com> - * - * 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/>. - */ - -#pragma once - -#define ORYX_CONFIGURATOR diff --git a/keyboards/moonlander/keymaps/shahn-neo/keymap.c b/keyboards/moonlander/keymaps/shahn-neo/keymap.c deleted file mode 100644 index fc174a62fe..0000000000 --- a/keyboards/moonlander/keymaps/shahn-neo/keymap.c +++ /dev/null @@ -1,121 +0,0 @@ -/* Copyright 2020 Sönke Hahn <SoenkeHahn@gmail.com> - * - * 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/>. - */ - -#include QMK_KEYBOARD_H -#include "version.h" - -enum layers { - BASE, // default layer - L_3, - L_4, -}; - -enum custom_keycodes { - a_umlaut = 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 , 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( - 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, 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, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_0 - ), -}; - -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; -} - -// 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 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; - } - } - return true; -} diff --git a/keyboards/moonlander/keymaps/shahn-neo/readme.md b/keyboards/moonlander/keymaps/shahn-neo/readme.md deleted file mode 100644 index d2c9c88746..0000000000 --- a/keyboards/moonlander/keymaps/shahn-neo/readme.md +++ /dev/null @@ -1,16 +0,0 @@ -# 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`. diff --git a/keyboards/moonlander/config.h b/keyboards/zsa/moonlander/config.h index 76e9906d3d..76e9906d3d 100644 --- a/keyboards/moonlander/config.h +++ b/keyboards/zsa/moonlander/config.h diff --git a/keyboards/moonlander/halconf.h b/keyboards/zsa/moonlander/halconf.h index 46b53b1a7f..46b53b1a7f 100644 --- a/keyboards/moonlander/halconf.h +++ b/keyboards/zsa/moonlander/halconf.h diff --git a/keyboards/moonlander/info.json b/keyboards/zsa/moonlander/info.json index 1a7982ed57..1a7982ed57 100644 --- a/keyboards/moonlander/info.json +++ b/keyboards/zsa/moonlander/info.json diff --git a/keyboards/moonlander/keymaps/default/config.h b/keyboards/zsa/moonlander/keymaps/default/config.h index 83ea2a1b58..83ea2a1b58 100644 --- a/keyboards/moonlander/keymaps/default/config.h +++ b/keyboards/zsa/moonlander/keymaps/default/config.h diff --git a/keyboards/moonlander/keymaps/default/keymap.c b/keyboards/zsa/moonlander/keymaps/default/keymap.c index ad7705eff8..ad7705eff8 100644 --- a/keyboards/moonlander/keymaps/default/keymap.c +++ b/keyboards/zsa/moonlander/keymaps/default/keymap.c diff --git a/keyboards/moonlander/keymaps/via/keymap.c b/keyboards/zsa/moonlander/keymaps/via/keymap.c index 4b1e4c83e7..4b1e4c83e7 100644 --- a/keyboards/moonlander/keymaps/via/keymap.c +++ b/keyboards/zsa/moonlander/keymaps/via/keymap.c diff --git a/keyboards/moonlander/keymaps/via/readme.md b/keyboards/zsa/moonlander/keymaps/via/readme.md index 8bede7bee3..8bede7bee3 100644 --- a/keyboards/moonlander/keymaps/via/readme.md +++ b/keyboards/zsa/moonlander/keymaps/via/readme.md diff --git a/keyboards/moonlander/keymaps/via/rules.mk b/keyboards/zsa/moonlander/keymaps/via/rules.mk index 1e5b99807c..1e5b99807c 100644 --- a/keyboards/moonlander/keymaps/via/rules.mk +++ b/keyboards/zsa/moonlander/keymaps/via/rules.mk diff --git a/keyboards/moonlander/matrix.c b/keyboards/zsa/moonlander/matrix.c index 36017fcd12..36017fcd12 100644 --- a/keyboards/moonlander/matrix.c +++ b/keyboards/zsa/moonlander/matrix.c diff --git a/keyboards/moonlander/mcuconf.h b/keyboards/zsa/moonlander/mcuconf.h index 032c853f4e..032c853f4e 100644 --- a/keyboards/moonlander/mcuconf.h +++ b/keyboards/zsa/moonlander/mcuconf.h diff --git a/keyboards/moonlander/moonlander.c b/keyboards/zsa/moonlander/moonlander.c index dad795d315..dad795d315 100644 --- a/keyboards/moonlander/moonlander.c +++ b/keyboards/zsa/moonlander/moonlander.c diff --git a/keyboards/moonlander/moonlander.h b/keyboards/zsa/moonlander/moonlander.h index 0e5282c511..0e5282c511 100644 --- a/keyboards/moonlander/moonlander.h +++ b/keyboards/zsa/moonlander/moonlander.h diff --git a/keyboards/moonlander/readme.md b/keyboards/zsa/moonlander/readme.md index 733780abde..546681e630 100644 --- a/keyboards/moonlander/readme.md +++ b/keyboards/zsa/moonlander/readme.md @@ -1,6 +1,6 @@ # Moonlander - + A next-gen split, ergonomic keyboard with an active left side, USB type C, integrated wrist rest, and a thumb cluster that can move. @@ -11,11 +11,11 @@ A next-gen split, ergonomic keyboard with an active left side, USB type C, integ Make example for this keyboard (after setting up your build environment): - make moonlander:default + make zsa/moonlander:default Flashing example for this keyboard: - make moonlander:default:flash + make zsa/moonlander:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). @@ -55,4 +55,4 @@ void housekeeping_task_user(void) { // set layer } } -```
\ No newline at end of file +``` diff --git a/keyboards/moonlander/rules.mk b/keyboards/zsa/moonlander/rules.mk index 204c5940e4..204c5940e4 100644 --- a/keyboards/moonlander/rules.mk +++ b/keyboards/zsa/moonlander/rules.mk |