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

21 files changed, 310 insertions, 4 deletions

diff --git a/keyboards/spaceman/pancake/config.h b/keyboards/spaceman/pancake/rev1/config.h
index e05a618e4..e05a618e4 100644
--- a/keyboards/spaceman/pancake/config.h
+++ b/keyboards/spaceman/pancake/rev1/config.h
diff --git a/keyboards/spaceman/pancake/feather/config.h b/keyboards/spaceman/pancake/rev1/feather/config.h
index e72b25f3d..e72b25f3d 100644
--- a/keyboards/spaceman/pancake/feather/config.h
+++ b/keyboards/spaceman/pancake/rev1/feather/config.h
diff --git a/keyboards/spaceman/pancake/feather/rules.mk b/keyboards/spaceman/pancake/rev1/feather/rules.mk
index 993388ffb..993388ffb 100644
--- a/keyboards/spaceman/pancake/feather/rules.mk
+++ b/keyboards/spaceman/pancake/rev1/feather/rules.mk
diff --git a/keyboards/spaceman/pancake/info.json b/keyboards/spaceman/pancake/rev1/info.json
index 6f88d5337..6f88d5337 100644
--- a/keyboards/spaceman/pancake/info.json
+++ b/keyboards/spaceman/pancake/rev1/info.json
diff --git a/keyboards/spaceman/pancake/keymaps/default/keymap.c b/keyboards/spaceman/pancake/rev1/keymaps/default/keymap.c
index cebc6fccb..cebc6fccb 100644
--- a/keyboards/spaceman/pancake/keymaps/default/keymap.c
+++ b/keyboards/spaceman/pancake/rev1/keymaps/default/keymap.c
diff --git a/keyboards/spaceman/pancake/keymaps/default/readme.md b/keyboards/spaceman/pancake/rev1/keymaps/default/readme.md
index 7eb8cc6d8..7eb8cc6d8 100644
--- a/keyboards/spaceman/pancake/keymaps/default/readme.md
+++ b/keyboards/spaceman/pancake/rev1/keymaps/default/readme.md
diff --git a/keyboards/spaceman/pancake/keymaps/via/keymap.c b/keyboards/spaceman/pancake/rev1/keymaps/via/keymap.c
index a0cda2ee7..a0cda2ee7 100644
--- a/keyboards/spaceman/pancake/keymaps/via/keymap.c
+++ b/keyboards/spaceman/pancake/rev1/keymaps/via/keymap.c
diff --git a/keyboards/spaceman/pancake/keymaps/via/rules.mk b/keyboards/spaceman/pancake/rev1/keymaps/via/rules.mk
index 36b7ba9cb..36b7ba9cb 100644
--- a/keyboards/spaceman/pancake/keymaps/via/rules.mk
+++ b/keyboards/spaceman/pancake/rev1/keymaps/via/rules.mk
diff --git a/keyboards/spaceman/pancake/promicro/config.h b/keyboards/spaceman/pancake/rev1/promicro/config.h
index ee02bff2b..ee02bff2b 100644
--- a/keyboards/spaceman/pancake/promicro/config.h
+++ b/keyboards/spaceman/pancake/rev1/promicro/config.h
diff --git a/keyboards/spaceman/pancake/promicro/rules.mk b/keyboards/spaceman/pancake/rev1/promicro/rules.mk
index 5669ee955..5669ee955 100644
--- a/keyboards/spaceman/pancake/promicro/rules.mk
+++ b/keyboards/spaceman/pancake/rev1/promicro/rules.mk
diff --git a/keyboards/spaceman/pancake/readme.md b/keyboards/spaceman/pancake/rev1/readme.md
index 34cf6382b..2537db9ec 100644
--- a/keyboards/spaceman/pancake/readme.md
+++ b/keyboards/spaceman/pancake/rev1/readme.md
@@ -2,11 +2,12 @@
 
 Ortho 40% Ortho Keyboard with an option for the adafruit feather
 
-Keyboard Maintainer: [Spaceman](https://github.com/Spaceman)
-Hardware Availability: [GB](https://geekhack.org/index.php?topic=101371.0)
+* Keyboard Maintainer: [Spaceman](https://github.com/Spaceman)
+* Hardware Availability: [MKUltra.Click](https://mkultra.click/group-buy-pancake-keyboard-kit)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make spaceman/pancake:default
+    make spaceman/pancake/rev1/feather:default
+    make spaceman/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).
diff --git a/keyboards/spaceman/pancake/pancake.c b/keyboards/spaceman/pancake/rev1/rev1.c
index d77dbfbe0..d22665329 100644
--- a/keyboards/spaceman/pancake/pancake.c
+++ b/keyboards/spaceman/pancake/rev1/rev1.c
@@ -13,4 +13,4 @@
  * 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 "pancake.h"
+#include "rev1.h"
diff --git a/keyboards/spaceman/pancake/pancake.h b/keyboards/spaceman/pancake/rev1/rev1.h
index 312d789b4..312d789b4 100644
--- a/keyboards/spaceman/pancake/pancake.h
+++ b/keyboards/spaceman/pancake/rev1/rev1.h
diff --git a/keyboards/spaceman/pancake/rev2/config.h b/keyboards/spaceman/pancake/rev2/config.h
new file mode 100644
index 000000000..a4d3b439c
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev2/config.h
@@ -0,0 +1,34 @@
+/* Copyright 2020 Spaceman
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x5342 // SB
+#define PRODUCT_ID      0x5032 // P2
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    Spaceman
+#define PRODUCT         Pancake 2
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+#define DIODE_DIRECTION COL2ROW
+
+#define MATRIX_ROW_PINS { C7, C6, B6, B5 }
+#define MATRIX_COL_PINS { B7, B3, B2, B1 ,B0, E6, F0, F1, F4, F5, F6, F7 }
+#define UNUSED_PINS
diff --git a/keyboards/spaceman/pancake/rev2/info.json b/keyboards/spaceman/pancake/rev2/info.json
new file mode 100644
index 000000000..d8451fec5
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev2/info.json
@@ -0,0 +1,62 @@
+{
+  "keyboard_name": "Pancake 2",
+  "keyboard_folder": "pancake/rev2",
+  "url": "",
+  "maintainer": "Spaceman",
+  "width": 13,
+  "height": 4,
+  "layouts": {
+                "LAYOUT_ortho_4x12": {
+      "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":7, "y":0},  
+        {"x":8, "y":0},  
+        {"x":9, "y":0},  
+        {"x":10, "y":0},  
+        {"x":11, "y":0},  
+        {"x":12, "y":0},  
+        {"x":0, "y":1},  
+        {"x":1, "y":1},  
+        {"x":2, "y":1},  
+        {"x":3, "y":1},  
+        {"x":4, "y":1},  
+        {"x":5, "y":1},  
+        {"x":7, "y":1},  
+        {"x":8, "y":1},  
+        {"x":9, "y":1},  
+        {"x":10, "y":1},  
+        {"x":11, "y":1},  
+        {"x":12, "y":1},  
+        {"x":0, "y":2},  
+        {"x":1, "y":2},  
+        {"x":2, "y":2},  
+        {"x":3, "y":2},  
+        {"x":4, "y":2},  
+        {"x":5, "y":2},  
+        {"x":7, "y":2},  
+        {"x":8, "y":2},  
+        {"x":9, "y":2},  
+        {"x":10, "y":2},  
+        {"x":11, "y":2},  
+        {"x":12, "y":2},  
+        {"x":0, "y":3},  
+        {"x":1, "y":3},  
+        {"x":2, "y":3},  
+        {"x":3, "y":3},  
+        {"x":4, "y":3},  
+        {"x":5, "y":3, "w":1.5},  
+        {"x":6.5, "y":3, "w":1.5},  
+        {"x":8, "y":3},  
+        {"x":9, "y":3},  
+        {"x":10, "y":3},  
+        {"x":11, "y":3},  
+        {"x":12, "y":3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/spaceman/pancake/rev2/keymaps/default/keymap.c b/keyboards/spaceman/pancake/rev2/keymaps/default/keymap.c
new file mode 100644
index 000000000..33a27bc49
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev2/keymaps/default/keymap.c
@@ -0,0 +1,84 @@
+ /* Copyright Spaceman 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 
+  * 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,
+  _RAISE,
+  _FN
+};
+
+#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    | Del  |   /  | 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,      RAISE,   KC_SPC,  KC_SPC,  KC_DEL,   KC_SLSH, KC_LEFT, KC_DOWN,  KC_RGHT
+),
+
+/* 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(
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11,  KC_F12,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+
+};
diff --git a/keyboards/spaceman/pancake/rev2/keymaps/default/readme.md b/keyboards/spaceman/pancake/rev2/keymaps/default/readme.md
new file mode 100644
index 000000000..7eb8cc6d8
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev2/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# Default keymap for Pancake
+
+designed by: Spaceman
diff --git a/keyboards/spaceman/pancake/rev2/readme.md b/keyboards/spaceman/pancake/rev2/readme.md
new file mode 100644
index 000000000..e8b65c488
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev2/readme.md
@@ -0,0 +1,12 @@
+# Pancake 2
+
+Ortho 40% Ortho Keyboard with an OLED Display
+
+* Keyboard Maintainer: [Spaceman](https://github.com/Spaceman)
+* Hardware Availability: [MKUltra.Click](https://mkultra.click/pancake-2/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make spaceman/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).
diff --git a/keyboards/spaceman/pancake/rev2/rev2.c b/keyboards/spaceman/pancake/rev2/rev2.c
new file mode 100644
index 000000000..c1786cb01
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev2/rev2.c
@@ -0,0 +1,54 @@
+/* Copyright 2020 Spaceman
+ *
+ * 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 "rev2.h"
+
+
+#ifdef OLED_DRIVER_ENABLE
+__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_270;
+}
+__attribute__((weak)) void oled_task_user(void) {
+    static const char PROGMEM pancake_logo[] = {
+        0x00, 0x00, 0x3e, 0x0a, 0x04, 0x00, 0x3c, 0x0a, 0x3c, 0x00, 0x3e, 0x0c, 0x18, 0x3e, 0x00, 0x3e,
+        0x22, 0x22, 0x00, 0x3c, 0x0a, 0x3c, 0x00, 0x3e, 0x08, 0x36, 0x00, 0x3e, 0x2a, 0x22, 0x00, 0x00,
+        0x00, 0x30, 0xc8, 0x84, 0x84, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x19, 0x1d,
+        0x1d, 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x84, 0x84, 0xc8, 0x30, 0x00,
+        0x00, 0x63, 0x94, 0x08, 0x08, 0x11, 0x71, 0x17, 0x13, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x62, 
+        0xe2, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x11, 0x11, 0x11, 0x31, 0x08, 0x08, 0x94, 0x63, 0x00,
+        0x00, 0x00, 0x03, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+        0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x02, 0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00 };
+    oled_write_raw_P(pancake_logo, sizeof(pancake_logo));
+    // Host Keyboard Layer Status
+    oled_set_cursor(0, 4);
+    oled_write_P(PSTR("\nLAYER\n-----\n"), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_P(PSTR("DEFLT\n"), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("FUNCT\n"), false);
+            break;
+        case 1:
+            oled_write_P(PSTR("RAISE\n"), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undefined"), false);
+            break;
+    }
+}
+#endif
diff --git a/keyboards/spaceman/pancake/rev2/rev2.h b/keyboards/spaceman/pancake/rev2/rev2.h
new file mode 100644
index 000000000..628b1b39a
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev2/rev2.h
@@ -0,0 +1,31 @@
+/* Copyright 2020 Spaceman
+ *
+ * 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"
+
+#define LAYOUT_ortho_4x12( \
+    k000, k001, k002, k003, k004, k005,       k006, k007, k008, k009, k010, k011, \
+    k100, k101, k102, k103, k104, k105,       k106, k107, k108, k109, k110, k111, \
+    k200, k201, k202, k203, k204, k205,       k206, k207, k208, k209, k210, k211, \
+    k300, k301, k302, k303, k304,   k305,   k306,   k307, k308, k309, k310, k311 \
+) \
+{ \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }, \
+    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 } \
+}
diff --git a/keyboards/spaceman/pancake/rev2/rules.mk b/keyboards/spaceman/pancake/rev2/rules.mk
new file mode 100644
index 000000000..5b5ccc369
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev2/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = full     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # 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
+OLED_DRIVER_ENABLE = yes
+
+LAYOUTS = ortho_4x12