Merge 0ce5898fd5 into 36b5559b99

2024-11-21 19:09:25 +00:00 · 2024-11-20 23:06:05 -08:00 · 2024-11-20 23:06:05 -08:00 · eb6d1bcc59
commit eb6d1bcc59
parent 36b5559b99 0ce5898fd5
30 changed files with 187 additions and 28 deletions
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@ -12,7 +12,7 @@

    /* The main list of aliases for moved keyboards within QMK. */
    "2_milk": {
-        "target": "spaceman/2_milk"
+        "target": "spaceboards/2_milk"
    },
    "absinthe": {
        "target": "keyhive/absinthe"
@ -540,10 +540,10 @@
        "target": "pabile/p20/ver1"
    },
    "pancake/feather": {
-        "target": "spaceman/pancake/rev1/feather"
+        "target": "spaceboards/pancake/rev1/feather"
    },
    "pancake/promicro": {
-        "target": "spaceman/pancake/rev1/promicro"
+        "target": "spaceboards/pancake/rev1/promicro"
    },
    "peiorisboards/ixora": {
        "target": "coarse/ixora"
--- a/keyboards/spaceboards/2_milk/keyboard.json
+++ b/keyboards/spaceboards/2_milk/keyboard.json
@ -1,8 +1,8 @@
 {
  "keyboard_name": "2% Milk",
-  "manufacturer": "Spaceman",
+  "manufacturer": "Spaceboards",
  "url": "",
-  "maintainer": "Spaceman",
+  "maintainer": "Spaceboards",
  "usb": {
    "vid": "0x5342",
    "pid": "0x3225",
--- a/keyboards/spaceboards/2_milk/keymaps/default/keymap.c
+++ b/keyboards/spaceboards/2_milk/keymaps/default/keymap.c
--- a/keyboards/spaceboards/2_milk/keymaps/default/readme.md
+++ b/keyboards/spaceboards/2_milk/keymaps/default/readme.md
--- a/keyboards/spaceboards/2_milk/keymaps/emoji/config.h
+++ b/keyboards/spaceboards/2_milk/keymaps/emoji/config.h
--- a/keyboards/spaceboards/2_milk/keymaps/emoji/keymap.c
+++ b/keyboards/spaceboards/2_milk/keymaps/emoji/keymap.c
--- a/keyboards/spaceboards/2_milk/keymaps/emoji/readme.md
+++ b/keyboards/spaceboards/2_milk/keymaps/emoji/readme.md
--- a/keyboards/spaceboards/2_milk/keymaps/emoji/rules.mk
+++ b/keyboards/spaceboards/2_milk/keymaps/emoji/rules.mk
--- a/keyboards/spaceboards/2_milk/keymaps/via/keymap.c
+++ b/keyboards/spaceboards/2_milk/keymaps/via/keymap.c
@ -0,0 +1,20 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+      [0] = LAYOUT(
+          KC_Z,
+          KC_X
+      ),
+      [1] = LAYOUT(
+          _______,
+          _______
+      ),
+      [2] = LAYOUT(
+          _______,
+          _______
+      ),
+      [3] = LAYOUT(
+          _______,
+          _______
+      )
+};
--- a/keyboards/spaceboards/2_milk/keymaps/via/readme.md
+++ b/keyboards/spaceboards/2_milk/keymaps/via/readme.md
@ -0,0 +1,2 @@
+# Default keymap for 2% Milk
+![Picture](https://i.imgur.com/9PsZ6wa.png)
--- a/keyboards/spaceboards/2_milk/keymaps/via/rules.mk
+++ b/keyboards/spaceboards/2_milk/keymaps/via/rules.mk
@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
--- a/keyboards/spaceboards/2_milk/readme.md
+++ b/keyboards/spaceboards/2_milk/readme.md
@ -4,12 +4,12 @@

 A 2% Meme board themed around a milk carton

-Keyboard Maintainer: [Spaceman](https://github.com/Spaceman)
-Hardware Availability: [Open Source](https://github.com/Spaceman/Spaceboards/tree/master/Keyboards/2%25%20Milk)
+Keyboard Maintainer: [Spaceboards](https://github.com/Spaceboards)
+Hardware Availability: [SpaceboardsHardware](https://github.com/Spaceboards/SpaceboardsHardware/tree/master/Keyboards/2%25%20Milk)

 Make example for this keyboard (after setting up your build environment):

-    make spaceman/2_milk:default
+    make spaceboards/2_milk: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).

--- a/keyboards/spaceboards/pancake/rev1/feather/keyboard.json
+++ b/keyboards/spaceboards/pancake/rev1/feather/keyboard.json
--- a/keyboards/spaceboards/pancake/rev1/feather/rules.mk
+++ b/keyboards/spaceboards/pancake/rev1/feather/rules.mk
--- a/keyboards/spaceboards/pancake/rev1/info.json
+++ b/keyboards/spaceboards/pancake/rev1/info.json
@ -1,8 +1,8 @@
 {
  "keyboard_name": "Pancake",
-  "manufacturer": "Spaceman",
+  "manufacturer": "Spaceboards",
  "url": "",
-  "maintainer": "Spaceman",
+  "maintainer": "Spaceboards",
  "usb": {
    "vid": "0x5342",
    "pid": "0x504B",
--- a/keyboards/spaceboards/pancake/rev1/keymaps/default/keymap.c
+++ b/keyboards/spaceboards/pancake/rev1/keymaps/default/keymap.c
--- a/keyboards/spaceboards/pancake/rev1/keymaps/via/keymap.c
+++ b/keyboards/spaceboards/pancake/rev1/keymaps/via/keymap.c
@ -0,0 +1,105 @@
+/* Copyright 2020 Spaceboards 
+  * 
+  * 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
+enum layers {
+  _DEFAULT,
+  _LOWER,
+  _RAISE,
+  _FN
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+#define FN MO(_FN)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Default
+ * ,-----------------------------------------------------------------------------------.
+ * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |  Tab |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   "  |  ;   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl | Alt  | GUI  |  FN  | Lower|    Space    |Raise |   /  | Left | Down |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_DEFAULT] = LAYOUT_ortho_4x12(
+    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_BSPC,
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_SCLN,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,    KC_ENT ,
+    KC_LCTL, KC_LALT, KC_LGUI, FN,      LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN,  KC_RGHT
+),
+
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |   _  |   +  |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |   {  |   }  | Vol+ |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |   ?  |      | Vol- |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_ortho_4x12(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, _______, KC_PIPE,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, KC_VOLU, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_QUES, _______, KC_VOLD, _______
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |  -   |   =   |     |  \   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |   [  |   ]  | Vol- |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      | Vol+ |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_ortho_4x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  _______, KC_BSLS,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_VOLU, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______ 
+),
+ 
+ /* FN
+ * ,-----------------------------------------------------------------------------------.
+ * | Reset| F1   |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |  F11 |  F12 |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      | TRNS |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_FN] = LAYOUT_ortho_4x12(
+    QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11,  KC_F12,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+
+};
+
--- a/keyboards/spaceboards/pancake/rev1/keymaps/via/rules.mk
+++ b/keyboards/spaceboards/pancake/rev1/keymaps/via/rules.mk
@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
--- a/keyboards/spaceboards/pancake/rev1/promicro/keyboard.json
+++ b/keyboards/spaceboards/pancake/rev1/promicro/keyboard.json
--- a/keyboards/spaceboards/pancake/rev1/promicro/rules.mk
+++ b/keyboards/spaceboards/pancake/rev1/promicro/rules.mk
--- a/keyboards/spaceboards/pancake/rev1/readme.md
+++ b/keyboards/spaceboards/pancake/rev1/readme.md
@ -2,12 +2,12 @@

 Ortho 40% Ortho Keyboard with an option for the adafruit feather

-* Keyboard Maintainer: [Spaceman](https://github.com/Spaceman)
-* Hardware Availability: [MKUltra.Click](https://mkultra.click/group-buy-pancake-keyboard-kit)
+* Keyboard Maintainer: [Spaceboards](https://github.com/Spaceboards)
+* Hardware Availability: [SpaceboardsHardware](https://github.com/Spaceboards/SpaceboardsHardware/tree/master/Keyboards/Pancake/V1)

 Make example for this keyboard (after setting up your build environment):

-    make spaceman/pancake/rev1/feather:default
-    make spaceman/pancake/rev1/promicro:default
+    make spaceboards/pancake/rev1/feather:default
+    make spaceboards/pancake/rev1/promicro: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).
--- a/keyboards/spaceboards/pancake/rev2/keyboard.json
+++ b/keyboards/spaceboards/pancake/rev2/keyboard.json
@ -1,8 +1,8 @@
 {
  "keyboard_name": "Pancake 2",
-  "manufacturer": "Spaceman",
+  "manufacturer": "Spaceboards",
  "url": "",
-  "maintainer": "Spaceman",
+  "maintainer": "Spaceboards",
  "usb": {
    "vid": "0x5342",
    "pid": "0x5032",
--- a/keyboards/spaceboards/pancake/rev2/keymaps/default/keymap.c
+++ b/keyboards/spaceboards/pancake/rev2/keymaps/default/keymap.c
@ -1,4 +1,4 @@
- /* Copyright Spaceman 2021
+ /* Copyright Spaceboards 2021
  * 
  * 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 
@ -52,14 +52,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 * |      |      |      |      |      |      |      |      |   [  |   ]  | Vol- |      |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      | Vol+ |      |
+ * |      |      |      |      |      |      | Play |      |      | Prev | Vol+ | Next |
 * `-----------------------------------------------------------------------------------'
 */
 [_RAISE] = LAYOUT_ortho_4x12(
    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
    _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  _______, KC_BSLS,
    _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_VOLU, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______ 
+    _______, _______, _______, _______, _______, _______, KC_MPLY, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT 
 ),
 
 /* FN
--- a/keyboards/spaceboards/pancake/rev2/readme.md
+++ b/keyboards/spaceboards/pancake/rev2/readme.md
@ -2,12 +2,12 @@

 Ortho 40% Ortho Keyboard with an OLED Display

-* Keyboard Maintainer: [Spaceman](https://github.com/Spaceman)
-* Hardware Availability: [MKUltra.Click](https://mkultra.click/pancake-2/)
+* Keyboard Maintainer: [Spaceboards](https://github.com/Spaceboards)
+* Hardware Availability: [SpaceboardsHardware](https://github.com/Spaceboards/SpaceboardsHardware/tree/master/Keyboards/Pancake/V2)

 Make example for this keyboard (after setting up your build environment):

-    make spaceman/pancake/rev2:default
+    make spaceboards/pancake/rev2: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).

--- a/keyboards/spaceboards/pancake/rev2/rev2.c
+++ b/keyboards/spaceboards/pancake/rev2/rev2.c
@ -1,4 +1,4 @@
-/* Copyright 2020 Spaceman
+/* Copyright 2020 Spaceboards
 *
 * 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
--- a/keyboards/spaceboards/yun65/keyboard.json
+++ b/keyboards/spaceboards/yun65/keyboard.json
@ -1,8 +1,8 @@
 {
  "keyboard_name": "Yun 65",
-  "manufacturer": "Spaceman",
+  "manufacturer": "Spaceboards",
  "url": "",
-  "maintainer": "Spaceman",
+  "maintainer": "Spaceboards",
  "usb": {
    "vid": "0x5342",
    "pid": "0x594E",
--- a/keyboards/spaceboards/yun65/keymaps/default/keymap.c
+++ b/keyboards/spaceboards/yun65/keymaps/default/keymap.c
@ -1,4 +1,4 @@
-/* Copyright 2020 Spaceman
+/* Copyright 2020 Spaceboards
 *
 * 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
--- a/keyboards/spaceboards/yun65/keymaps/via/keymap.c
+++ b/keyboards/spaceboards/yun65/keymaps/via/keymap.c
@ -0,0 +1,26 @@
+/* Copyright 2020 Spaceboards
+ *
+ * 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(
+        QK_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_DEL, 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_F1, 
+         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_F2, 
+         KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,  KC_RSFT,  KC_UP, KC_F3, 
+          KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,              KC_RALT, KC_RCTL,   KC_LEFT, KC_DOWN, KC_RIGHT  
+    )
+};
--- a/keyboards/spaceboards/yun65/keymaps/via/rules.mk
+++ b/keyboards/spaceboards/yun65/keymaps/via/rules.mk
@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
--- a/keyboards/spaceboards/yun65/readme.md
+++ b/keyboards/spaceboards/yun65/readme.md
@ -2,12 +2,12 @@

 65% Keyboard designed by Saurabh

-Keyboard Maintainer: [Spaceman](https://github.com/Spaceman)
+Keyboard Maintainer: [Spaceboards](https://github.com/Spaceboards)

 Hardware Availability: TBA

 Make example for this keyboard (after setting up your build environment):

-    make spaceman/yun65:default
+    make spaceboards/yun65: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).