From d790b535802e4e219b37e6cbbb780239b0631b19 Mon Sep 17 00:00:00 2001 From: Roger Date: Wed, 10 Aug 2022 18:33:55 -0700 Subject: [PATCH 1/2] [Keymap] single layer layout for BFO-9000 with numpad on the left (#17957) --- .../bfo9000/keymaps/rogthefrog6x9/keymap.c | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 keyboards/keebio/bfo9000/keymaps/rogthefrog6x9/keymap.c diff --git a/keyboards/keebio/bfo9000/keymaps/rogthefrog6x9/keymap.c b/keyboards/keebio/bfo9000/keymaps/rogthefrog6x9/keymap.c new file mode 100644 index 00000000000..8cdf12545bc --- /dev/null +++ b/keyboards/keebio/bfo9000/keymaps/rogthefrog6x9/keymap.c @@ -0,0 +1,20 @@ +// Copyright 2022 rogthefrog +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum custom_layers { + _BASE, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[_BASE] = LAYOUT( + KC_ESC, KC_CALC, 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_PSCR, KC_VOLU, KC_MUTE, + KC_NUM, KC_INS, 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_VOLD, KC_HOME, + KC_P7, KC_P8, KC_P9, 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_END, + KC_P4, KC_P5, KC_P6, KC_BSPC, 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_INS, KC_PGUP, + KC_P1, KC_P2, KC_P3, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, KC_APP, KC_UP, KC_PGDN, + KC_P0, KC_PDOT, KC_ENT, KC_LCTL, KC_LGUI, KC_LALT, KC_CAPS, KC_ENT, KC_BSPC, KC_SPC, KC_BSPC, KC_RGUI, KC_CUT, KC_COPY, KC_PSTE, KC_LEFT, KC_DOWN, KC_RGHT +) +}; From c230d0658eb1e8293695d16ad93549b81059449f Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 10 Aug 2022 18:34:20 -0700 Subject: [PATCH 2/2] MacroCat Refactor (#17969) --- keyboards/macrocat/info.json | 9 ++-- keyboards/macrocat/keymaps/default/keymap.c | 24 +++++------ keyboards/macrocat/keymaps/oled/keymap.c | 48 ++++++++++----------- keyboards/macrocat/keymaps/via/keymap.c | 48 ++++++++++----------- keyboards/macrocat/readme.md | 6 +-- 5 files changed, 69 insertions(+), 66 deletions(-) diff --git a/keyboards/macrocat/info.json b/keyboards/macrocat/info.json index bf3edb084db..421f1283e13 100644 --- a/keyboards/macrocat/info.json +++ b/keyboards/macrocat/info.json @@ -1,7 +1,7 @@ { "manufacturer": "Catmunch", "keyboard_name": "MacroCat Keyboard", - "maintainer": "Catmunch", + "maintainer": "Catmunch, starcatmeow", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "features": { @@ -24,8 +24,11 @@ "pid": "0x8086", "vid": "0x2022" }, + "layout_aliases": { + "LAYOUT_numpad_4x4": "LAYOUT_ortho_4x4" + }, "layouts": { - "LAYOUT_numpad_4x4": { + "LAYOUT_ortho_4x4": { "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 }, @@ -46,4 +49,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/macrocat/keymaps/default/keymap.c b/keyboards/macrocat/keymaps/default/keymap.c index b173938b702..538dd03295e 100644 --- a/keyboards/macrocat/keymaps/default/keymap.c +++ b/keyboards/macrocat/keymaps/default/keymap.c @@ -4,16 +4,16 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = { - {KC_PLUS, KC_9, KC_8, KC_7 }, - {KC_MINS, KC_6, KC_5, KC_4 }, - {KC_DOT, KC_3, KC_2, KC_1 }, - {KC_ENT, KC_SPACE, KC_0, MO(1)} - }, - [1] = { - {KC_ASTR, KC_MPRV, KC_MPLY,KC_MNXT}, - {KC_SLSH, KC_LPRN, KC_UP, KC_RPRN}, - {KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT}, - {KC_TAB, KC_BSPC, KC_0, KC_TRNS} - } + [0] = LAYOUT_ortho_4x4( + KC_PLUS, KC_9, KC_8, KC_7 , + KC_MINS, KC_6, KC_5, KC_4 , + KC_DOT, KC_3, KC_2, KC_1 , + KC_ENT, KC_SPACE, KC_0, MO(1) + ), + [1] = LAYOUT_ortho_4x4( + KC_ASTR, KC_MPRV, KC_MPLY,KC_MNXT, + KC_SLSH, KC_LPRN, KC_UP, KC_RPRN, + KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT, + KC_TAB, KC_BSPC, KC_0, KC_TRNS + ) }; diff --git a/keyboards/macrocat/keymaps/oled/keymap.c b/keyboards/macrocat/keymaps/oled/keymap.c index b9d5d9a9df8..c9864c1dc79 100644 --- a/keyboards/macrocat/keymaps/oled/keymap.c +++ b/keyboards/macrocat/keymaps/oled/keymap.c @@ -4,28 +4,28 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = { - {KC_PLUS, KC_9, KC_8, KC_7 }, - {KC_MINS, KC_6, KC_5, KC_4 }, - {KC_DOT, KC_3, KC_2, KC_1 }, - {KC_ENT, KC_SPACE, KC_0, MO(1)} - }, - [1] = { - {KC_ASTR, KC_MPRV, KC_MPLY,KC_MNXT}, - {KC_SLSH, KC_LPRN, KC_UP, KC_RPRN}, - {KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT}, - {KC_TAB, KC_BSPC, KC_0, KC_TRNS} - }, - [2] = { - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO} - }, - [3] = { - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO} - } + [0] = LAYOUT_ortho_4x4( + KC_PLUS, KC_9, KC_8, KC_7 , + KC_MINS, KC_6, KC_5, KC_4 , + KC_DOT, KC_3, KC_2, KC_1 , + KC_ENT, KC_SPACE, KC_0, MO(1) + ), + [1] = LAYOUT_ortho_4x4( + KC_ASTR, KC_MPRV, KC_MPLY,KC_MNXT, + KC_SLSH, KC_LPRN, KC_UP, KC_RPRN, + KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT, + KC_TAB, KC_BSPC, KC_0, KC_TRNS + ), + [2] = LAYOUT_ortho_4x4( + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO + ), + [3] = LAYOUT_ortho_4x4( + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO + ) }; diff --git a/keyboards/macrocat/keymaps/via/keymap.c b/keyboards/macrocat/keymaps/via/keymap.c index c10d6e1357d..3a0df45fb78 100644 --- a/keyboards/macrocat/keymaps/via/keymap.c +++ b/keyboards/macrocat/keymaps/via/keymap.c @@ -4,28 +4,28 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = { - {KC_PPLS, KC_9, KC_8, KC_7 }, - {KC_PMNS, KC_6, KC_5, KC_4 }, - {KC_PDOT, KC_3, KC_2, KC_1 }, - {KC_PENT, KC_SPACE, KC_P0, MO(1)} - }, - [1] = { - {KC_PAST, KC_NO, KC_NO, KC_NO}, - {KC_PSLS, KC_LPRN, KC_UP, KC_RPRN}, - {KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT}, - {KC_TAB, KC_BSPC, KC_P0, KC_TRNS} - }, - [2] = { - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO} - }, - [3] = { - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO} - } + [0] = LAYOUT_ortho_4x4( + KC_PPLS, KC_9, KC_8, KC_7 , + KC_PMNS, KC_6, KC_5, KC_4 , + KC_PDOT, KC_3, KC_2, KC_1 , + KC_PENT, KC_SPACE, KC_P0, MO(1) + ), + [1] = LAYOUT_ortho_4x4( + KC_PAST, KC_NO, KC_NO, KC_NO, + KC_PSLS, KC_LPRN, KC_UP, KC_RPRN, + KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT, + KC_TAB, KC_BSPC, KC_P0, KC_TRNS + ), + [2] = LAYOUT_ortho_4x4( + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO + ), + [3] = LAYOUT_ortho_4x4( + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO + ) }; diff --git a/keyboards/macrocat/readme.md b/keyboards/macrocat/readme.md index 42cf36dc16f..da06c04f63a 100644 --- a/keyboards/macrocat/readme.md +++ b/keyboards/macrocat/readme.md @@ -4,7 +4,7 @@ A cat like macro keyboard/numpad. -* Keyboard Maintainer: [catmunch](https://github.com/catmunch) +* Keyboard Maintainer: [catmunch](https://github.com/catmunch), [starcatmeow](https://github.com/starcatmeow) * Hardware Supported: Fully Supported * Hardware Availability: [MacroCat Keyboard](https://github.com/catmunch/macrocat) @@ -16,8 +16,6 @@ Flashing example for this keyboard: make macrocat: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 in 3 ways: @@ -25,3 +23,5 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead * **Brand new atmega32u4 chip**: Plug the cable in, it will automatically boot into bootloader + +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).