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

9 files changed, 346 insertions, 0 deletions

diff --git a/keyboards/wuque/creek70/config.h b/keyboards/wuque/creek70/config.h
new file mode 100644
index 0000000000..1048387aa2
--- /dev/null
+++ b/keyboards/wuque/creek70/config.h
@@ -0,0 +1,31 @@
+/* Copyright 2023 wuque
+ *
+ * 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
+
+#define RGB_DI_PIN D0
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 1
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*======= RGB function=======*/
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#endif
diff --git a/keyboards/wuque/creek70/creek70.c b/keyboards/wuque/creek70/creek70.c
new file mode 100644
index 0000000000..f6ea64ee33
--- /dev/null
+++ b/keyboards/wuque/creek70/creek70.c
@@ -0,0 +1,17 @@
+/* Copyright 2023 wuque
+ *
+ * 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 "creek70.h"
diff --git a/keyboards/wuque/creek70/creek70.h b/keyboards/wuque/creek70/creek70.h
new file mode 100644
index 0000000000..d182671cc4
--- /dev/null
+++ b/keyboards/wuque/creek70/creek70.h
@@ -0,0 +1,49 @@
+/* Copyright 2023 wuque
+ *
+ * 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"
+
+
+/* Standard Arrangement
+ *      ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+ *      │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │2E ││0F │0G │0H │
+ * ┌───┐├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+ * |10 |│11   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   ││1F │1G │1H │
+ * ├───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+ * |20 |│21    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │
+ * ├───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+ * |30 |│31  │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D    │3E │    │3G │
+ * ├───┤├────┼───┴┬──┴─┬─┴───┴───┼───┴┬──┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+ * |40 |│41  │42  │43  │46       │47  │48       │4B  │4C  │4D  │4E  ││4F │4G │4H │
+ * └───┘└────┴────┴────┴─────────┴────┴─────────┴────┴────┴────┴────┘└───┴───┴───┘
+ */
+
+#define LAYOUT( \
+         K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2E,   K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,        K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,                            \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,             K3G,      \
+    K40, K41, K42, K43,           K46, K47, K48,           K4B, K4C, K4D, K4E,        K4F, K4G, K4H \
+) { \
+    { KC_NO, K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   K0H    }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G,   K1H    }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   KC_NO, KC_NO, KC_NO  }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   KC_NO, K3G,   KC_NO  }, \
+    { K40,   K41,   K42,   K43,   KC_NO, KC_NO, K46,   K47,   K48,   KC_NO, KC_NO, K4B,   K4C,   K4D,   K4E,   K4F,   K4G,   K4H    }, \
+}
+
diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/info.json
new file mode 100644
index 0000000000..00c9df86c3
--- /dev/null
+++ b/keyboards/wuque/creek70/info.json
@@ -0,0 +1,137 @@
+{
+  "keyboard_name": "creek70",
+  "manufacturer": "wuque studio",
+  "maintainer": "spbgzh",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "diode_direction": "COL2ROW",
+  "features": {
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true
+  },
+  "matrix_pins": {
+    "rows": ["B3", "B2", "F0", "D3", "D1"],
+    "cols": [
+      "E6",
+      "D4",
+      "D7",
+      "F7",
+      "D2",
+      "D5",
+      "D6",
+      "F5",
+      "F4",
+      "F1",
+      "C7",
+      "C6",
+      "B6",
+      "B5",
+      "B4",
+      "B7",
+      "B1",
+      "B0"
+    ]
+  },
+  "usb": {
+    "vid": "0x916D",
+    "pid": "0x0001",
+    "device_version": "0.0.1"
+  },
+  "indicators": {
+    "caps_lock": "F6"
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        { "label": "~", "x": 1, "y": 0 },
+        { "label": "1", "x": 2, "y": 0 },
+        { "label": "2", "x": 3, "y": 0 },
+        { "label": "3", "x": 4, "y": 0 },
+        { "label": "4", "x": 5, "y": 0 },
+        { "label": "5", "x": 6, "y": 0 },
+        { "label": "6", "x": 7, "y": 0 },
+        { "label": "7", "x": 8, "y": 0 },
+        { "label": "8", "x": 9, "y": 0 },
+        { "label": "9", "x": 10, "y": 0 },
+        { "label": "0", "x": 11, "y": 0 },
+        { "label": "-", "x": 12, "y": 0 },
+        { "label": "=", "x": 13, "y": 0 },
+        { "label": "Backspace", "x": 14, "y": 0 },
+        { "label": "Insert", "x": 16.25, "y": 0 },
+        { "label": "Home", "x": 17.25, "y": 0 },
+        { "label": "PageUp", "x": 18.25, "y": 0 },
+
+        { "label": "Func1", "x": 0, "y": 1 },
+        { "label": "Tab", "x": 1, "y": 1, "w": 1.5 },
+        { "label": "Q", "x": 2.5, "y": 1 },
+        { "label": "W", "x": 3.5, "y": 1 },
+        { "label": "E", "x": 4.5, "y": 1 },
+        { "label": "R", "x": 5.5, "y": 1 },
+        { "label": "T", "x": 6.5, "y": 1 },
+        { "label": "Y", "x": 7.5, "y": 1 },
+        { "label": "U", "x": 8.5, "y": 1 },
+        { "label": "I", "x": 9.5, "y": 1 },
+        { "label": "O", "x": 10.5, "y": 1 },
+        { "label": "P", "x": 11.5, "y": 1 },
+        { "label": "[", "x": 12.5, "y": 1 },
+        { "label": "]", "x": 13.5, "y": 1 },
+        { "label": "\\", "x": 14.5, "y": 1, "w": 1.5 },
+        { "label": "Delete", "x": 16.25, "y": 1 },
+        { "label": "End", "x": 17.25, "y": 1 },
+        { "label": "PageDown", "x": 18.25, "y": 1 },
+
+        { "label": "Func2", "x": 0, "y": 2 },
+        { "label": "Caps Lock", "x": 1, "y": 2, "w": 1.75 },
+        { "label": "A", "x": 2.75, "y": 2 },
+        { "label": "S", "x": 3.75, "y": 2 },
+        { "label": "D", "x": 4.75, "y": 2 },
+        { "label": "F", "x": 5.75, "y": 2 },
+        { "label": "G", "x": 6.75, "y": 2 },
+        { "label": "H", "x": 7.75, "y": 2 },
+        { "label": "J", "x": 8.75, "y": 2 },
+        { "label": "K", "x": 9.75, "y": 2 },
+        { "label": "L", "x": 10.75, "y": 2 },
+        { "label": ";", "x": 11.75, "y": 2 },
+        { "label": "'", "x": 12.75, "y": 2 },
+        { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 },
+        { "label": "Backspace1", "x": 15, "y": 0 },
+
+        { "label": "Func3", "x": 0, "y": 3 },
+        { "label": "Shift1", "x": 1, "y": 3 },
+        { "label": "Shift2", "x": 2, "y": 3, "w": 1.25 },
+        { "label": "Z", "x": 3.25, "y": 3 },
+        { "label": "X", "x": 4.25, "y": 3 },
+        { "label": "C", "x": 5.25, "y": 3 },
+        { "label": "V", "x": 6.25, "y": 3 },
+        { "label": "B", "x": 7.25, "y": 3 },
+        { "label": "N", "x": 8.25, "y": 3 },
+        { "label": "M", "x": 9.25, "y": 3 },
+        { "label": ",", "x": 10.25, "y": 3 },
+        { "label": ".", "x": 11.25, "y": 3 },
+        { "label": "/", "x": 12.25, "y": 3 },
+        { "label": "Shift1", "x": 13.25, "y": 3, "w": 1.75 },
+        { "label": "Shift2", "x": 15, "y": 3 },
+        { "label": "\u2191", "x": 17.25, "y": 3 },
+
+        { "label": "Func4", "x": 0, "y": 4 },
+        { "label": "Ctrl", "x": 1, "y": 4, "w": 1.25 },
+        { "label": "Win", "x": 2.25, "y": 4, "w": 1.25 },
+        { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
+        { "label": "Space", "x": 4.75, "y": 4, "w": 2.5 },
+        { "label": "Space", "x": 7.25, "y": 4, "w": 1.25 },
+        { "label": "Space", "x": 8.5, "y": 4, "w": 2.5 },
+        { "label": "Alt", "x": 11, "y": 4, "w": 1.25 },
+        { "label": "Win", "x": 12.25, "y": 4, "w": 1.25 },
+        { "label": "Fn", "x": 13.5, "y": 4, "w": 1.25 },
+        { "label": "Ctrl", "x": 14.75, "y": 4, "w": 1.25 },
+        { "label": "\u2190", "x": 16.25, "y": 4 },
+        { "label": "\u2193", "x": 17.25, "y": 4 },
+        { "label": "\u2192", "x": 18.25, "y": 4 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/wuque/creek70/keymaps/default/keymap.c b/keyboards/wuque/creek70/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d99b8c10c7
--- /dev/null
+++ b/keyboards/wuque/creek70/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2023 wuque
+ *
+ * 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_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_INS,  KC_HOME, KC_PGUP,
+		KC_KB_MUTE,        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_DEL,  KC_END,  KC_PGDN,
+		KC_KB_VOLUME_UP,   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_BSPC,
+		KC_KB_VOLUME_DOWN, 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_RSFT, KC_RSFT,            KC_UP,
+		KC_PAUSE,             KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_LGUI, MO(1),   KC_RCTL,   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT(
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
+        _______, _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,    _______, _______, _______
+    ),
+};
diff --git a/keyboards/wuque/creek70/keymaps/via/keymap.c b/keyboards/wuque/creek70/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e376fde0d6
--- /dev/null
+++ b/keyboards/wuque/creek70/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2023 wuque
+ *
+ * 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_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_INS,  KC_HOME, KC_PGUP,
+		KC_KB_MUTE,        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_DEL,  KC_END,  KC_PGDN,
+		KC_KB_VOLUME_UP,   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_BSPC,
+		KC_KB_VOLUME_DOWN, 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_RSFT, KC_RSFT,            KC_UP,
+		KC_PAUSE,          KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_LGUI, MO(1),   KC_RCTL,   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT(
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
+        _______, _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,    _______, _______, _______
+    ),
+    [2] = LAYOUT(
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
+        _______, _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,    _______, _______, _______
+    ),
+    [3] = LAYOUT(
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
+        _______, _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,    _______, _______, _______
+    ),
+};
diff --git a/keyboards/wuque/creek70/keymaps/via/rules.mk b/keyboards/wuque/creek70/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/wuque/creek70/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/wuque/creek70/readme.md b/keyboards/wuque/creek70/readme.md
new file mode 100644
index 0000000000..33c7a5d609
--- /dev/null
+++ b/keyboards/wuque/creek70/readme.md
@@ -0,0 +1,27 @@
+# creek70
+
+More Info at [creek70](https://shop.wuquestudio.com/)
+​
+
+* Keyboard Maintainer: [spbgzh](https://github.com/spbgzh)
+* Hardware Supported: creek 70
+* Hardware Availability: [creek70](https://shop.wuquestudio.com/)  
+​
+
+Make example for this keyboard (after setting up your build environment):  
+
+    make wuque/creek70:default
+
+Flashing example for this keyboard:
+
+    make wuque/creek70:default:flash
+
+## Bootloader
+
+Enter the bootloader using one of the following methods:
+
+* Tap the Reset switch mounted on the PCB
+* In the case of the default keymap, use the key combination Fn + PageUp
+* Hold the Esc key while connecting the USB cable (also erases persistent settings)
+
+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/wuque/creek70/rules.mk b/keyboards/wuque/creek70/rules.mk
new file mode 100644
index 0000000000..69a7faea4a
--- /dev/null
+++ b/keyboards/wuque/creek70/rules.mk
@@ -0,0 +1 @@
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow