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

9 files changed, 314 insertions, 0 deletions

diff --git a/keyboards/nightly_boards/jisoo/config.h b/keyboards/nightly_boards/jisoo/config.h
new file mode 100644
index 0000000000..c17100bd9c
--- /dev/null
+++ b/keyboards/nightly_boards/jisoo/config.h
@@ -0,0 +1,51 @@
+/*
+Copyright 2022 DeskDaily
+
+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"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 16
+
+/*
+ * 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 { GP26, GP27, GP28, GP18, GP19, GP20 }
+#define MATRIX_COL_PINS { GP25, GP12, GP13, GP12, GP11, GP10, GP9, GP8, GP7, GP6, GP5, GP4, GP3, GP2, GP1, GP0 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* 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
diff --git a/keyboards/nightly_boards/jisoo/info.json b/keyboards/nightly_boards/jisoo/info.json
new file mode 100644
index 0000000000..f70aa8c7ab
--- /dev/null
+++ b/keyboards/nightly_boards/jisoo/info.json
@@ -0,0 +1,102 @@
+{
+    "keyboard_name": "Jisoo", 
+    "manufacturer": "DeskDaily",
+    "maintainer": "DeskDaily",
+    "usb": {
+    	"vid": "0xD812",
+    	"pid": "0x0025",
+    	"device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+			{"x":0, "y":0}, 
+			{"x":1.5, "y":0}, 
+			{"x":2.5, "y":0}, 
+			{"x":3.5, "y":0}, 
+			{"x":4.5, "y":0}, 
+			{"x":6, "y":0}, 
+			{"x":7, "y":0}, 
+			{"x":8, "y":0}, 
+			{"x":9, "y":0}, 
+			{"x":10.5, "y":0}, 
+			{"x":11.5, "y":0}, 
+			{"x":12.5, "y":0}, 
+			{"x":13.5, "y":0}, 
+			{"x":15, "y":0}, 
+			{"x":0, "y":1.25}, 
+			{"x":1, "y":1.25}, 
+			{"x":2, "y":1.25}, 
+			{"x":3, "y":1.25}, 
+			{"x":4, "y":1.25}, 
+			{"x":5, "y":1.25}, 
+			{"x":6, "y":1.25}, 
+			{"x":7, "y":1.25}, 
+			{"x":8, "y":1.25}, 
+			{"x":9, "y":1.25}, 
+			{"x":10, "y":1.25}, 
+			{"x":11, "y":1.25}, 
+			{"x":12, "y":1.25}, 
+			{"x":13, "y":1.25}, 
+			{"x":14, "y":1.25}, 
+			{"x":15, "y":1.25}, 
+			{"x":0, "y":2.25, "w":1.5}, 
+			{"x":1.5, "y":2.25}, 
+			{"x":2.5, "y":2.25}, 
+			{"x":3.5, "y":2.25}, 
+			{"x":4.5, "y":2.25}, 
+			{"x":5.5, "y":2.25}, 
+			{"x":6.5, "y":2.25}, 
+			{"x":7.5, "y":2.25}, 
+			{"x":8.5, "y":2.25}, 
+			{"x":9.5, "y":2.25}, 
+			{"x":10.5, "y":2.25}, 
+			{"x":11.5, "y":2.25}, 
+			{"x":12.5, "y":2.25}, 
+			{"x":13.5, "y":2.25, "w":1.5}, 
+			{"x":15, "y":2.25}, 
+			{"x":0, "y":3.25, "w":1.75}, 
+			{"x":1.75, "y":3.25}, 
+			{"x":2.75, "y":3.25}, 
+			{"x":3.75, "y":3.25}, 
+			{"x":4.75, "y":3.25}, 
+			{"x":5.75, "y":3.25}, 
+			{"x":6.75, "y":3.25}, 
+			{"x":7.75, "y":3.25}, 
+			{"x":8.75, "y":3.25}, 
+			{"x":9.75, "y":3.25}, 
+			{"x":10.75, "y":3.25}, 
+			{"x":11.75, "y":3.25}, 
+			{"x":12.75, "y":3.25, "w":2.25}, 
+			{"x":15, "y":3.25}, 
+			{"x":0, "y":4.25, "w":1.25}, 
+			{"x":1.25, "y":4.25}, 
+			{"x":2.25, "y":4.25}, 
+			{"x":3.25, "y":4.25}, 
+			{"x":4.25, "y":4.25}, 
+			{"x":5.25, "y":4.25}, 
+			{"x":6.25, "y":4.25}, 
+			{"x":7.25, "y":4.25}, 
+			{"x":8.25, "y":4.25}, 
+			{"x":9.25, "y":4.25}, 
+			{"x":10.25, "y":4.25}, 
+			{"x":11.25, "y":4.25}, 
+			{"x":12.25, "y":4.25, "w":1.75}, 
+			{"x":14, "y":4.25}, 
+			{"x":15, "y":4.25}, 
+			{"x":0, "y":5.25, "w":1.25},
+			{"x":1.25, "y":5.25, "w":1.25}, 
+			{"x":2.5, "y":5.25, "w":1.25}, 
+			{"x":3.75, "y":5.25, "w":2}, 
+			{"x":5.75, "y":5.25}, 
+			{"x":6.75, "y":5.25}, 
+			{"x":7.75, "y":5.25, "w":2.25}, 
+			{"x":10, "y":5.25, "w":1.25}, 
+			{"x":11.25, "y":5.25, "w":1.25}, 
+			{"x":13, "y":5.25}, 
+			{"x":14, "y":5.25}, 
+			{"x":15, "y":5.25}
+			]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/nightly_boards/jisoo/jisoo.c b/keyboards/nightly_boards/jisoo/jisoo.c
new file mode 100644
index 0000000000..96a85b4214
--- /dev/null
+++ b/keyboards/nightly_boards/jisoo/jisoo.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 DeskDaily
+ *
+ * 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 "jisoo.h"
diff --git a/keyboards/nightly_boards/jisoo/jisoo.h b/keyboards/nightly_boards/jisoo/jisoo.h
new file mode 100644
index 0000000000..6d822bb42f
--- /dev/null
+++ b/keyboards/nightly_boards/jisoo/jisoo.h
@@ -0,0 +1,43 @@
+/* Copyright 2022 DeskDaily
+ *
+ * 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"
+
+/* 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, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
+    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4E, K4F, \
+    K50, K51, K52, K54, K56, K57, K59, K5A, K5C, K5D, K5E, K5F  \
+) { \
+    { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F }, \
+    { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, K3F }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4D, K4E, K4F }, \
+    { K50, K51, K52, KC_NO, K54, KC_NO, K56, K57, KC_NO, K59, K5A, KC_NO, K5C, K5D, K5E, K5F }, \
+}
diff --git a/keyboards/nightly_boards/jisoo/keymaps/default/keymap.c b/keyboards/nightly_boards/jisoo/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e83c5eff08
--- /dev/null
+++ b/keyboards/nightly_boards/jisoo/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2022 DeskDaily
+ *
+ * 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(
+        KC_ESC,  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_DEL,  
+        KC_GRV,  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_BSPC, KC_HOME, 
+        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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_END,  
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT  
+    ),
+};
\ No newline at end of file
diff --git a/keyboards/nightly_boards/jisoo/keymaps/via/keymap.c b/keyboards/nightly_boards/jisoo/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e83c5eff08
--- /dev/null
+++ b/keyboards/nightly_boards/jisoo/keymaps/via/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2022 DeskDaily
+ *
+ * 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(
+        KC_ESC,  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_DEL,  
+        KC_GRV,  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_BSPC, KC_HOME, 
+        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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_END,  
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT  
+    ),
+};
\ No newline at end of file
diff --git a/keyboards/nightly_boards/jisoo/keymaps/via/rules.mk b/keyboards/nightly_boards/jisoo/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/nightly_boards/jisoo/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/nightly_boards/jisoo/readme.md b/keyboards/nightly_boards/jisoo/readme.md
new file mode 100644
index 0000000000..7d1354e4aa
--- /dev/null
+++ b/keyboards/nightly_boards/jisoo/readme.md
@@ -0,0 +1,26 @@
+# DeskDaily Jisoo
+
+![Jisoo](https://i.imgur.com/c1Ja1NGh.png)
+
+A multi-layout 75% PCB
+
+* Keyboard Maintainer: [DeskDaily](https://github.com/DeskDaily)
+* Hardware Supported: RP2040
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nightly_boards/jisoo:default
+	
+Flashing example for this keyboard:
+
+    make nightly_boards/jisoo:default:flash
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the upper left key) 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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+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).
\ No newline at end of file
diff --git a/keyboards/nightly_boards/jisoo/rules.mk b/keyboards/nightly_boards/jisoo/rules.mk
new file mode 100644
index 0000000000..659b7fede0
--- /dev/null
+++ b/keyboards/nightly_boards/jisoo/rules.mk
@@ -0,0 +1,17 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# 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 = yes             # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no         # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no          # Enable keyboard RGB underglow