Merge upstream master to 2022 Q4 breaking change

9 files changed, 0 insertions, 372 deletions

diff --git a/keyboards/cannonkeys/serenity/config.h b/keyboards/cannonkeys/serenity/config.h
deleted file mode 100644
index 4b06e24a1c..0000000000
--- a/keyboards/cannonkeys/serenity/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-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 BACKLIGHT_PWM_DRIVER    PWMD3
-#define BACKLIGHT_PWM_CHANNEL   1
-#define BACKLIGHT_PAL_MODE      1
-
-#define WS2812_SPI SPID2
-#define WS2812_SPI_MOSI_PAL_MODE 0
-#define WS2812_SPI_SCK_PAL_MODE 0
-#define WS2812_SPI_SCK_PIN B13
diff --git a/keyboards/cannonkeys/serenity/halconf.h b/keyboards/cannonkeys/serenity/halconf.h
deleted file mode 100644
index 7a5b2d4de4..0000000000
--- a/keyboards/cannonkeys/serenity/halconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/cannonkeys/devastatingtkl/halconf.h -r platforms/chibios/common/configs/halconf.h`
- */
-
-#pragma once
-
-#define HAL_USE_PWM TRUE
-
-#define HAL_USE_SPI TRUE
-
-#include_next <halconf.h>
-
diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json
deleted file mode 100644
index 281defab6e..0000000000
--- a/keyboards/cannonkeys/serenity/info.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-    "manufacturer": "Cannon Keys",
-    "keyboard_name": "Serenity",
-    "usb": {
-        "vid": "0xCA04",
-        "pid": "0x0017",
-        "device_version": "0.0.1"
-    },
-    "url": "https://cannonkeys.com",
-    "maintainer": "awkannan",
-    "bootloader": "stm32-dfu",
-    "processor": "STM32F072",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "backlight": true,
-        "rgblight": true
-    },
-    "debounce": 5,
-    "matrix_pins": {
-        "cols": ["B1", "B2", "B10", "B11", "B12", "B14", "A8", "A9", "A10", "A3", "B0", "A2", "A1", "A7", "A0", "B4", "B6", "B7"],
-        "rows": ["A15", "B3", "B5", "A4", "A5", "F1"]
-    },
-    "backlight": {
-        "breathing": true,
-        "breathing_period": 5,
-        "levels": 15,
-        "pin": "A6"
-    },
-    "rgblight": {
-        "led_count": 12,
-        "pin": "B15",
-        "hue_steps": 24,
-        "saturation_steps": 16,
-        "brightness_steps": 16,
-        "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
-        }
-    },
-    "indicators": {
-        "caps_lock": "B9",
-        "scroll_lock": "F0",
-        "on_state": 0
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0.0 },
-                { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0.0 },
-                { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0.0 },
-                { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0.0 },
-                { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0.0 },
-                { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0.0 },
-                { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0.0 },
-                { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0.0 },
-                { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0.0 },
-                { "label": "F13", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
-                { "label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0.0 },
-                { "label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0.0 },
-                { "label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0.0 },
-                { "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "label": "Bksp", "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "label": "Del", "matrix": [1, 14], "x": 14.0, "y": 1.25 },
-                { "label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25 },
-                { "label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25 },
-                { "label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.25 },
-                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
-                { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
-                { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
-                { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
-                { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
-                { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
-                { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
-                { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
-                { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
-                { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
-                { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
-                { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
-                { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
-                { "label": "|", "matrix": [2, 14], "w": 1.5, "x": 13.5, "y": 2.25 },
-                { "label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25 },
-                { "label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25 },
-                { "label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.25 },
-                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
-                { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
-                { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
-                { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
-                { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
-                { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
-                { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
-                { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
-                { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
-                { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
-                { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
-                { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
-                { "label": "|", "matrix": [3, 12], "x": 12.75, "y": 3.25 },
-                { "label": "Enter", "matrix": [3, 14], "w": 1.25, "x": 13.75, "y": 3.25 },
-                { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
-                { "label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.25 },
-                { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
-                { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
-                { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25 },
-                { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25 },
-                { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25 },
-                { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25 },
-                { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25 },
-                { "label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.25 },
-                { "label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.25 },
-                { "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "matrix": [4, 12], "w": 1.75, "x": 14.75, "y": 4.25 },
-                { "label": "Fn", "matrix": [4, 14], "x": 16.5, "y": 4.25 },
-                { "label": "\u2191", "matrix": [4, 16], "x": 18.75, "y": 4.25 },
-                { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
-                { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
-                { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
-                { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "label": "Alt", "matrix": [5, 10], "w": 1.25, "x": 10.0, "y": 5.25 },
-                { "label": "Fn", "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
-                { "label": "Win", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
-                { "label": "Ctrl", "matrix": [5, 14], "w": 1.25, "x": 13.75, "y": 5.25 },
-                { "label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 }
-            ]
-        }
-    }
-}
diff --git a/keyboards/cannonkeys/serenity/keymaps/default/keymap.c b/keyboards/cannonkeys/serenity/keymaps/default/keymap.c
deleted file mode 100644
index f142a629dc..0000000000
--- a/keyboards/cannonkeys/serenity/keymaps/default/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-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,
-    _FN1
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BASE] = LAYOUT_all(
-    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_MPLY,                    KC_PSCR, KC_SCRL, KC_PAUS,
-    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_INS,  KC_HOME, KC_PGUP,
-    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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_TRNS,                          KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  MO(1),      KC_RGUI,    KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT),
-
-  [_FN1] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
-    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_VOLU,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_MPLY, KC_MNXT, KC_VOLD,
-    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/cannonkeys/serenity/keymaps/via/keymap.c b/keyboards/cannonkeys/serenity/keymaps/via/keymap.c
deleted file mode 100644
index bd79ecc05f..0000000000
--- a/keyboards/cannonkeys/serenity/keymaps/via/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-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,
-    _FN1,
-    _FN2,
-    _FN3
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BASE] = LAYOUT_all(
-    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_MPLY,               KC_PSCR, KC_SCRL, KC_PAUS,
-    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_INS,  KC_HOME, KC_PGUP,
-    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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_TRNS,                        KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT),
-
-  [_FN1] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
-    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_VOLU,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_MPLY, KC_MNXT, KC_VOLD,
-    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),
-
-  [_FN2] = LAYOUT_all(
-    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,
-    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),
-
-  [_FN3] = LAYOUT_all(
-    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,
-    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/cannonkeys/serenity/keymaps/via/rules.mk b/keyboards/cannonkeys/serenity/keymaps/via/rules.mk
deleted file mode 100644
index 1e5b99807c..0000000000
--- a/keyboards/cannonkeys/serenity/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/serenity/mcuconf.h b/keyboards/cannonkeys/serenity/mcuconf.h
deleted file mode 100644
index d0920a6660..0000000000
--- a/keyboards/cannonkeys/serenity/mcuconf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/cannonkeys/devastatingtkl/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef STM32_PWM_USE_TIM3
-#define STM32_PWM_USE_TIM3 TRUE
-
-#undef STM32_SPI_USE_SPI2
-#define STM32_SPI_USE_SPI2 TRUE
-
diff --git a/keyboards/cannonkeys/serenity/readme.md b/keyboards/cannonkeys/serenity/readme.md
deleted file mode 100644
index 730fa084c9..0000000000
--- a/keyboards/cannonkeys/serenity/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Serenity
-
-A calming F13 TKL from HoodrowThrillson
-
-* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
-* Hardware Supported: STM32F072CBT6
-* Hardware Availability: [CannonKeys](https://cannonkeys.com)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make cannonkeys/serenity:default
-
-Flashing example for this keyboard:
-
-    make cannonkeys/serenity: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**: Swap the boot switch on the back of the PCB to "1" and hit the reset button
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/cannonkeys/serenity/rules.mk b/keyboards/cannonkeys/serenity/rules.mk
deleted file mode 100644
index 0ab54aaaf7..0000000000
--- a/keyboards/cannonkeys/serenity/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Wildcard to allow APM32 MCU
-DFU_SUFFIX_ARGS = -v FFFF -p FFFF