diff options
| -rw-r--r-- | keyboards/chlx/merro60/config.h | 58 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/info.json | 365 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/keymaps/ansi/keymap.c | 35 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/keymaps/default/keymap.c | 35 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/keymaps/hhkb/keymap.c | 35 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/keymaps/iso/keymap.c | 35 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/keymaps/tsangan/keymap.c | 35 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/keymaps/via/keymap.c | 51 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/keymaps/via/rules.mk | 3 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/merro60.c | 19 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/merro60.h | 189 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/readme.md | 20 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/rules.mk | 22 | 
13 files changed, 902 insertions, 0 deletions
| diff --git a/keyboards/chlx/merro60/config.h b/keyboards/chlx/merro60/config.h new file mode 100644 index 0000000000..526433ef8f --- /dev/null +++ b/keyboards/chlx/merro60/config.h @@ -0,0 +1,58 @@ +/* +Copyright 2021 Alexander Lee <[email protected]> + +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 + +/* USB Device descriptor parameter */ +#define VENDOR_ID       0x4358 // "CX" - chlx +#define PRODUCT_ID      0x0601 +#define DEVICE_VER      0x0100 +#define MANUFACTURER    chlx +#define PRODUCT         chlx merro60 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { D4, D5, D3, B5, F4 } +#define MATRIX_COL_PINS { B7, D1, D0, B0, B1, E6, B2, B3, D2, D7, B4, B6, C6, C7, D6 } +#define UNUSED_PINS +// #define UNUSED_PINS { F0, F1, F5, F6, F7 } + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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 + +/* VIA related config */ +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/chlx/merro60/info.json b/keyboards/chlx/merro60/info.json new file mode 100644 index 0000000000..8205d4d24c --- /dev/null +++ b/keyboards/chlx/merro60/info.json @@ -0,0 +1,365 @@ +{ +    "keyboard_name": "merro60", +    "url": "www.github.com/gaclee3b", +    "maintainer": "gaclee3b", +    "width": 15, +    "height": 5, +    "layouts": { +        "LAYOUT_default": { +            "layout": [ +                {"x": 0,      "y": 0}, +                {"x": 1,      "y": 0}, +                {"x": 2,      "y": 0}, +                {"x": 3,      "y": 0}, +                {"x": 4,      "y": 0}, +                {"x": 5,      "y": 0}, +                {"x": 6,      "y": 0}, +                {"x": 7,      "y": 0}, +                {"x": 8,      "y": 0}, +                {"x": 9,      "y": 0}, +                {"x": 10,     "y": 0}, +                {"x": 11,     "y": 0}, +                {"x": 12,     "y": 0}, +                {"x": 13,     "y": 0}, +                {"x": 14,     "y": 0}, + +                {"x": 0,      "y": 1, "w": 1.5}, +                {"x": 1.5,    "y": 1}, +                {"x": 2.5,    "y": 1}, +                {"x": 3.5,    "y": 1}, +                {"x": 4.5,    "y": 1}, +                {"x": 5.5,    "y": 1}, +                {"x": 6.5,    "y": 1}, +                {"x": 7.5,    "y": 1}, +                {"x": 8.5,    "y": 1}, +                {"x": 9.5,    "y": 1}, +                {"x": 10.5,   "y": 1}, +                {"x": 11.5,   "y": 1}, +                {"x": 12.5,   "y": 1}, +                {"x": 13.5,   "y": 1, "w": 1.5}, + +                {"x": 0,      "y": 2, "w": 1.75}, +                {"x": 1.75,   "y": 2}, +                {"x": 2.75,   "y": 2}, +                {"x": 3.75,   "y": 2}, +                {"x": 4.75,   "y": 2}, +                {"x": 5.75,   "y": 2}, +                {"x": 6.75,   "y": 2}, +                {"x": 7.75,   "y": 2}, +                {"x": 8.75,   "y": 2}, +                {"x": 9.75,   "y": 2}, +                {"x": 10.75,  "y": 2}, +                {"x": 11.75,  "y": 2}, +                {"x": 12.75,  "y": 2}, +                {"x": 13.75,  "y": 2, "w": 1.25}, + +                {"x": 0,      "y": 3, "w": 1.25}, +                {"x": 1.25,   "y": 3}, +                {"x": 2.25,   "y": 3}, +                {"x": 3.25,   "y": 3}, +                {"x": 4.25,   "y": 3}, +                {"x": 5.25,   "y": 3}, +                {"x": 6.25,   "y": 3}, +                {"x": 7.25,   "y": 3}, +                {"x": 8.25,   "y": 3}, +                {"x": 9.25,   "y": 3}, +                {"x": 10.25,  "y": 3}, +                {"x": 11.25,  "y": 3}, +                {"x": 12.25,  "y": 3, "w": 1.75}, +                {"x": 14,     "y": 3}, + +                {"x": 0,      "y": 4, "w": 1.25}, +                {"x": 1.25,   "y": 4, "w": 1.25}, +                {"x": 2.5,    "y": 4, "w": 1.25}, +                {"x": 3.75,   "y": 4, "w": 6.25}, +                {"x": 10,     "y": 4, "w": 1.25}, +                {"x": 11.25,  "y": 4, "w": 1.25}, +                {"x": 12.5,   "y": 4, "w": 1.25}, +                {"x": 13.75,  "y": 4, "w": 1.25} +            ] +        }, +        "LAYOUT_ansi": { +            "layout": [ +                {"x": 0,      "y": 0}, +                {"x": 1,      "y": 0}, +                {"x": 2,      "y": 0}, +                {"x": 3,      "y": 0}, +                {"x": 4,      "y": 0}, +                {"x": 5,      "y": 0}, +                {"x": 6,      "y": 0}, +                {"x": 7,      "y": 0}, +                {"x": 8,      "y": 0}, +                {"x": 9,      "y": 0}, +                {"x": 10,     "y": 0}, +                {"x": 11,     "y": 0}, +                {"x": 12,     "y": 0}, +                {"x": 13,     "y": 0}, +                {"x": 14,     "y": 0}, + +                {"x": 0,      "y": 1, "w": 1.5}, +                {"x": 1.5,    "y": 1}, +                {"x": 2.5,    "y": 1}, +                {"x": 3.5,    "y": 1}, +                {"x": 4.5,    "y": 1}, +                {"x": 5.5,    "y": 1}, +                {"x": 6.5,    "y": 1}, +                {"x": 7.5,    "y": 1}, +                {"x": 8.5,    "y": 1}, +                {"x": 9.5,    "y": 1}, +                {"x": 10.5,   "y": 1}, +                {"x": 11.5,   "y": 1}, +                {"x": 12.5,   "y": 1}, +                {"x": 13.5,   "y": 1, "w": 1.5}, + +                {"x": 0,      "y": 2, "w": 1.75}, +                {"x": 1.75,   "y": 2}, +                {"x": 2.75,   "y": 2}, +                {"x": 3.75,   "y": 2}, +                {"x": 4.75,   "y": 2}, +                {"x": 5.75,   "y": 2}, +                {"x": 6.75,   "y": 2}, +                {"x": 7.75,   "y": 2}, +                {"x": 8.75,   "y": 2}, +                {"x": 9.75,   "y": 2}, +                {"x": 10.75,  "y": 2}, +                {"x": 11.75,  "y": 2}, +                {"x": 12.75,  "y": 2, "w": 2.25}, + +                {"x": 0,      "y": 3, "w": 1.25}, +                {"x": 1.25,   "y": 3}, +                {"x": 2.25,   "y": 3}, +                {"x": 3.25,   "y": 3}, +                {"x": 4.25,   "y": 3}, +                {"x": 5.25,   "y": 3}, +                {"x": 6.25,   "y": 3}, +                {"x": 7.25,   "y": 3}, +                {"x": 8.25,   "y": 3}, +                {"x": 9.25,   "y": 3}, +                {"x": 10.25,  "y": 3}, +                {"x": 11.25,  "y": 3}, +                {"x": 12.25,  "y": 3, "w": 1.75}, +                {"x": 14,     "y": 3}, + +                {"x": 0,      "y": 4, "w": 1.25}, +                {"x": 1.25,   "y": 4, "w": 1.25}, +                {"x": 2.5,    "y": 4, "w": 1.25}, +                {"x": 3.75,   "y": 4, "w": 6.25}, +                {"x": 10,     "y": 4, "w": 1.25}, +                {"x": 11.25,  "y": 4, "w": 1.25}, +                {"x": 12.5,   "y": 4, "w": 1.25}, +                {"x": 13.75,  "y": 4, "w": 1.25} +            ] +        }, +        "LAYOUT_hhkb": { +            "layout": [ +                {"x": 0,      "y": 0}, +                {"x": 1,      "y": 0}, +                {"x": 2,      "y": 0}, +                {"x": 3,      "y": 0}, +                {"x": 4,      "y": 0}, +                {"x": 5,      "y": 0}, +                {"x": 6,      "y": 0}, +                {"x": 7,      "y": 0}, +                {"x": 8,      "y": 0}, +                {"x": 9,      "y": 0}, +                {"x": 10,     "y": 0}, +                {"x": 11,     "y": 0}, +                {"x": 12,     "y": 0}, +                {"x": 13,     "y": 0}, +                {"x": 14,     "y": 0}, + +                {"x": 0,      "y": 1, "w": 1.5}, +                {"x": 1.5,    "y": 1}, +                {"x": 2.5,    "y": 1}, +                {"x": 3.5,    "y": 1}, +                {"x": 4.5,    "y": 1}, +                {"x": 5.5,    "y": 1}, +                {"x": 6.5,    "y": 1}, +                {"x": 7.5,    "y": 1}, +                {"x": 8.5,    "y": 1}, +                {"x": 9.5,    "y": 1}, +                {"x": 10.5,   "y": 1}, +                {"x": 11.5,   "y": 1}, +                {"x": 12.5,   "y": 1}, +                {"x": 13.5,   "y": 1, "w": 1.5}, + +                {"x": 0,      "y": 2, "w": 1.75}, +                {"x": 1.75,   "y": 2}, +                {"x": 2.75,   "y": 2}, +                {"x": 3.75,   "y": 2}, +                {"x": 4.75,   "y": 2}, +                {"x": 5.75,   "y": 2}, +                {"x": 6.75,   "y": 2}, +                {"x": 7.75,   "y": 2}, +                {"x": 8.75,   "y": 2}, +                {"x": 9.75,   "y": 2}, +                {"x": 10.75,  "y": 2}, +                {"x": 11.75,  "y": 2}, +                {"x": 12.75,  "y": 2, "w": 2.25}, + +                {"x": 0,      "y": 3, "w": 2.25}, +                {"x": 2.25,   "y": 3}, +                {"x": 3.25,   "y": 3}, +                {"x": 4.25,   "y": 3}, +                {"x": 5.25,   "y": 3}, +                {"x": 6.25,   "y": 3}, +                {"x": 7.25,   "y": 3}, +                {"x": 8.25,   "y": 3}, +                {"x": 9.25,   "y": 3}, +                {"x": 10.25,  "y": 3}, +                {"x": 11.25,  "y": 3}, +                {"x": 12.25,  "y": 3, "w": 1.75}, +                {"x": 14,     "y": 3}, + +                {"x": 1.5,    "y": 4}, +                {"x": 2.5,    "y": 4, "w": 1.5}, +                {"x": 4,      "y": 4, "w": 7}, +                {"x": 11,     "y": 4, "w": 1.5}, +                {"x": 12.5,   "y": 4} +            ] +        }, +        "LAYOUT_iso": { +            "layout": [ +                {"x": 0,      "y": 0}, +                {"x": 1,      "y": 0}, +                {"x": 2,      "y": 0}, +                {"x": 3,      "y": 0}, +                {"x": 4,      "y": 0}, +                {"x": 5,      "y": 0}, +                {"x": 6,      "y": 0}, +                {"x": 7,      "y": 0}, +                {"x": 8,      "y": 0}, +                {"x": 9,      "y": 0}, +                {"x": 10,     "y": 0}, +                {"x": 11,     "y": 0}, +                {"x": 12,     "y": 0}, +                {"x": 13,     "y": 0}, +                {"x": 14,     "y": 0}, + +                {"x": 0,      "y": 1, "w": 1.5}, +                {"x": 1.5,    "y": 1}, +                {"x": 2.5,    "y": 1}, +                {"x": 3.5,    "y": 1}, +                {"x": 4.5,    "y": 1}, +                {"x": 5.5,    "y": 1}, +                {"x": 6.5,    "y": 1}, +                {"x": 7.5,    "y": 1}, +                {"x": 8.5,    "y": 1}, +                {"x": 9.5,    "y": 1}, +                {"x": 10.5,   "y": 1}, +                {"x": 11.5,   "y": 1}, +                {"x": 12.5,   "y": 1}, + +                {"x": 0,      "y": 2, "w": 1.75}, +                {"x": 1.75,   "y": 2}, +                {"x": 2.75,   "y": 2}, +                {"x": 3.75,   "y": 2}, +                {"x": 4.75,   "y": 2}, +                {"x": 5.75,   "y": 2}, +                {"x": 6.75,   "y": 2}, +                {"x": 7.75,   "y": 2}, +                {"x": 8.75,   "y": 2}, +                {"x": 9.75,   "y": 2}, +                {"x": 10.75,  "y": 2}, +                {"x": 11.75,  "y": 2}, +                {"x": 12.75,  "y": 2}, +                {"x": 13.75,  "y": 1, "w": 1.25, "h": 2}, + +                {"x": 0,      "y": 3, "w": 1.25}, +                {"x": 1.25,   "y": 3}, +                {"x": 2.25,   "y": 3}, +                {"x": 3.25,   "y": 3}, +                {"x": 4.25,   "y": 3}, +                {"x": 5.25,   "y": 3}, +                {"x": 6.25,   "y": 3}, +                {"x": 7.25,   "y": 3}, +                {"x": 8.25,   "y": 3}, +                {"x": 9.25,   "y": 3}, +                {"x": 10.25,  "y": 3}, +                {"x": 11.25,  "y": 3}, +                {"x": 12.25,  "y": 3, "w": 1.75}, +                {"x": 14,     "y": 3}, + +                {"x": 0,      "y": 4, "w": 1.25}, +                {"x": 1.25,   "y": 4, "w": 1.25}, +                {"x": 2.5,    "y": 4, "w": 1.25}, +                {"x": 3.75,   "y": 4, "w": 6.25}, +                {"x": 10,     "y": 4, "w": 1.25}, +                {"x": 11.25,  "y": 4, "w": 1.25}, +                {"x": 12.5,   "y": 4, "w": 1.25}, +                {"x": 13.75,  "y": 4, "w": 1.25} +            ] +        }, +        "LAYOUT_tsangan": { +            "layout": [ +                {"x": 0,      "y": 0}, +                {"x": 1,      "y": 0}, +                {"x": 2,      "y": 0}, +                {"x": 3,      "y": 0}, +                {"x": 4,      "y": 0}, +                {"x": 5,      "y": 0}, +                {"x": 6,      "y": 0}, +                {"x": 7,      "y": 0}, +                {"x": 8,      "y": 0}, +                {"x": 9,      "y": 0}, +                {"x": 10,     "y": 0}, +                {"x": 11,     "y": 0}, +                {"x": 12,     "y": 0}, +                {"x": 13,     "y": 0}, +                {"x": 14,     "y": 0}, + +                {"x": 0,      "y": 1, "w": 1.5}, +                {"x": 1.5,    "y": 1}, +                {"x": 2.5,    "y": 1}, +                {"x": 3.5,    "y": 1}, +                {"x": 4.5,    "y": 1}, +                {"x": 5.5,    "y": 1}, +                {"x": 6.5,    "y": 1}, +                {"x": 7.5,    "y": 1}, +                {"x": 8.5,    "y": 1}, +                {"x": 9.5,    "y": 1}, +                {"x": 10.5,   "y": 1}, +                {"x": 11.5,   "y": 1}, +                {"x": 12.5,   "y": 1}, +                {"x": 13.5,   "y": 1, "w": 1.5}, + +                {"x": 0,      "y": 2, "w": 1.75}, +                {"x": 1.75,   "y": 2}, +                {"x": 2.75,   "y": 2}, +                {"x": 3.75,   "y": 2}, +                {"x": 4.75,   "y": 2}, +                {"x": 5.75,   "y": 2}, +                {"x": 6.75,   "y": 2}, +                {"x": 7.75,   "y": 2}, +                {"x": 8.75,   "y": 2}, +                {"x": 9.75,   "y": 2}, +                {"x": 10.75,  "y": 2}, +                {"x": 11.75,  "y": 2}, +                {"x": 12.75,  "y": 2, "w": 2.25}, + +                {"x": 0,      "y": 3, "w": 2.25}, +                {"x": 2.25,   "y": 3}, +                {"x": 3.25,   "y": 3}, +                {"x": 4.25,   "y": 3}, +                {"x": 5.25,   "y": 3}, +                {"x": 6.25,   "y": 3}, +                {"x": 7.25,   "y": 3}, +                {"x": 8.25,   "y": 3}, +                {"x": 9.25,   "y": 3}, +                {"x": 10.25,  "y": 3}, +                {"x": 11.25,  "y": 3}, +                {"x": 12.25,  "y": 3, "w": 1.75}, +                {"x": 14,     "y": 3}, + +                {"x": 0,      "y": 4, "w": 1.5}, +                {"x": 1.5,    "y": 4}, +                {"x": 2.5,    "y": 4, "w": 1.5}, +                {"x": 4,      "y": 4, "w": 7}, +                {"x": 11,     "y": 4, "w": 1.5}, +                {"x": 12.5,   "y": 4}, +                {"x": 13.5,   "y": 4, "w": 1.5} +            ] +        } +    } +} + diff --git a/keyboards/chlx/merro60/keymaps/ansi/keymap.c b/keyboards/chlx/merro60/keymaps/ansi/keymap.c new file mode 100644 index 0000000000..307f98866e --- /dev/null +++ b/keyboards/chlx/merro60/keymaps/ansi/keymap.c @@ -0,0 +1,35 @@ +/*  +Copyright 2021 Alexander Lee <[email protected]>  + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_ansi( +  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, +  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, +  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT, +  KC_LSFT, 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_RSFT, +  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),   KC_RCTL), + +[1] = LAYOUT_ansi( +  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, RESET, +  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______, +  _______, _______, _______,                   _______,                                     _______, _______, _______, _______), +}; diff --git a/keyboards/chlx/merro60/keymaps/default/keymap.c b/keyboards/chlx/merro60/keymaps/default/keymap.c new file mode 100644 index 0000000000..98046d0649 --- /dev/null +++ b/keyboards/chlx/merro60/keymaps/default/keymap.c @@ -0,0 +1,35 @@ +/*  +Copyright 2021 Alexander Lee <[email protected]>  + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_default( +  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, +  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, +  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_UP,   KC_ENT, +  KC_LSFT, KC_LEFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGHT, +  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, KC_DOWN, KC_RCTL), + +[1] = LAYOUT_default( +  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL, +  _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +  _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, +  _______, _______, _______,                   _______,                                     _______, _______, _______, _______), +}; diff --git a/keyboards/chlx/merro60/keymaps/hhkb/keymap.c b/keyboards/chlx/merro60/keymaps/hhkb/keymap.c new file mode 100644 index 0000000000..3ea2901bd1 --- /dev/null +++ b/keyboards/chlx/merro60/keymaps/hhkb/keymap.c @@ -0,0 +1,35 @@ +/*  +Copyright 2021 Alexander Lee <[email protected]>  + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_hhkb( +  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, +  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, +  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT, +           KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), +           KC_LGUI, KC_LALT,                   KC_SPC,                                               KC_RALT, KC_RGUI), + +[1] = LAYOUT_hhkb( +  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL, +  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, RESET, +  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______, +           _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______, +           _______, _______,                   _______,                                              _______, _______), +}; diff --git a/keyboards/chlx/merro60/keymaps/iso/keymap.c b/keyboards/chlx/merro60/keymaps/iso/keymap.c new file mode 100644 index 0000000000..f96ad9adee --- /dev/null +++ b/keyboards/chlx/merro60/keymaps/iso/keymap.c @@ -0,0 +1,35 @@ +/*  +Copyright 2021 Alexander Lee <[email protected]>  + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_iso( +  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, +  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, +  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, +  KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGHT, +  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, KC_APP,  KC_RCTL), + +[1] = LAYOUT_iso( +  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +  _______, _______, _______,                   _______,                                     _______, _______, _______, _______), +}; diff --git a/keyboards/chlx/merro60/keymaps/tsangan/keymap.c b/keyboards/chlx/merro60/keymaps/tsangan/keymap.c new file mode 100644 index 0000000000..2083bf9be1 --- /dev/null +++ b/keyboards/chlx/merro60/keymaps/tsangan/keymap.c @@ -0,0 +1,35 @@ +/*  +Copyright 2021 Alexander Lee <[email protected]>  + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_tsangan( +  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, +  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, +  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT, +           KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), +  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                               KC_RALT, KC_RGUI, KC_RCTL), + +[1] = LAYOUT_tsangan( +  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, +           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +  _______, _______, _______,                   _______,                                              _______, _______, _______), +}; diff --git a/keyboards/chlx/merro60/keymaps/via/keymap.c b/keyboards/chlx/merro60/keymaps/via/keymap.c new file mode 100644 index 0000000000..8f756aefbd --- /dev/null +++ b/keyboards/chlx/merro60/keymaps/via/keymap.c @@ -0,0 +1,51 @@ +/*  +Copyright 2021 Alexander Lee <[email protected]>  + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_via( +  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, +  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, +  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_UP,   KC_ENT, +  KC_LSFT, KC_LEFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGHT, +  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, KC_DOWN, KC_RCTL), + +[1] = LAYOUT_via( +  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL, +  _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +  _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, +  _______, _______, _______,                   _______,                                     _______, _______, _______, _______), + +[2] = LAYOUT_via( +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +  _______, _______, _______,                   _______,                                     _______, _______, _______, _______), + +[3] = LAYOUT_via( +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +  _______, _______, _______,                   _______,                                     _______, _______, _______, _______) + +}; + diff --git a/keyboards/chlx/merro60/keymaps/via/rules.mk b/keyboards/chlx/merro60/keymaps/via/rules.mk new file mode 100644 index 0000000000..5f615ff62b --- /dev/null +++ b/keyboards/chlx/merro60/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes + diff --git a/keyboards/chlx/merro60/merro60.c b/keyboards/chlx/merro60/merro60.c new file mode 100644 index 0000000000..4182c65c76 --- /dev/null +++ b/keyboards/chlx/merro60/merro60.c @@ -0,0 +1,19 @@ +/*  +Copyright 2021 Alexander Lee <[email protected]>  + +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 "merro60.h" + diff --git a/keyboards/chlx/merro60/merro60.h b/keyboards/chlx/merro60/merro60.h new file mode 100644 index 0000000000..2281129996 --- /dev/null +++ b/keyboards/chlx/merro60/merro60.h @@ -0,0 +1,189 @@ +/*  +Copyright 2021 Alexander Lee <[email protected]>  + +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 + +#include "quantum.h" + +// Corresponding changes to the layout names and/or definitions must also be made to info.json + +#define XXX KC_NO + +/* //////////////////// LAYOUT_default //////////////////// + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤ + * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d  │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ + * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │40  │41  │42  │45 (6.25u)              │4a  │4b  │4c  │4d  │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ +*/ + +#define LAYOUT_default( \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      \ +    k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d       \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX }  \ +} + +/* //////////////////// LAYOUT_ansi //////////////////// + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d      │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │40  │41  │42  │45                      │4a  │4b  │4d  │4e  │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ +*/ +#define LAYOUT_ansi( \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      \ +    k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d       \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX }  \ +} + +/* //////////////////// LAYOUT_hhkb //////////////////// + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d      │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │ + * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ + * │▓▓▓▓▓│41 │42   │45 (7u)                    │4b   │4c │▓▓▓▓▓│ + * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ +*/ +#define LAYOUT_hhkb( \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \ +         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      \ +         k41, k42,           k45,                          k4b, k4c            \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ +    { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX }, \ +    { XXX, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, XXX, k4b, k4c, XXX, XXX }  \ +} + +/* //////////////////// LAYOUT_iso //////////////////// + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │     │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d  │ + * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │    │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ + * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │40  │41  │42  │45                      │4a  │4b  │4c  │4d  │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ +*/ +#define LAYOUT_iso( \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      \ +    k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d       \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX }  \ +} + +/* //////////////////// LAYOUT_tsangan //////////////////// + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d      │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │ + * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ + * │40   │41 │42   │45 (7u)                    │4b   │4c │4d   │ + * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ +*/ +#define LAYOUT_tsangan( \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \ +         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      \ +    k40, k41, k42,           k45,                          k4b, k4c, k4d       \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ +    { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, XXX, k4b, k4c, k4d, XXX }  \ +} + +/* //////////////////// LAYOUT_via //////////////////// + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤ + * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d  │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ + * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │40  │41  │42  │45 (6.25u)              │4a  │4b  │4c  │4d  │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ +*/ + +#define LAYOUT_via( \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      \ +    k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d       \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX }  \ +} + diff --git a/keyboards/chlx/merro60/readme.md b/keyboards/chlx/merro60/readme.md new file mode 100644 index 0000000000..f783c0e438 --- /dev/null +++ b/keyboards/chlx/merro60/readme.md @@ -0,0 +1,20 @@ +# merro60 + +merro60 PCB + +A standard 60% format keyboard pcb with USB-C and unified daughterboard compatibility. +Has modified cutouts to allow usage of certain tray mount cases into gummy gasket o-ring mount. + +Keyboard Maintainer: [Alexander Lee](https://github.com/gaclee3b) +Hardware Supported: chlx PCB merro60.1, merro60.1.1, merro60.1.2 + +Enter bootloader mode by any of the following options - +- When unplugged, holding the top-left key (typically ESC) while plugging in the keyboard +- When plugged in, pressing and releasing the reset button on the pcb bottom behind the CAPSLOCK / A-key region +- When plugged in, shorting out the two reset metal contacts near the spacebar switch location (NOT the spacebar switch pin holes) + +Make example for this keyboard (after setting up your build environment): + +    make chlx/merro60: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/chlx/merro60/rules.mk b/keyboards/chlx/merro60/rules.mk new file mode 100644 index 0000000000..32981133b2 --- /dev/null +++ b/keyboards/chlx/merro60/rules.mk @@ -0,0 +1,22 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +#   change yes to no to disable +# +BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes       # Mouse keys +EXTRAKEY_ENABLE = yes       # Audio control and System control +CONSOLE_ENABLE = no         # Console for debug +COMMAND_ENABLE = no         # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes           # USB Nkey Rollover +BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no       # Enable Bluetooth +AUDIO_ENABLE = no           # Audio output | 
