From 1ae9966295502b5a262a3eb5b14deb869f0fc304 Mon Sep 17 00:00:00 2001 From: tan-t Date: Thu, 15 Dec 2022 16:29:10 +0900 Subject: [PATCH 01/10] add support for mothwing --- keyboards/mothwing/config.h | 21 ++ keyboards/mothwing/keymaps/default/config.h | 21 ++ keyboards/mothwing/keymaps/default/keymap.c | 72 ++++++ keyboards/mothwing/keymaps/via/config.h | 21 ++ keyboards/mothwing/keymaps/via/keymap.c | 84 +++++++ keyboards/mothwing/keymaps/via/rules.mk | 1 + keyboards/mothwing/lib/glcdfont.c | 232 ++++++++++++++++++++ keyboards/mothwing/mothwing.c | 1 + keyboards/mothwing/mothwing.h | 5 + keyboards/mothwing/readme.md | 23 ++ keyboards/mothwing/rev1/config.h | 64 ++++++ keyboards/mothwing/rev1/info.json | 61 +++++ keyboards/mothwing/rev1/readme.md | 13 ++ keyboards/mothwing/rev1/rev1.c | 1 + keyboards/mothwing/rev1/rev1.h | 20 ++ keyboards/mothwing/rev1/rules.mk | 14 ++ keyboards/mothwing/rules.mk | 20 ++ 17 files changed, 674 insertions(+) create mode 100644 keyboards/mothwing/config.h create mode 100644 keyboards/mothwing/keymaps/default/config.h create mode 100644 keyboards/mothwing/keymaps/default/keymap.c create mode 100644 keyboards/mothwing/keymaps/via/config.h create mode 100644 keyboards/mothwing/keymaps/via/keymap.c create mode 100644 keyboards/mothwing/keymaps/via/rules.mk create mode 100644 keyboards/mothwing/lib/glcdfont.c create mode 100644 keyboards/mothwing/mothwing.c create mode 100644 keyboards/mothwing/mothwing.h create mode 100644 keyboards/mothwing/readme.md create mode 100644 keyboards/mothwing/rev1/config.h create mode 100644 keyboards/mothwing/rev1/info.json create mode 100644 keyboards/mothwing/rev1/readme.md create mode 100644 keyboards/mothwing/rev1/rev1.c create mode 100644 keyboards/mothwing/rev1/rev1.h create mode 100644 keyboards/mothwing/rev1/rules.mk create mode 100644 keyboards/mothwing/rules.mk diff --git a/keyboards/mothwing/config.h b/keyboards/mothwing/config.h new file mode 100644 index 000000000000..cfb6bf4ffccd --- /dev/null +++ b/keyboards/mothwing/config.h @@ -0,0 +1,21 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 + +#include "config_common.h" diff --git a/keyboards/mothwing/keymaps/default/config.h b/keyboards/mothwing/keymaps/default/config.h new file mode 100644 index 000000000000..98469e4ccf1a --- /dev/null +++ b/keyboards/mothwing/keymaps/default/config.h @@ -0,0 +1,21 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 MASTER_LEFT diff --git a/keyboards/mothwing/keymaps/default/keymap.c b/keyboards/mothwing/keymaps/default/keymap.c new file mode 100644 index 000000000000..e7e5cc99e12c --- /dev/null +++ b/keyboards/mothwing/keymaps/default/keymap.c @@ -0,0 +1,72 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +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 + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. + +enum layer_number { + _QWERTY = 0, + _RAISE, + _LOWER, +}; + +#define KC_L_SPC LT(_LOWER, KC_SPC) // lower +#define KC_R_ENT LT(_RAISE, KC_ENT) // raise +#define KC_G_JA LGUI_T(KC_LNG1) // cmd or win +#define KC_G_EN LGUI_T(KC_LNG2) // cmd or win +#define KC_C_BS LCTL_T(KC_BSPC) // ctrl +#define KC_A_DEL ALT_T(KC_DEL) // alt + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + //,--------+--------+---------+--------+---------+--------. ,--------+---------+--------+---------+--------+--------. + KC_ESC , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS, + //|--------+--------+---------+--------+---------+--------| |--------+---------+--------+---------+--------+--------| + KC_TAB , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, + //|--------+--------+---------+--------+---------+--------| |--------+---------+--------+---------+--------+--------| + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, + //`--------+--------+---------+--------+---------+--------/ \--------+---------+--------+---------+--------+--------' + KC_A_DEL, KC_G_EN, KC_L_SPC, KC_C_BS, KC_C_BS, KC_R_ENT, KC_G_JA, KC_A_DEL + // `----------+--------+---------+--------' `--------+---------+--------+---------' + ), + + [_RAISE] = LAYOUT( + //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. + _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE, KC_AT , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_GRV , KC_RPRN, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, _______, _______, _______, KC_LCBR, KC_LBRC, KC_RBRC, KC_RCBR, _______, _______, _______, _______, + //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------' + _______, _______, _______, _______, _______, _______, _______, QK_BOOT + // `--------+--------+--------+--------' `--------+--------+--------+--------' + ), + + [_LOWER] = LAYOUT( + //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. + KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______, + //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------' + QK_BOOT , _______, _______, _______, _______, _______, _______, _______ + // `--------+--------+--------+--------' `--------+--------+--------+--------' + ), +}; diff --git a/keyboards/mothwing/keymaps/via/config.h b/keyboards/mothwing/keymaps/via/config.h new file mode 100644 index 000000000000..98469e4ccf1a --- /dev/null +++ b/keyboards/mothwing/keymaps/via/config.h @@ -0,0 +1,21 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 MASTER_LEFT diff --git a/keyboards/mothwing/keymaps/via/keymap.c b/keyboards/mothwing/keymaps/via/keymap.c new file mode 100644 index 000000000000..957c6b5b6a67 --- /dev/null +++ b/keyboards/mothwing/keymaps/via/keymap.c @@ -0,0 +1,84 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +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 + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. + +enum layer_number { + _QWERTY = 0, + _RAISE, + _LOWER, + _ADJUST, +}; + +#define KC_L_SPC LT(_LOWER, KC_SPC) // lower +#define KC_R_ENT LT(_RAISE, KC_ENT) // raise +#define KC_G_JA LGUI_T(KC_LNG1) // cmd or win +#define KC_G_EN LGUI_T(KC_LNG2) // cmd or win +#define KC_C_BS LCTL_T(KC_BSPC) // ctrl +#define KC_A_DEL ALT_T(KC_DEL) // alt + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + //,--------+--------+---------+--------+---------+--------. ,--------+---------+--------+---------+--------+--------. + KC_ESC , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS, + //|--------+--------+---------+--------+---------+--------| |--------+---------+--------+---------+--------+--------| + KC_TAB , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, + //|--------+--------+---------+--------+---------+--------| |--------+---------+--------+---------+--------+--------| + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, + //`--------+--------+---------+--------+---------+--------/ \--------+---------+--------+---------+--------+--------' + KC_A_DEL, KC_G_EN, KC_L_SPC, KC_C_BS, KC_C_BS, KC_R_ENT, KC_G_JA, KC_A_DEL + // `----------+--------+---------+--------' `--------+---------+--------+---------' + ), + + [_RAISE] = LAYOUT( + //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. + _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE, KC_AT , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_GRV , KC_RPRN, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, _______, _______, _______, KC_LCBR, KC_LBRC, KC_RBRC, KC_RCBR, _______, _______, _______, _______, + //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------' + _______, _______, _______, _______, _______, _______, _______, QK_BOOT + // `--------+--------+--------+--------' `--------+--------+--------+--------' + ), + + [_LOWER] = LAYOUT( + //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. + KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______, + //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------' + QK_BOOT , _______, _______, _______, _______, _______, _______, _______ + // `--------+--------+--------+--------' `--------+--------+--------+--------' + ), + [_ADJUST] = LAYOUT( + //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. + 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_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_TRNS, KC_TRNS, + //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------' + KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + // `--------+--------+--------+--------' `--------+--------+--------+--------' + ), +}; diff --git a/keyboards/mothwing/keymaps/via/rules.mk b/keyboards/mothwing/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/mothwing/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/mothwing/lib/glcdfont.c b/keyboards/mothwing/lib/glcdfont.c new file mode 100644 index 000000000000..9fa1c806aa72 --- /dev/null +++ b/keyboards/mothwing/lib/glcdfont.c @@ -0,0 +1,232 @@ +// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. +// See gfxfont.h for newer custom bitmap font info. + +#include "progmem.h" + +// Standard ASCII 5x7 font +const unsigned char font[] PROGMEM = { +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, +0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, +0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, +0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, +0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, +0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, +0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, +0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, +0x00, 0x18, 0x24, 0x18, 0x00, 0x00, +0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, +0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, +0x26, 0x29, 0x79, 0x29, 0x26, 0x00, +0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, +0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, +0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, +0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, +0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, +0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, +0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, +0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, +0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, +0x60, 0x60, 0x60, 0x60, 0x60, 0x00, +0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, +0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, +0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, +0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, +0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, +0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, +0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, +0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, +0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, +0x00, 0x07, 0x00, 0x07, 0x00, 0x00, +0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, +0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, +0x23, 0x13, 0x08, 0x64, 0x62, 0x00, +0x36, 0x49, 0x56, 0x20, 0x50, 0x00, +0x00, 0x08, 0x07, 0x03, 0x00, 0x00, +0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, +0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, +0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, +0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, +0x00, 0x80, 0x70, 0x30, 0x00, 0x00, +0x08, 0x08, 0x08, 0x08, 0x08, 0x00, +0x00, 0x00, 0x60, 0x60, 0x00, 0x00, +0x20, 0x10, 0x08, 0x04, 0x02, 0x00, +0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, +0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, +0x72, 0x49, 0x49, 0x49, 0x46, 0x00, +0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, +0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, +0x27, 0x45, 0x45, 0x45, 0x39, 0x00, +0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, +0x41, 0x21, 0x11, 0x09, 0x07, 0x00, +0x36, 0x49, 0x49, 0x49, 0x36, 0x00, +0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, +0x00, 0x00, 0x14, 0x00, 0x00, 0x00, +0x00, 0x40, 0x34, 0x00, 0x00, 0x00, +0x00, 0x08, 0x14, 0x22, 0x41, 0x00, +0x14, 0x14, 0x14, 0x14, 0x14, 0x00, +0x00, 0x41, 0x22, 0x14, 0x08, 0x00, +0x02, 0x01, 0x59, 0x09, 0x06, 0x00, +0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, +0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, +0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, +0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, +0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, +0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, +0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, +0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, +0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, +0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, +0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, +0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, +0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, +0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, +0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, +0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, +0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, +0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, +0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, +0x26, 0x49, 0x49, 0x49, 0x32, 0x00, +0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, +0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, +0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, +0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, +0x63, 0x14, 0x08, 0x14, 0x63, 0x00, +0x03, 0x04, 0x78, 0x04, 0x03, 0x00, +0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, +0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, +0x02, 0x04, 0x08, 0x10, 0x20, 0x00, +0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, +0x04, 0x02, 0x01, 0x02, 0x04, 0x00, +0x40, 0x40, 0x40, 0x40, 0x40, 0x00, +0x00, 0x03, 0x07, 0x08, 0x00, 0x00, +0x20, 0x54, 0x54, 0x78, 0x40, 0x00, +0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, +0x38, 0x44, 0x44, 0x44, 0x28, 0x00, +0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, +0x38, 0x54, 0x54, 0x54, 0x18, 0x00, +0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, +0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, +0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, +0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, +0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, +0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, +0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, +0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, +0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, +0x38, 0x44, 0x44, 0x44, 0x38, 0x00, +0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, +0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, +0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, +0x48, 0x54, 0x54, 0x54, 0x24, 0x00, +0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, +0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, +0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, +0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, +0x44, 0x28, 0x10, 0x28, 0x44, 0x00, +0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, +0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, +0x00, 0x08, 0x36, 0x41, 0x00, 0x00, +0x00, 0x00, 0x77, 0x00, 0x00, 0x00, +0x00, 0x41, 0x36, 0x08, 0x00, 0x00, +0x02, 0x01, 0x02, 0x04, 0x02, 0x00, +0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xFC, 0xFC, 0xFC, 0xFC, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, + 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, + 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x80, 0xC0, 0xF0, 0xF8, 0xF8, + 0xF8, 0xF8, 0xF8, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, + 0xE0, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, +0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, +0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, +0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, +0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, +0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, +0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, +0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xF8, 0xFC, 0xFE, + 0xFF, 0x1F, 0x07, 0x07, 0x07, 0x07, + 0x1F, 0x1F, 0x1F, 0x1E, 0x18, 0x00, + 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, + 0x00, 0x00, 0x00, 0x9E, 0xDF, 0xDF, + 0xCF, 0xC7, 0xE7, 0xE7, 0xE7, 0xFF, + 0xFF, 0xFF, 0xFE, 0x00, 0x00, 0x03, + 0x3F, 0xFF, 0xFF, 0xFE, 0xC0, 0x00, + 0xF0, 0xFF, 0xFF, 0x1F, 0xFF, 0xFF, + 0xF0, 0x00, 0xC0, 0xFC, 0xFF, 0xFF, + 0x3F, 0x03, 0x00, 0xC0, 0xF0, 0xF8, + 0xFE, 0x9F, 0x87, 0x83, 0x80, 0xFF, + 0xFF, 0xFF, 0xFF, 0x80, 0x80, 0x00, + 0x00, 0xE0, 0xF8, 0xFC, 0xBF, 0x8F, + 0x83, 0x81, 0xFF, 0xFF, 0xFF, 0xFF, + 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, +0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, +0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, +0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, +0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, +0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, +0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, +0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x07, 0x1F, 0x3F, + 0x7F, 0x7C, 0x78, 0x70, 0x70, 0x78, + 0x7E, 0x3E, 0x3E, 0x0E, 0x06, 0x00, + 0x00, 0x7F, 0x7F, 0x7F, 0x7F, 0x00, + 0x00, 0x00, 0x1F, 0x3F, 0x7F, 0x7F, + 0x79, 0x71, 0x70, 0x30, 0x38, 0x3F, + 0x7F, 0x7F, 0x7F, 0x60, 0x00, 0x00, + 0x00, 0x01, 0x1F, 0x7F, 0x7F, 0x7E, + 0x7F, 0x1F, 0x01, 0x00, 0x01, 0x3F, + 0x7F, 0x7E, 0x7F, 0x7F, 0x0F, 0x01, + 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x7F, + 0x7F, 0x7F, 0x7F, 0x03, 0x03, 0x00, + 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x7F, 0x7F, 0x7F, 0x7F, + 0x07, 0x03, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; diff --git a/keyboards/mothwing/mothwing.c b/keyboards/mothwing/mothwing.c new file mode 100644 index 000000000000..50bf8c79859b --- /dev/null +++ b/keyboards/mothwing/mothwing.c @@ -0,0 +1 @@ +#include "mothwing.h" diff --git a/keyboards/mothwing/mothwing.h b/keyboards/mothwing/mothwing.h new file mode 100644 index 000000000000..9421831d311d --- /dev/null +++ b/keyboards/mothwing/mothwing.h @@ -0,0 +1,5 @@ +#pragma once + +#ifdef KEYBOARD_mothwing_rev1 + #include "rev1.h" +#endif diff --git a/keyboards/mothwing/readme.md b/keyboards/mothwing/readme.md new file mode 100644 index 000000000000..9dedc007d984 --- /dev/null +++ b/keyboards/mothwing/readme.md @@ -0,0 +1,23 @@ +# MOTHWING + +A split keyboard with 3x6 vertically staggered keys and 4 thumb keys. + +* Keyboard Maintainer: [tan-t](https://github.com/tan-t) +* Hardware Supported: MOTHWING PCB +* Hardware Availability: currently unavailable. merch will be open around May 2023. + +Make example for this keyboard (after setting up your build environment): + + make mothwing:default + +Flashing example for this keyboard: + + make mothwing: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). + +## Bootloader + +Enter the bootloader by: + +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/mothwing/rev1/config.h b/keyboards/mothwing/rev1/config.h new file mode 100644 index 000000000000..98a7d40e5dff --- /dev/null +++ b/keyboards/mothwing/rev1/config.h @@ -0,0 +1,64 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 + +/* key matrix size */ +#define MATRIX_ROWS 8 +#define MATRIX_COLS 6 +#define MATRIX_ROW_PINS { D4, C6, D7, E6 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } +#define DIODE_DIRECTION COL2ROW +#define SOFT_SERIAL_PIN D2 + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ +// #define BACKLIGHT_LEVELS 3 + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +//#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +//#define LOCKING_RESYNC_ENABLE + +/* ws2812 RGB LED */ +/* +#define RGB_DI_PIN D3 + +#define RGBLED_NUM 12 // Number of LEDs +*/ + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +// #define NO_DEBUG + +/* disable print */ +// #define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/mothwing/rev1/info.json b/keyboards/mothwing/rev1/info.json new file mode 100644 index 000000000000..f21d2faeecf0 --- /dev/null +++ b/keyboards/mothwing/rev1/info.json @@ -0,0 +1,61 @@ +{ + "keyboard_name": "mothwing", + "manufacturer": "Luana co.ltd.", + "url": "", + "maintainer": "tan-t", + "usb": { + "vid": "0x5946", + "pid": "0x0001", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"L00", "x":0, "y":1.18}, + {"label":"L01", "x":1, "y":1.03}, + {"label":"L02", "x":2, "y":0.35}, + {"label":"L03", "x":3, "y":0}, + {"label":"L04", "x":4, "y":0.05}, + {"label":"L05", "x":5, "y":0.10}, + {"label":"R00", "x":11.5, "y":0.10}, + {"label":"R01", "x":12.5, "y":0.05}, + {"label":"R02", "x":13.5, "y":0}, + {"label":"R03", "x":14.5, "y":0.35}, + {"label":"R04", "x":15.5, "y":1.08}, + {"label":"R05", "x":16.5, "y":1.18}, + {"label":"L10", "x":0, "y":2.18}, + {"label":"L11", "x":1, "y":2.03}, + {"label":"L12", "x":2, "y":1.35}, + {"label":"L13", "x":3, "y":1}, + {"label":"L14", "x":4, "y":1.05}, + {"label":"L15", "x":5, "y":1.10}, + {"label":"R10", "x":11.5, "y":1.10}, + {"label":"R11", "x":12.5, "y":1.05}, + {"label":"R12", "x":13.5, "y":1}, + {"label":"R13", "x":14.5, "y":1.35}, + {"label":"R14", "x":15.5, "y":2.03}, + {"label":"R15", "x":16.5, "y":2.18}, + {"label":"L20", "x":0, "y":3.18}, + {"label":"L21", "x":1, "y":3.03}, + {"label":"L22", "x":2, "y":2.35}, + {"label":"L23", "x":3, "y":2}, + {"label":"L24", "x":4, "y":2.05}, + {"label":"L25", "x":5, "y":2.10}, + {"label":"R20", "x":11.5, "y":2.10}, + {"label":"R21", "x":12.5, "y":2.05}, + {"label":"R22", "x":13.5, "y":2}, + {"label":"R23", "x":14.5, "y":2.35}, + {"label":"R24", "x":15.5, "y":3.03}, + {"label":"R25", "x":16.5, "y":3.18}, + {"label":"L30", "x":4, "y":3.05}, + {"label":"L31", "x":5, "y":3.10}, + {"label":"L32", "x":6, "y":3.20, "w":1.25}, + {"label":"L33", "x":7.25, "y":3.50}, + {"label":"R30", "x":9.25, "y":3.50}, + {"label":"R31", "x":10.25, "y":3.20, "w":1.25}, + {"label":"R32", "x":11.5, "y":3.10}, + {"label":"R33", "x":12.5, "y":3.05} + ] + } + } +} diff --git a/keyboards/mothwing/rev1/readme.md b/keyboards/mothwing/rev1/readme.md new file mode 100644 index 000000000000..60dced288d0a --- /dev/null +++ b/keyboards/mothwing/rev1/readme.md @@ -0,0 +1,13 @@ +# MOTHWING + +A split keyboard with 3x6 vertically staggered keys and 4 thumb keys. + +* Keyboard Maintainer: [@tan-t](https://github.com/tan-t) +* Hardware Supported: MOTHWING PCB +* Hardware Availability: currently unavailable. merch will be open around May 2023. + +Make example for this keyboard (after setting up your build environment): + + make mothwing/rev1:default + +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). diff --git a/keyboards/mothwing/rev1/rev1.c b/keyboards/mothwing/rev1/rev1.c new file mode 100644 index 000000000000..520a869e57ba --- /dev/null +++ b/keyboards/mothwing/rev1/rev1.c @@ -0,0 +1 @@ +#include "rev1.h" diff --git a/keyboards/mothwing/rev1/rev1.h b/keyboards/mothwing/rev1/rev1.h new file mode 100644 index 000000000000..9a05977153fb --- /dev/null +++ b/keyboards/mothwing/rev1/rev1.h @@ -0,0 +1,20 @@ +#pragma once + +#include "quantum.h" + +#define LAYOUT( \ + L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ + L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ + L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ + L30, L31, L32, L33, R30, R31, R32, R33 \ + ) \ + { \ + { L00, L01, L02, L03, L04, L05 }, \ + { L10, L11, L12, L13, L14, L15 }, \ + { L20, L21, L22, L23, L24, L25 }, \ + { KC_NO, KC_NO, L30, L31, L32, L33 }, \ + { R05, R04, R03, R02, R01, R00 }, \ + { R15, R14, R13, R12, R11, R10 }, \ + { R25, R24, R23, R22, R21, R20 }, \ + { KC_NO, KC_NO, R33, R32, R31, R30 } \ + } diff --git a/keyboards/mothwing/rev1/rules.mk b/keyboards/mothwing/rev1/rules.mk new file mode 100644 index 000000000000..a66eb7d352ea --- /dev/null +++ b/keyboards/mothwing/rev1/rules.mk @@ -0,0 +1,14 @@ +# Build Options +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +AUDIO_ENABLE = no # Audio output +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. +SWAP_HANDS_ENABLE = no # Enable one-hand typing + +OLED_ENABLE = no # Add OLED displays support +SPLIT_KEYBOARD = yes diff --git a/keyboards/mothwing/rules.mk b/keyboards/mothwing/rules.mk new file mode 100644 index 000000000000..ff1c5d3933ce --- /dev/null +++ b/keyboards/mothwing/rules.mk @@ -0,0 +1,20 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = caterina + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +AUDIO_ENABLE = no # Audio output +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. + +DEFAULT_FOLDER = mothwing/rev1 From fc77086f7385224a6f7daa23ff95bfef2da9a0af Mon Sep 17 00:00:00 2001 From: tan-t Date: Thu, 15 Dec 2022 21:02:01 +0900 Subject: [PATCH 02/10] update mothwing configurations --- keyboards/mothwing/config.h | 21 --------------------- keyboards/mothwing/keymaps/default/config.h | 21 --------------------- keyboards/mothwing/keymaps/via/config.h | 21 --------------------- keyboards/mothwing/rev1/readme.md | 13 ------------- keyboards/mothwing/rev1/rules.mk | 14 -------------- keyboards/mothwing/rules.mk | 2 +- 6 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 keyboards/mothwing/config.h delete mode 100644 keyboards/mothwing/keymaps/default/config.h delete mode 100644 keyboards/mothwing/keymaps/via/config.h delete mode 100644 keyboards/mothwing/rev1/readme.md delete mode 100644 keyboards/mothwing/rev1/rules.mk diff --git a/keyboards/mothwing/config.h b/keyboards/mothwing/config.h deleted file mode 100644 index cfb6bf4ffccd..000000000000 --- a/keyboards/mothwing/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 - -#include "config_common.h" diff --git a/keyboards/mothwing/keymaps/default/config.h b/keyboards/mothwing/keymaps/default/config.h deleted file mode 100644 index 98469e4ccf1a..000000000000 --- a/keyboards/mothwing/keymaps/default/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 MASTER_LEFT diff --git a/keyboards/mothwing/keymaps/via/config.h b/keyboards/mothwing/keymaps/via/config.h deleted file mode 100644 index 98469e4ccf1a..000000000000 --- a/keyboards/mothwing/keymaps/via/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 MASTER_LEFT diff --git a/keyboards/mothwing/rev1/readme.md b/keyboards/mothwing/rev1/readme.md deleted file mode 100644 index 60dced288d0a..000000000000 --- a/keyboards/mothwing/rev1/readme.md +++ /dev/null @@ -1,13 +0,0 @@ -# MOTHWING - -A split keyboard with 3x6 vertically staggered keys and 4 thumb keys. - -* Keyboard Maintainer: [@tan-t](https://github.com/tan-t) -* Hardware Supported: MOTHWING PCB -* Hardware Availability: currently unavailable. merch will be open around May 2023. - -Make example for this keyboard (after setting up your build environment): - - make mothwing/rev1:default - -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). diff --git a/keyboards/mothwing/rev1/rules.mk b/keyboards/mothwing/rev1/rules.mk deleted file mode 100644 index a66eb7d352ea..000000000000 --- a/keyboards/mothwing/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SWAP_HANDS_ENABLE = no # Enable one-hand typing - -OLED_ENABLE = no # Add OLED displays support -SPLIT_KEYBOARD = yes diff --git a/keyboards/mothwing/rules.mk b/keyboards/mothwing/rules.mk index ff1c5d3933ce..4284c1fc5732 100644 --- a/keyboards/mothwing/rules.mk +++ b/keyboards/mothwing/rules.mk @@ -14,7 +14,7 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow. AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. DEFAULT_FOLDER = mothwing/rev1 From 95e2343f196ded9646f98b12abca2daece168fec Mon Sep 17 00:00:00 2001 From: tan-t Date: Tue, 27 Jun 2023 23:48:37 +0900 Subject: [PATCH 03/10] update mothwing configuration --- keyboards/mothwing/mothwing.c | 15 +++++++++++++++ keyboards/mothwing/mothwing.h | 15 +++++++++++++++ keyboards/mothwing/rev1/rev1.c | 15 +++++++++++++++ keyboards/mothwing/rev1/rev1.h | 15 +++++++++++++++ keyboards/mothwing/rev1/rules.mk | 20 ++++++++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 keyboards/mothwing/rev1/rules.mk diff --git a/keyboards/mothwing/mothwing.c b/keyboards/mothwing/mothwing.c index 50bf8c79859b..877a80ff4246 100644 --- a/keyboards/mothwing/mothwing.c +++ b/keyboards/mothwing/mothwing.c @@ -1 +1,16 @@ + /* Copyright 2023 Tetsuro Tan (@tan-t) + * + * 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 "mothwing.h" diff --git a/keyboards/mothwing/mothwing.h b/keyboards/mothwing/mothwing.h index 9421831d311d..6f3bbe20ec38 100644 --- a/keyboards/mothwing/mothwing.h +++ b/keyboards/mothwing/mothwing.h @@ -1,3 +1,18 @@ + /* Copyright 2023 Tetsuro Tan (@tan-t) + * + * 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 #ifdef KEYBOARD_mothwing_rev1 diff --git a/keyboards/mothwing/rev1/rev1.c b/keyboards/mothwing/rev1/rev1.c index 520a869e57ba..8b3f4506b457 100644 --- a/keyboards/mothwing/rev1/rev1.c +++ b/keyboards/mothwing/rev1/rev1.c @@ -1 +1,16 @@ + /* Copyright 2023 Tetsuro Tan (@tan-t) + * + * 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 "rev1.h" diff --git a/keyboards/mothwing/rev1/rev1.h b/keyboards/mothwing/rev1/rev1.h index 9a05977153fb..3816feed8391 100644 --- a/keyboards/mothwing/rev1/rev1.h +++ b/keyboards/mothwing/rev1/rev1.h @@ -1,3 +1,18 @@ + /* Copyright 2023 Tetsuro Tan (@tan-t) + * + * 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 #include "quantum.h" diff --git a/keyboards/mothwing/rev1/rules.mk b/keyboards/mothwing/rev1/rules.mk new file mode 100644 index 000000000000..4284c1fc5732 --- /dev/null +++ b/keyboards/mothwing/rev1/rules.mk @@ -0,0 +1,20 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = caterina + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow. +AUDIO_ENABLE = no # Audio output + +DEFAULT_FOLDER = mothwing/rev1 From 1ac4efa0a76538c0e3bebb3878cf70e29331c642 Mon Sep 17 00:00:00 2001 From: tan-t Date: Wed, 28 Jun 2023 00:05:00 +0900 Subject: [PATCH 04/10] fix mothwing license header --- keyboards/mothwing/mothwing.c | 17 ++--------------- keyboards/mothwing/mothwing.h | 17 ++--------------- keyboards/mothwing/rev1/rev1.c | 17 ++--------------- keyboards/mothwing/rev1/rev1.h | 17 ++--------------- 4 files changed, 8 insertions(+), 60 deletions(-) diff --git a/keyboards/mothwing/mothwing.c b/keyboards/mothwing/mothwing.c index 877a80ff4246..c39c0f1289c9 100644 --- a/keyboards/mothwing/mothwing.c +++ b/keyboards/mothwing/mothwing.c @@ -1,16 +1,3 @@ - /* Copyright 2023 Tetsuro Tan (@tan-t) - * - * 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 . - */ +// Copyright 2023 Tetsuro Tan (@tan-t) +// SPDX-License-Identifier: GPL-2.0-or-later #include "mothwing.h" diff --git a/keyboards/mothwing/mothwing.h b/keyboards/mothwing/mothwing.h index 6f3bbe20ec38..0e87454ebb94 100644 --- a/keyboards/mothwing/mothwing.h +++ b/keyboards/mothwing/mothwing.h @@ -1,18 +1,5 @@ - /* Copyright 2023 Tetsuro Tan (@tan-t) - * - * 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 . - */ +// Copyright 2023 Tetsuro Tan (@tan-t) +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once #ifdef KEYBOARD_mothwing_rev1 diff --git a/keyboards/mothwing/rev1/rev1.c b/keyboards/mothwing/rev1/rev1.c index 8b3f4506b457..7d85a279bda2 100644 --- a/keyboards/mothwing/rev1/rev1.c +++ b/keyboards/mothwing/rev1/rev1.c @@ -1,16 +1,3 @@ - /* Copyright 2023 Tetsuro Tan (@tan-t) - * - * 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 . - */ +// Copyright 2023 Tetsuro Tan (@tan-t) +// SPDX-License-Identifier: GPL-2.0-or-later #include "rev1.h" diff --git a/keyboards/mothwing/rev1/rev1.h b/keyboards/mothwing/rev1/rev1.h index 3816feed8391..725e1f736371 100644 --- a/keyboards/mothwing/rev1/rev1.h +++ b/keyboards/mothwing/rev1/rev1.h @@ -1,18 +1,5 @@ - /* Copyright 2023 Tetsuro Tan (@tan-t) - * - * 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 . - */ +// Copyright 2023 Tetsuro Tan (@tan-t) +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include "quantum.h" From 963923b2cf53a5f494eecc81fc48d66d32ca00a4 Mon Sep 17 00:00:00 2001 From: tan-t Date: Wed, 28 Jun 2023 22:58:51 +0900 Subject: [PATCH 05/10] fix mothwing suggestions --- keyboards/mothwing/keymaps/default/keymap.c | 2 +- keyboards/mothwing/keymaps/via/keymap.c | 2 +- keyboards/mothwing/mothwing.c | 3 - keyboards/mothwing/mothwing.h | 7 --- keyboards/mothwing/rev1/config.h | 64 +-------------------- keyboards/mothwing/rev1/info.json | 10 ++++ keyboards/mothwing/rev1/rev1.c | 3 - keyboards/mothwing/rev1/rev1.h | 22 ------- keyboards/mothwing/rev1/rules.mk | 21 +------ keyboards/mothwing/rules.mk | 19 ------ 10 files changed, 15 insertions(+), 138 deletions(-) delete mode 100644 keyboards/mothwing/mothwing.c delete mode 100644 keyboards/mothwing/mothwing.h delete mode 100644 keyboards/mothwing/rev1/rev1.c delete mode 100644 keyboards/mothwing/rev1/rev1.h diff --git a/keyboards/mothwing/keymaps/default/keymap.c b/keyboards/mothwing/keymaps/default/keymap.c index e7e5cc99e12c..0c6923403dd8 100644 --- a/keyboards/mothwing/keymaps/default/keymap.c +++ b/keyboards/mothwing/keymaps/default/keymap.c @@ -21,7 +21,7 @@ along with this program. If not, see . // entirely and just use numbers. enum layer_number { - _QWERTY = 0, + _QWERTY, _RAISE, _LOWER, }; diff --git a/keyboards/mothwing/keymaps/via/keymap.c b/keyboards/mothwing/keymaps/via/keymap.c index 957c6b5b6a67..68d28af10cc6 100644 --- a/keyboards/mothwing/keymaps/via/keymap.c +++ b/keyboards/mothwing/keymaps/via/keymap.c @@ -21,7 +21,7 @@ along with this program. If not, see . // entirely and just use numbers. enum layer_number { - _QWERTY = 0, + _QWERTY, _RAISE, _LOWER, _ADJUST, diff --git a/keyboards/mothwing/mothwing.c b/keyboards/mothwing/mothwing.c deleted file mode 100644 index c39c0f1289c9..000000000000 --- a/keyboards/mothwing/mothwing.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2023 Tetsuro Tan (@tan-t) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "mothwing.h" diff --git a/keyboards/mothwing/mothwing.h b/keyboards/mothwing/mothwing.h deleted file mode 100644 index 0e87454ebb94..000000000000 --- a/keyboards/mothwing/mothwing.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2023 Tetsuro Tan (@tan-t) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#ifdef KEYBOARD_mothwing_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/mothwing/rev1/config.h b/keyboards/mothwing/rev1/config.h index 98a7d40e5dff..b50598b14608 100644 --- a/keyboards/mothwing/rev1/config.h +++ b/keyboards/mothwing/rev1/config.h @@ -1,64 +1,4 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 . -*/ +// Copyright 2023 Tetsuro Tan (@tan-t) +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 6 -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } -#define DIODE_DIRECTION COL2ROW -#define SOFT_SERIAL_PIN D2 - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ -// #define BACKLIGHT_LEVELS 3 - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -//#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -//#define LOCKING_RESYNC_ENABLE - -/* ws2812 RGB LED */ -/* -#define RGB_DI_PIN D3 - -#define RGBLED_NUM 12 // Number of LEDs -*/ - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/mothwing/rev1/info.json b/keyboards/mothwing/rev1/info.json index f21d2faeecf0..c13e3c52fc7d 100644 --- a/keyboards/mothwing/rev1/info.json +++ b/keyboards/mothwing/rev1/info.json @@ -8,6 +8,16 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "rows": ["D4", "C6", "D7", "E6"], + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mothwing/rev1/rev1.c b/keyboards/mothwing/rev1/rev1.c deleted file mode 100644 index 7d85a279bda2..000000000000 --- a/keyboards/mothwing/rev1/rev1.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2023 Tetsuro Tan (@tan-t) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "rev1.h" diff --git a/keyboards/mothwing/rev1/rev1.h b/keyboards/mothwing/rev1/rev1.h deleted file mode 100644 index 725e1f736371..000000000000 --- a/keyboards/mothwing/rev1/rev1.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2023 Tetsuro Tan (@tan-t) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, R30, R31, R32, R33 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, KC_NO, L30, L31, L32, L33 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, R33, R32, R31, R30 } \ - } diff --git a/keyboards/mothwing/rev1/rules.mk b/keyboards/mothwing/rev1/rules.mk index 4284c1fc5732..6e7633bfe015 100644 --- a/keyboards/mothwing/rev1/rules.mk +++ b/keyboards/mothwing/rev1/rules.mk @@ -1,20 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow. -AUDIO_ENABLE = no # Audio output - -DEFAULT_FOLDER = mothwing/rev1 +# This file intentionally left blank diff --git a/keyboards/mothwing/rules.mk b/keyboards/mothwing/rules.mk index 4284c1fc5732..88742371211a 100644 --- a/keyboards/mothwing/rules.mk +++ b/keyboards/mothwing/rules.mk @@ -1,20 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow. -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = mothwing/rev1 From 4528802e0e841dd8e85e0ba9624576adf07e5699 Mon Sep 17 00:00:00 2001 From: tan-t Date: Thu, 29 Jun 2023 23:49:27 +0900 Subject: [PATCH 06/10] fix mothwing suggestions --- keyboards/mothwing/rev1/info.json | 90 +++++++++++++++---------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/keyboards/mothwing/rev1/info.json b/keyboards/mothwing/rev1/info.json index c13e3c52fc7d..d073863df41e 100644 --- a/keyboards/mothwing/rev1/info.json +++ b/keyboards/mothwing/rev1/info.json @@ -21,51 +21,51 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":1.18}, - {"label":"L01", "x":1, "y":1.03}, - {"label":"L02", "x":2, "y":0.35}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0.05}, - {"label":"L05", "x":5, "y":0.10}, - {"label":"R00", "x":11.5, "y":0.10}, - {"label":"R01", "x":12.5, "y":0.05}, - {"label":"R02", "x":13.5, "y":0}, - {"label":"R03", "x":14.5, "y":0.35}, - {"label":"R04", "x":15.5, "y":1.08}, - {"label":"R05", "x":16.5, "y":1.18}, - {"label":"L10", "x":0, "y":2.18}, - {"label":"L11", "x":1, "y":2.03}, - {"label":"L12", "x":2, "y":1.35}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1.05}, - {"label":"L15", "x":5, "y":1.10}, - {"label":"R10", "x":11.5, "y":1.10}, - {"label":"R11", "x":12.5, "y":1.05}, - {"label":"R12", "x":13.5, "y":1}, - {"label":"R13", "x":14.5, "y":1.35}, - {"label":"R14", "x":15.5, "y":2.03}, - {"label":"R15", "x":16.5, "y":2.18}, - {"label":"L20", "x":0, "y":3.18}, - {"label":"L21", "x":1, "y":3.03}, - {"label":"L22", "x":2, "y":2.35}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2.05}, - {"label":"L25", "x":5, "y":2.10}, - {"label":"R20", "x":11.5, "y":2.10}, - {"label":"R21", "x":12.5, "y":2.05}, - {"label":"R22", "x":13.5, "y":2}, - {"label":"R23", "x":14.5, "y":2.35}, - {"label":"R24", "x":15.5, "y":3.03}, - {"label":"R25", "x":16.5, "y":3.18}, - {"label":"L30", "x":4, "y":3.05}, - {"label":"L31", "x":5, "y":3.10}, - {"label":"L32", "x":6, "y":3.20, "w":1.25}, - {"label":"L33", "x":7.25, "y":3.50}, - {"label":"R30", "x":9.25, "y":3.50}, - {"label":"R31", "x":10.25, "y":3.20, "w":1.25}, - {"label":"R32", "x":11.5, "y":3.10}, - {"label":"R33", "x":12.5, "y":3.05} - ] + {"label":"L00","x":0,"y":1.18,"matrix":[0,0]}, + {"label":"L01","x":1,"y":1.03,"matrix":[0,1]}, + {"label":"L02","x":2,"y":0.35,"matrix":[0,2]}, + {"label":"L03","x":3,"y":0,"matrix":[0,3]}, + {"label":"L04","x":4,"y":0.05,"matrix":[0,4]}, + {"label":"L05","x":5,"y":0.1,"matrix":[0,5]}, + {"label":"R00","x":11.5,"y":0.1,"matrix":[0,6]}, + {"label":"R01","x":12.5,"y":0.05,"matrix":[0,7]}, + {"label":"R02","x":13.5,"y":0,"matrix":[0,8]}, + {"label":"R03","x":14.5,"y":0.35,"matrix":[0,9]}, + {"label":"R04","x":15.5,"y":1.08,"matrix":[0,10]}, + {"label":"R05","x":16.5,"y":1.18,"matrix":[0,11]}, + {"label":"L10","x":0,"y":2.18,"matrix":[1,0]}, + {"label":"L11","x":1,"y":2.03,"matrix":[1,1]}, + {"label":"L12","x":2,"y":1.35,"matrix":[1,2]}, + {"label":"L13","x":3,"y":1,"matrix":[1,3]}, + {"label":"L14","x":4,"y":1.05,"matrix":[1,4]}, + {"label":"L15","x":5,"y":1.1,"matrix":[1,5]}, + {"label":"R10","x":11.5,"y":1.1,"matrix":[1,6]}, + {"label":"R11","x":12.5,"y":1.05,"matrix":[1,7]}, + {"label":"R12","x":13.5,"y":1,"matrix":[1,8]}, + {"label":"R13","x":14.5,"y":1.35,"matrix":[1,9]}, + {"label":"R14","x":15.5,"y":2.03,"matrix":[1,10]}, + {"label":"R15","x":16.5,"y":2.18,"matrix":[1,11]}, + {"label":"L20","x":0,"y":3.18,"matrix":[2,0]}, + {"label":"L21","x":1,"y":3.03,"matrix":[2,1]}, + {"label":"L22","x":2,"y":2.35,"matrix":[2,2]}, + {"label":"L23","x":3,"y":2,"matrix":[2,3]}, + {"label":"L24","x":4,"y":2.05,"matrix":[2,4]}, + {"label":"L25","x":5,"y":2.1,"matrix":[2,5]}, + {"label":"R20","x":11.5,"y":2.1,"matrix":[2,6]}, + {"label":"R21","x":12.5,"y":2.05,"matrix":[2,7]}, + {"label":"R22","x":13.5,"y":2,"matrix":[2,8]}, + {"label":"R23","x":14.5,"y":2.35,"matrix":[2,9]}, + {"label":"R24","x":15.5,"y":3.03,"matrix":[2,10]}, + {"label":"R25","x":16.5,"y":3.18,"matrix":[2,11]}, + {"label":"L30","x":4,"y":3.05,"matrix":[3,0]}, + {"label":"L31","x":5,"y":3.1,"matrix":[3,1]}, + {"label":"L32","x":6,"y":3.2,"w":1.25,"matrix":[3,2]}, + {"label":"L33","x":7.25,"y":3.5,"matrix":[3,3]}, + {"label":"R30","x":9.25,"y":3.5,"matrix":[3,4]}, + {"label":"R31","x":10.25,"y":3.2,"w":1.25,"matrix":[3,5]}, + {"label":"R32","x":11.5,"y":3.1,"matrix":[3,6]}, + {"label":"R33","x":12.5,"y":3.05,"matrix":[3,7]} + ] } } } From 4883206ea584ebc6d542834e14daa857de45ecf5 Mon Sep 17 00:00:00 2001 From: tan-t Date: Fri, 30 Jun 2023 00:00:52 +0900 Subject: [PATCH 07/10] finalize mothwing --- keyboards/mothwing/{rev1 => }/info.json | 2 +- keyboards/mothwing/lib/glcdfont.c | 232 ------------------------ keyboards/mothwing/readme.md | 2 +- keyboards/mothwing/rev1/config.h | 4 - keyboards/mothwing/rev1/rules.mk | 1 - keyboards/mothwing/rules.mk | 2 +- 6 files changed, 3 insertions(+), 240 deletions(-) rename keyboards/mothwing/{rev1 => }/info.json (97%) delete mode 100644 keyboards/mothwing/lib/glcdfont.c delete mode 100644 keyboards/mothwing/rev1/config.h delete mode 100644 keyboards/mothwing/rev1/rules.mk diff --git a/keyboards/mothwing/rev1/info.json b/keyboards/mothwing/info.json similarity index 97% rename from keyboards/mothwing/rev1/info.json rename to keyboards/mothwing/info.json index d073863df41e..f61d68613166 100644 --- a/keyboards/mothwing/rev1/info.json +++ b/keyboards/mothwing/info.json @@ -10,7 +10,7 @@ }, "matrix_pins": { "rows": ["D4", "C6", "D7", "E6"], - "cols": ["F4", "F5", "F6", "F7", "B1", "B3"] + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "F4", "F5", "F6", "F7", "B1", "B3"] }, "diode_direction": "COL2ROW", "split": { diff --git a/keyboards/mothwing/lib/glcdfont.c b/keyboards/mothwing/lib/glcdfont.c deleted file mode 100644 index 9fa1c806aa72..000000000000 --- a/keyboards/mothwing/lib/glcdfont.c +++ /dev/null @@ -1,232 +0,0 @@ -// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. -// See gfxfont.h for newer custom bitmap font info. - -#include "progmem.h" - -// Standard ASCII 5x7 font -const unsigned char font[] PROGMEM = { -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, -0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, -0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, -0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, -0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, -0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, -0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, -0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, -0x00, 0x18, 0x24, 0x18, 0x00, 0x00, -0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, -0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, -0x26, 0x29, 0x79, 0x29, 0x26, 0x00, -0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, -0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, -0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, -0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, -0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, -0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, -0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, -0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, -0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, -0x60, 0x60, 0x60, 0x60, 0x60, 0x00, -0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, -0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, -0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, -0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, -0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, -0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, -0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, -0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, -0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, -0x00, 0x07, 0x00, 0x07, 0x00, 0x00, -0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, -0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, -0x23, 0x13, 0x08, 0x64, 0x62, 0x00, -0x36, 0x49, 0x56, 0x20, 0x50, 0x00, -0x00, 0x08, 0x07, 0x03, 0x00, 0x00, -0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, -0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, -0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, -0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, -0x00, 0x80, 0x70, 0x30, 0x00, 0x00, -0x08, 0x08, 0x08, 0x08, 0x08, 0x00, -0x00, 0x00, 0x60, 0x60, 0x00, 0x00, -0x20, 0x10, 0x08, 0x04, 0x02, 0x00, -0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, -0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, -0x72, 0x49, 0x49, 0x49, 0x46, 0x00, -0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, -0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, -0x27, 0x45, 0x45, 0x45, 0x39, 0x00, -0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, -0x41, 0x21, 0x11, 0x09, 0x07, 0x00, -0x36, 0x49, 0x49, 0x49, 0x36, 0x00, -0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, -0x00, 0x00, 0x14, 0x00, 0x00, 0x00, -0x00, 0x40, 0x34, 0x00, 0x00, 0x00, -0x00, 0x08, 0x14, 0x22, 0x41, 0x00, -0x14, 0x14, 0x14, 0x14, 0x14, 0x00, -0x00, 0x41, 0x22, 0x14, 0x08, 0x00, -0x02, 0x01, 0x59, 0x09, 0x06, 0x00, -0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, -0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, -0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, -0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, -0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, -0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, -0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, -0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, -0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, -0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, -0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, -0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, -0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, -0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, -0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, -0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, -0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, -0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, -0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, -0x26, 0x49, 0x49, 0x49, 0x32, 0x00, -0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, -0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, -0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, -0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, -0x63, 0x14, 0x08, 0x14, 0x63, 0x00, -0x03, 0x04, 0x78, 0x04, 0x03, 0x00, -0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, -0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, -0x02, 0x04, 0x08, 0x10, 0x20, 0x00, -0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, -0x04, 0x02, 0x01, 0x02, 0x04, 0x00, -0x40, 0x40, 0x40, 0x40, 0x40, 0x00, -0x00, 0x03, 0x07, 0x08, 0x00, 0x00, -0x20, 0x54, 0x54, 0x78, 0x40, 0x00, -0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, -0x38, 0x44, 0x44, 0x44, 0x28, 0x00, -0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, -0x38, 0x54, 0x54, 0x54, 0x18, 0x00, -0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, -0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, -0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, -0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, -0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, -0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, -0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, -0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, -0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, -0x38, 0x44, 0x44, 0x44, 0x38, 0x00, -0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, -0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, -0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, -0x48, 0x54, 0x54, 0x54, 0x24, 0x00, -0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, -0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, -0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, -0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, -0x44, 0x28, 0x10, 0x28, 0x44, 0x00, -0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, -0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, -0x00, 0x08, 0x36, 0x41, 0x00, 0x00, -0x00, 0x00, 0x77, 0x00, 0x00, 0x00, -0x00, 0x41, 0x36, 0x08, 0x00, 0x00, -0x02, 0x01, 0x02, 0x04, 0x02, 0x00, -0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xFC, 0xFC, 0xFC, 0xFC, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, - 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, - 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, - 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x80, 0xC0, 0xF0, 0xF8, 0xF8, - 0xF8, 0xF8, 0xF8, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, - 0xE0, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, -0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, -0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, -0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, -0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, -0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, -0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, -0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xF8, 0xFC, 0xFE, - 0xFF, 0x1F, 0x07, 0x07, 0x07, 0x07, - 0x1F, 0x1F, 0x1F, 0x1E, 0x18, 0x00, - 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, - 0x00, 0x00, 0x00, 0x9E, 0xDF, 0xDF, - 0xCF, 0xC7, 0xE7, 0xE7, 0xE7, 0xFF, - 0xFF, 0xFF, 0xFE, 0x00, 0x00, 0x03, - 0x3F, 0xFF, 0xFF, 0xFE, 0xC0, 0x00, - 0xF0, 0xFF, 0xFF, 0x1F, 0xFF, 0xFF, - 0xF0, 0x00, 0xC0, 0xFC, 0xFF, 0xFF, - 0x3F, 0x03, 0x00, 0xC0, 0xF0, 0xF8, - 0xFE, 0x9F, 0x87, 0x83, 0x80, 0xFF, - 0xFF, 0xFF, 0xFF, 0x80, 0x80, 0x00, - 0x00, 0xE0, 0xF8, 0xFC, 0xBF, 0x8F, - 0x83, 0x81, 0xFF, 0xFF, 0xFF, 0xFF, - 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, -0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, -0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, -0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, -0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, -0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, -0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, -0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x07, 0x1F, 0x3F, - 0x7F, 0x7C, 0x78, 0x70, 0x70, 0x78, - 0x7E, 0x3E, 0x3E, 0x0E, 0x06, 0x00, - 0x00, 0x7F, 0x7F, 0x7F, 0x7F, 0x00, - 0x00, 0x00, 0x1F, 0x3F, 0x7F, 0x7F, - 0x79, 0x71, 0x70, 0x30, 0x38, 0x3F, - 0x7F, 0x7F, 0x7F, 0x60, 0x00, 0x00, - 0x00, 0x01, 0x1F, 0x7F, 0x7F, 0x7E, - 0x7F, 0x1F, 0x01, 0x00, 0x01, 0x3F, - 0x7F, 0x7E, 0x7F, 0x7F, 0x0F, 0x01, - 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, - 0x03, 0x03, 0x03, 0x03, 0x03, 0x7F, - 0x7F, 0x7F, 0x7F, 0x03, 0x03, 0x00, - 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, - 0x03, 0x03, 0x7F, 0x7F, 0x7F, 0x7F, - 0x07, 0x03, 0x03, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; diff --git a/keyboards/mothwing/readme.md b/keyboards/mothwing/readme.md index 9dedc007d984..184f608c5d55 100644 --- a/keyboards/mothwing/readme.md +++ b/keyboards/mothwing/readme.md @@ -4,7 +4,7 @@ A split keyboard with 3x6 vertically staggered keys and 4 thumb keys. * Keyboard Maintainer: [tan-t](https://github.com/tan-t) * Hardware Supported: MOTHWING PCB -* Hardware Availability: currently unavailable. merch will be open around May 2023. +* Hardware Availability: currently unavailable. merch will be open around August 2023. Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/mothwing/rev1/config.h b/keyboards/mothwing/rev1/config.h deleted file mode 100644 index b50598b14608..000000000000 --- a/keyboards/mothwing/rev1/config.h +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2023 Tetsuro Tan (@tan-t) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once diff --git a/keyboards/mothwing/rev1/rules.mk b/keyboards/mothwing/rev1/rules.mk deleted file mode 100644 index 6e7633bfe015..000000000000 --- a/keyboards/mothwing/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mothwing/rules.mk b/keyboards/mothwing/rules.mk index 88742371211a..6e7633bfe015 100644 --- a/keyboards/mothwing/rules.mk +++ b/keyboards/mothwing/rules.mk @@ -1 +1 @@ -DEFAULT_FOLDER = mothwing/rev1 +# This file intentionally left blank From 8f29f11995540d94016f14b2571d21ba8e96918b Mon Sep 17 00:00:00 2001 From: tan-t Date: Fri, 30 Jun 2023 23:52:54 +0900 Subject: [PATCH 08/10] finalize mothwing --- keyboards/mothwing/info.json | 103 +++++++++++++++++++---------------- keyboards/mothwing/rules.mk | 2 +- 2 files changed, 56 insertions(+), 49 deletions(-) diff --git a/keyboards/mothwing/info.json b/keyboards/mothwing/info.json index f61d68613166..c52888b6f37c 100644 --- a/keyboards/mothwing/info.json +++ b/keyboards/mothwing/info.json @@ -4,13 +4,13 @@ "url": "", "maintainer": "tan-t", "usb": { - "vid": "0x5946", + "vid": "0x4D77", "pid": "0x0001", "device_version": "0.0.1" }, "matrix_pins": { - "rows": ["D4", "C6", "D7", "E6"], - "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "F4", "F5", "F6", "F7", "B1", "B3"] + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] }, "diode_direction": "COL2ROW", "split": { @@ -21,51 +21,58 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00","x":0,"y":1.18,"matrix":[0,0]}, - {"label":"L01","x":1,"y":1.03,"matrix":[0,1]}, - {"label":"L02","x":2,"y":0.35,"matrix":[0,2]}, - {"label":"L03","x":3,"y":0,"matrix":[0,3]}, - {"label":"L04","x":4,"y":0.05,"matrix":[0,4]}, - {"label":"L05","x":5,"y":0.1,"matrix":[0,5]}, - {"label":"R00","x":11.5,"y":0.1,"matrix":[0,6]}, - {"label":"R01","x":12.5,"y":0.05,"matrix":[0,7]}, - {"label":"R02","x":13.5,"y":0,"matrix":[0,8]}, - {"label":"R03","x":14.5,"y":0.35,"matrix":[0,9]}, - {"label":"R04","x":15.5,"y":1.08,"matrix":[0,10]}, - {"label":"R05","x":16.5,"y":1.18,"matrix":[0,11]}, - {"label":"L10","x":0,"y":2.18,"matrix":[1,0]}, - {"label":"L11","x":1,"y":2.03,"matrix":[1,1]}, - {"label":"L12","x":2,"y":1.35,"matrix":[1,2]}, - {"label":"L13","x":3,"y":1,"matrix":[1,3]}, - {"label":"L14","x":4,"y":1.05,"matrix":[1,4]}, - {"label":"L15","x":5,"y":1.1,"matrix":[1,5]}, - {"label":"R10","x":11.5,"y":1.1,"matrix":[1,6]}, - {"label":"R11","x":12.5,"y":1.05,"matrix":[1,7]}, - {"label":"R12","x":13.5,"y":1,"matrix":[1,8]}, - {"label":"R13","x":14.5,"y":1.35,"matrix":[1,9]}, - {"label":"R14","x":15.5,"y":2.03,"matrix":[1,10]}, - {"label":"R15","x":16.5,"y":2.18,"matrix":[1,11]}, - {"label":"L20","x":0,"y":3.18,"matrix":[2,0]}, - {"label":"L21","x":1,"y":3.03,"matrix":[2,1]}, - {"label":"L22","x":2,"y":2.35,"matrix":[2,2]}, - {"label":"L23","x":3,"y":2,"matrix":[2,3]}, - {"label":"L24","x":4,"y":2.05,"matrix":[2,4]}, - {"label":"L25","x":5,"y":2.1,"matrix":[2,5]}, - {"label":"R20","x":11.5,"y":2.1,"matrix":[2,6]}, - {"label":"R21","x":12.5,"y":2.05,"matrix":[2,7]}, - {"label":"R22","x":13.5,"y":2,"matrix":[2,8]}, - {"label":"R23","x":14.5,"y":2.35,"matrix":[2,9]}, - {"label":"R24","x":15.5,"y":3.03,"matrix":[2,10]}, - {"label":"R25","x":16.5,"y":3.18,"matrix":[2,11]}, - {"label":"L30","x":4,"y":3.05,"matrix":[3,0]}, - {"label":"L31","x":5,"y":3.1,"matrix":[3,1]}, - {"label":"L32","x":6,"y":3.2,"w":1.25,"matrix":[3,2]}, - {"label":"L33","x":7.25,"y":3.5,"matrix":[3,3]}, - {"label":"R30","x":9.25,"y":3.5,"matrix":[3,4]}, - {"label":"R31","x":10.25,"y":3.2,"w":1.25,"matrix":[3,5]}, - {"label":"R32","x":11.5,"y":3.1,"matrix":[3,6]}, - {"label":"R33","x":12.5,"y":3.05,"matrix":[3,7]} - ] + {"matrix": [0, 0], "x": 0, "y": 1.18}, + {"matrix": [0, 1], "x": 1, "y": 1.03}, + {"matrix": [0, 2], "x": 2, "y": 0.35}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.05}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + + {"matrix": [4, 5], "x": 11.5, "y": 0.1}, + {"matrix": [4, 4], "x": 12.5, "y": 0.05}, + {"matrix": [4, 3], "x": 13.5, "y": 0}, + {"matrix": [4, 2], "x": 14.5, "y": 0.35}, + {"matrix": [4, 1], "x": 15.5, "y": 1.08}, + {"matrix": [4, 0], "x": 16.5, "y": 1.18}, + + {"matrix": [1, 0], "x": 0, "y": 2.18}, + {"matrix": [1, 1], "x": 1, "y": 2.03}, + {"matrix": [1, 2], "x": 2, "y": 1.35}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.05}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + + {"matrix": [5, 5], "x": 11.5, "y": 1.1}, + {"matrix": [5, 4], "x": 12.5, "y": 1.05}, + {"matrix": [5, 3], "x": 13.5, "y": 1}, + {"matrix": [5, 2], "x": 14.5, "y": 1.35}, + {"matrix": [5, 1], "x": 15.5, "y": 2.03}, + {"matrix": [5, 0], "x": 16.5, "y": 2.18}, + + {"matrix": [2, 0], "x": 0, "y": 3.18}, + {"matrix": [2, 1], "x": 1, "y": 3.03}, + {"matrix": [2, 2], "x": 2, "y": 2.35}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.05}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, + + {"matrix": [6, 5], "x": 11.5, "y": 2.1}, + {"matrix": [6, 4], "x": 12.5, "y": 2.05}, + {"matrix": [6, 3], "x": 13.5, "y": 2}, + {"matrix": [6, 2], "x": 14.5, "y": 2.35}, + {"matrix": [6, 1], "x": 15.5, "y": 3.03}, + {"matrix": [6, 0], "x": 16.5, "y": 3.18}, + + {"matrix": [3, 2], "x": 4, "y": 3.05}, + {"matrix": [3, 3], "x": 5, "y": 3.1}, + {"matrix": [3, 4], "x": 6, "y": 3.2, "w": 1.25}, + {"matrix": [3, 5], "x": 7.25, "y": 3.5}, + + {"matrix": [7, 5], "x": 9.25, "y": 3.5}, + {"matrix": [7, 4], "x": 10.25, "y": 3.2, "w": 1.25}, + {"matrix": [7, 3], "x": 11.5, "y": 3.1}, + {"matrix": [7, 2], "x": 12.5, "y": 3.05} + ] } } } diff --git a/keyboards/mothwing/rules.mk b/keyboards/mothwing/rules.mk index 6e7633bfe015..d38a61809075 100644 --- a/keyboards/mothwing/rules.mk +++ b/keyboards/mothwing/rules.mk @@ -1 +1 @@ -# This file intentionally left blank +SPLIT_KEYBOARD = yes From 072260a7923dbc9ef3387b976c5ee4130895c230 Mon Sep 17 00:00:00 2001 From: tan-t <22813443+tan-t@users.noreply.github.com> Date: Sun, 2 Jul 2023 22:58:44 +0900 Subject: [PATCH 09/10] Apply suggestions from code review Co-authored-by: Ryan --- keyboards/mothwing/info.json | 1 + keyboards/mothwing/rules.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mothwing/info.json b/keyboards/mothwing/info.json index c52888b6f37c..255637e19a22 100644 --- a/keyboards/mothwing/info.json +++ b/keyboards/mothwing/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/mothwing/rules.mk b/keyboards/mothwing/rules.mk index d38a61809075..e69de29bb2d1 100644 --- a/keyboards/mothwing/rules.mk +++ b/keyboards/mothwing/rules.mk @@ -1 +0,0 @@ -SPLIT_KEYBOARD = yes From 1a7e2385b014f2f46d2ad471920198187937b2ee Mon Sep 17 00:00:00 2001 From: tan-t <22813443+tan-t@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:45:19 +0900 Subject: [PATCH 10/10] Apply suggestions from code review Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/mothwing/info.json | 3 +-- keyboards/mothwing/keymaps/via/keymap.c | 16 ++-------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/keyboards/mothwing/info.json b/keyboards/mothwing/info.json index 255637e19a22..350c52c72e4e 100644 --- a/keyboards/mothwing/info.json +++ b/keyboards/mothwing/info.json @@ -17,8 +17,7 @@ "enabled": true, "soft_serial_pin": "D2" }, - "processor": "atmega32u4", - "bootloader": "caterina", + "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mothwing/keymaps/via/keymap.c b/keyboards/mothwing/keymaps/via/keymap.c index 68d28af10cc6..ba3f5353d971 100644 --- a/keyboards/mothwing/keymaps/via/keymap.c +++ b/keyboards/mothwing/keymaps/via/keymap.c @@ -23,8 +23,7 @@ along with this program. If not, see . enum layer_number { _QWERTY, _RAISE, - _LOWER, - _ADJUST, + _LOWER }; #define KC_L_SPC LT(_LOWER, KC_SPC) // lower @@ -69,16 +68,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------' QK_BOOT , _______, _______, _______, _______, _______, _______, _______ // `--------+--------+--------+--------' `--------+--------+--------+--------' - ), - [_ADJUST] = LAYOUT( - //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. - 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_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_TRNS, KC_TRNS, - //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------' - KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - // `--------+--------+--------+--------' `--------+--------+--------+--------' - ), + ) };