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

8 files changed, 316 insertions, 0 deletions

diff --git a/keyboards/papercranekeyboards/gerald65/config.h b/keyboards/papercranekeyboards/gerald65/config.h
new file mode 100644
index 0000000000..9e795b1501
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/config.h
@@ -0,0 +1,130 @@
+// Copyright 2021 PaperCraneKeyboards (@PaperCraneKeyboards)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x5012 // 
+#define PRODUCT_ID   0x1501 // '21 keyboard 1
+#define DEVICE_VER   0x0001
+#define MANUFACTURER PaperCraneKeyboards
+#define PRODUCT      gerald65
+
+/* 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 { B7, D6, E6, B4, B5 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D7, D4, D3, D2, D1, D0, B6, C6, C7 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/papercranekeyboards/gerald65/gerald65.c b/keyboards/papercranekeyboards/gerald65/gerald65.c
new file mode 100644
index 0000000000..a33f05d8dc
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/gerald65.c
@@ -0,0 +1,4 @@
+// Copyright 2021 PaperCraneKeyboards (@PaperCraneKeyboards)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "gerald65.h"
diff --git a/keyboards/papercranekeyboards/gerald65/gerald65.h b/keyboards/papercranekeyboards/gerald65/gerald65.h
new file mode 100644
index 0000000000..b433051bb7
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/gerald65.h
@@ -0,0 +1,29 @@
+// Copyright 2021 PaperCraneKeyboards (@PaperCraneKeyboards)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05,   k06, k07, k08, k09, k10, k11, k12, k13, k14, \
+    k15, k16, k17, k18, k19, k20,   k21, k22, k23, k24, k25, k26, k27, k28, k29, \
+    k30, k31, k32, k33, k34, k35,   k36, k37, k38, k39, k40, k41, k42,      k43, \
+    k44, k45, k46, k47, k48, k49,   k50, k51, k52, k53, k54, k55,      k56, k57, \
+    k58,      k59, k60,      k61,   k62,      k63,                k64, k65, k66  \
+) { \
+    {k00, k01,   k02, k03, k04,   k05,   k06, k07,   k08, k09,   k10,   k11,   k12,   k13, k14}, \
+    {k15, k16,   k17, k18, k19,   k20,   k21, k22,   k23, k24,   k25,   k26,   k27,   k28, k29}, \
+    {k30, k31,   k32, k33, k34,   k35,   k36, k37,   k38, k39,   k40,   k41,   k42, KC_NO, k43}, \
+    {k44, k45,   k46, k47, k48,   k49,   k50, k51,   k52, k53,   k54,   k55,   KC_NO, k56, k57}, \
+    {k58, KC_NO, k59, k60, KC_NO, k61,   k62, KC_NO, k63, KC_NO, KC_NO, KC_NO, k64,   k65, k66} \
+}
diff --git a/keyboards/papercranekeyboards/gerald65/info.json b/keyboards/papercranekeyboards/gerald65/info.json
new file mode 100644
index 0000000000..c9b08304b3
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "gerald65",
+    "url": "",
+    "maintainer": "PaperCraneKeyboards",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"~", "x":0, "y":0}, 
+                {"label":"!", "x":1, "y":0}, 
+                {"label":"@", "x":2, "y":0}, 
+                {"label":"#", "x":3, "y":0}, 
+                {"label":"$", "x":4, "y":0}, 
+                {"label":"%", "x":5, "y":0}, 
+                {"label":"^", "x":6, "y":0}, 
+                {"label":"&", "x":8.25, "y":0}, 
+                {"label":"*", "x":9.25, "y":0}, 
+                {"label":"(", "x":10.25, "y":0}, 
+                {"label":")", "x":11.25, "y":0}, 
+                {"label":"_", "x":12.25, "y":0}, 
+                {"label":"+", "x":13.25, "y":0}, 
+                {"label":"Backspace", "x":14.25, "y":0, "w":2}, 
+                {"label":"Delete", "x":16.5, "y":0}, 
+                {"label":"Tab", "x":0, "y":1, "w":1.5}, 
+                {"label":"Q", "x":1.5, "y":1}, 
+                {"label":"W", "x":2.5, "y":1}, 
+                {"label":"E", "x":3.5, "y":1}, 
+                {"label":"R", "x":4.5, "y":1}, 
+                {"label":"T", "x":5.5, "y":1}, 
+                {"label":"Y", "x":7.75, "y":1}, 
+                {"label":"U", "x":8.75, "y":1}, 
+                {"label":"I", "x":9.75, "y":1}, 
+                {"label":"O", "x":10.75, "y":1}, 
+                {"label":"P", "x":11.75, "y":1}, 
+                {"label":"{", "x":12.75, "y":1}, 
+                {"label":"}", "x":13.75, "y":1}, 
+                {"label":"|", "x":14.75, "y":1, "w":1.5}, 
+                {"label":"Page Up", "x":16.5, "y":1}, 
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, 
+                {"label":"A", "x":1.75, "y":2}, 
+                {"label":"S", "x":2.75, "y":2}, 
+                {"label":"D", "x":3.75, "y":2}, 
+                {"label":"F", "x":4.75, "y":2}, 
+                {"label":"G", "x":5.75, "y":2}, 
+                {"label":"H", "x":8, "y":2}, 
+                {"label":"J", "x":9, "y":2}, 
+                {"label":"K", "x":10, "y":2}, 
+                {"label":"L", "x":11, "y":2}, 
+                {"label":":", "x":12, "y":2}, 
+                {"label":"\"", "x":13, "y":2}, 
+                {"label":"Enter", "x":14, "y":2, "w":2.25}, 
+                {"label":"Page Down", "x":16.5, "y":2}, 
+                {"label":"Shift", "x":0, "y":3, "w":2.25}, 
+                {"label":"Z", "x":2.25, "y":3}, 
+                {"label":"X", "x":3.25, "y":3}, 
+                {"label":"C", "x":4.25, "y":3}, 
+                {"label":"V", "x":5.25, "y":3}, 
+                {"label":"B", "x":6.25, "y":3}, 
+                {"label":"N", "x":8.5, "y":3}, 
+                {"label":"M", "x":9.5, "y":3}, 
+                {"label":"<", "x":10.5, "y":3}, 
+                {"label":">", "x":11.5, "y":3}, 
+                {"label":"?", "x":12.5, "y":3}, 
+                {"label":"Shift", "x":13.5, "y":3, "w":1.75}, 
+                {"label":"up", "x":15.5, "y":3}, 
+                {"label":"Home", "x":16.5, "y":3}, 
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 
+                {"label":"Alt", "x":3.25, "y":4, "w":1.25}, 
+                {"label":"space", "x":4.5, "y":4, "w":2}, 
+                {"label":"space", "x":6.5, "y":4}, 
+                {"label":"space", "x":8.25, "y":4, "w":2.75}, 
+                {"label":"Win", "x":11, "y":4, "w":1.25}, 
+                {"label":"left", "x":14.5, "y":4}, 
+                {"label":"down", "x":15.5, "y":4}, 
+                {"label":"right", "x":16.5, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/papercranekeyboards/gerald65/keymaps/default/keymap.c b/keyboards/papercranekeyboards/gerald65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b7f54ceb7c
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+// Copyright 2021 PaperCraneKeyboards (@PaperCraneKeyboards)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE, _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        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_DEL,
+        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_PGUP,
+        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_PGDN,
+        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_UP, KC_PAUSE,
+        KC_LCTL,       KC_LALT, KC_SPC, MO(_FN),       KC_SPC, KC_LGUI,                   KC_LEFT, KC_DOWN, KC_RGHT
+            
+    ),
+    [_FN] = LAYOUT(
+        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_TRNS, RESET,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+            
+    )
+};
diff --git a/keyboards/papercranekeyboards/gerald65/keymaps/default/readme.md b/keyboards/papercranekeyboards/gerald65/keymaps/default/readme.md
new file mode 100644
index 0000000000..e548f34ac4
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for gerald65
diff --git a/keyboards/papercranekeyboards/gerald65/readme.md b/keyboards/papercranekeyboards/gerald65/readme.md
new file mode 100644
index 0000000000..2dafff9e20
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/readme.md
@@ -0,0 +1,27 @@
+# Paper Crane Keyboards Gerald65
+
+![gerald65](https://i.imgur.com/Qh9cLeEh.jpeg)
+
+A 65% ergonomic acrylic keyboard emphasizing customizability.
+
+* Keyboard Maintainer: [PaperCraneKeyboards](https://github.com/PaperCraneKeyboards)
+* Hardware Supported: Gerald65 PCB
+* Hardware Availability: [Paper Crane Keyboards](https://papercranekeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make papercranekeyboards/gerald65:default
+
+Flashing example for this keyboard:
+
+    make papercranekeyboards/gerald65:default:flash
+
+## Bootloader
+
+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 (located in the center)
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available. To do this, hold down the key to the right of the left spacebar (1u key in the center of bottom row), and then also press the key in the top right (by default, the delete key).
+
+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/papercranekeyboards/gerald65/rules.mk b/keyboards/papercranekeyboards/gerald65/rules.mk
new file mode 100644
index 0000000000..1275531ef6
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output