Merge remote-tracking branch 'origin/master' into develop

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
+)
+};

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 @@
             ]
         }
     }
-}
+}

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
+    )
 };

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
+    )
 };

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
+    )
 };

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).