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

6 files changed, 246 insertions, 0 deletions

diff --git a/keyboards/chickenman/ciel65/info.json b/keyboards/chickenman/ciel65/info.json
new file mode 100644
index 0000000000..648a60e030
--- /dev/null
+++ b/keyboards/chickenman/ciel65/info.json
@@ -0,0 +1,125 @@
+{
+    "keyboard_name": "Ciel65",
+    "manufacturer": "ChickenMan",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xC41C",
+        "pid": "0x0002",
+        "device_version": "1.0.0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "rows": ["E6", "B7", "F7", "F4", "F5"],
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "backlight": false,
+        "rgblight": true,
+        "audio": false,
+        "key_lock": false
+    },
+    "rgblight": {
+        "pin": "F0",
+        "led_count": 14,
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "max_brightness": 255,
+        "sleep": true,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "K00 (E6,F6)", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01 (E6,B0)", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02 (E6,F1)", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03 (E6,C7)", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04 (E6,C6)", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05 (E6,B6)", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06 (E6,B5)", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07 (E6,B4)", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08 (E6,D7)", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09 (E6,D6)", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A (E6,D4)", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B (E6,D5)", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C (E6,D3)", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D (E6,D2)", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E (E6,D1)", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K0F (E6,D0)", "matrix": [0, 15], "x": 15, "y": 0},
+                {"label": "K10 (B7,F6)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11 (B7,B0)", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12 (B7,F1)", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13 (B7,C7)", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14 (B7,C6)", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15 (B7,B6)", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16 (B7,B5)", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17 (B7,B4)", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18 (B7,D7)", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19 (B7,D6)", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A (B7,D4)", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B (B7,D5)", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C (B7,D3)", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D (B7,D2)", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "K1F (B7,D0)", "matrix": [1, 15], "x": 15, "y": 1},
+                {"label": "K20 (F7,F6)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21 (F7,B0)", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22 (F7,F1)", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23 (F7,C7)", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24 (F7,C6)", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25 (F7,B6)", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26 (F7,B5)", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27 (F7,B4)", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28 (F7,D7)", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29 (F7,D6)", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A (F7,D4)", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B (F7,D5)", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2D (F7,D2)", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "K2F (F7,D0)", "matrix": [2, 15], "x": 15, "y": 2},
+                {"label": "K30 (F4,F6)", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32 (F4,F1)", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33 (F4,C7)", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34 (F4,C6)", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35 (F4,B6)", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36 (F4,B5)", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37 (F4,B4)", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38 (F4,D7)", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39 (F4,D6)", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A (F4,D4)", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B (F4,D5)", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C (F4,D3)", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D (F4,D2)", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "K3F (F4,D0)", "matrix": [3, 15], "x": 15, "y": 3},
+                {"label": "K40 (F5,F6)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41 (F5,B0)", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42 (F5,F1)", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46 (F5,B5)", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K49 (F5,D6)", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4A (F5,D4)", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C (F5,D3)", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "K4D (F5,D2)", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4F (F5,D0)", "matrix": [4, 15], "x": 15, "y": 4}
+           ]
+        }
+    },
+}
diff --git a/keyboards/chickenman/ciel65/keymaps/default/keymap.c b/keyboards/chickenman/ciel65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..25142bac15
--- /dev/null
+++ b/keyboards/chickenman/ciel65/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2023 ChickenMan
+ *
+ * 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 layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_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_BSLS, KC_GRV,  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_BSPC, KC_END,  
+        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_PGUP, 
+        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_PGDN, 
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT(
+        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,  _______, KC_INS,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,          KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/chickenman/ciel65/keymaps/via/keymap.c b/keyboards/chickenman/ciel65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9cf5426447
--- /dev/null
+++ b/keyboards/chickenman/ciel65/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2023 ChickenMan
+ *
+ * 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 layer_names {
+    _L0,
+    _L1,
+    _L2,
+    _L3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_L0] = 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_BSLS, KC_GRV,  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_BSPC, KC_END,  
+        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_PGUP, 
+        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_PGDN, 
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_L1] = LAYOUT(
+        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,  _______, KC_INS,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,          KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______
+    ),
+    [_L2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______
+    ),
+    [_L3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/chickenman/ciel65/keymaps/via/rules.mk b/keyboards/chickenman/ciel65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/chickenman/ciel65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/chickenman/ciel65/readme.md b/keyboards/chickenman/ciel65/readme.md
new file mode 100644
index 0000000000..49d4840e6c
--- /dev/null
+++ b/keyboards/chickenman/ciel65/readme.md
@@ -0,0 +1,27 @@
+# Ciel65
+
+![Ciel65](https://i.imgur.com/CSOaQRph.jpeg)
+
+A simple 65% keyboard based of the Bakeneko 65, originially made by Katano.
+
+* Keyboard Maintainer: [ChickenMan](https://github.com/chickenman112)
+* Hardware Supported: Ciel65 HS and Solder pcb
+* Hardware Availability: [To be opensourced soon](https://github.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make chickenman/ciel65:default
+
+Flashing example for this keyboard:
+
+    make chickenman/ciel65:default:flash
+
+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).
+
+## 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 - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/chickenman/ciel65/rules.mk b/keyboards/chickenman/ciel65/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/chickenman/ciel65/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file