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

13 files changed, 332 insertions, 0 deletions

diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h
new file mode 100644
index 0000000000..f95013cd72
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/config.h
@@ -0,0 +1,54 @@
+// Copyright 2022 Charue Design
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+// 0x4344 = CD for Charue Design
+#define VENDOR_ID    0x4344
+// 0x5335 = S2 for Sunsetter R2
+#define PRODUCT_ID   0x5335
+// 0x0001 = 1 for Base version
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Charue Design
+#define PRODUCT      Sunsetter R2
+
+/* Key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 17
+
+/* Keyboard Matrix Assignment s*/
+#define MATRIX_ROW_PINS { B3, B2, F4, F5, F6 }
+#define MATRIX_COL_PINS { F0, F1, F7, B1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
+#define UNUSED_PINS { B7 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_CAPS_LOCK_PIN B0
+
+/* RGB */
+#define RGB_DI_PIN E6
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 10
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* 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/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/info.json
new file mode 100644
index 0000000000..dc019f8c03
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/info.json
@@ -0,0 +1,95 @@
+{
+    "keyboard_name": "sunsetter_r2",
+    "url": "https://charue-design.com/collections/sunsetter",
+    "maintainer": "ILWrites",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+              {"x":0, "y":0},
+              {"x":1, "y":0},
+              {"x":2.25, "y":0},
+              {"x":3.25, "y":0},
+              {"x":4.25, "y":0},
+              {"x":5.25, "y":0},
+              {"x":6.25, "y":0},
+              {"x":7.25, "y":0},
+              {"x":8.25, "y":0},
+              {"x":9.25, "y":0},
+              {"x":10.25, "y":0},
+              {"x":11.25, "y":0},
+              {"x":12.25, "y":0},
+              {"x":13.25, "y":0},
+              {"x":14.25, "y":0},
+              {"x":15.25, "y":0},
+              {"x":16.25, "y":0},
+              {"x":17.25, "y":0},
+
+              {"x":0, "y":1},
+              {"x":1, "y":1},
+              {"x":2.25, "y":1, "w":1.5},
+              {"x":3.75, "y":1},
+              {"x":4.75, "y":1},
+              {"x":5.75, "y":1},
+              {"x":6.75, "y":1},
+              {"x":7.75, "y":1},
+              {"x":8.75, "y":1},
+              {"x":9.75, "y":1},
+              {"x":10.75, "y":1},
+              {"x":11.75, "y":1},
+              {"x":12.75, "y":1},
+              {"x":13.75, "y":1},
+              {"x":14.75, "y":1},
+              {"x":15.75, "y":1, "w":1.5},
+              {"x":17.25, "y":1},
+
+              {"x":0, "y":2},
+              {"x":1, "y":2},
+              {"x":2.25, "y":2, "w":1.75},
+              {"x":4, "y":2},
+              {"x":5, "y":2},
+              {"x":6, "y":2},
+              {"x":7, "y":2},
+              {"x":8, "y":2},
+              {"x":9, "y":2},
+              {"x":10, "y":2},
+              {"x":11, "y":2},
+              {"x":12, "y":2},
+              {"x":13, "y":2},
+              {"x":14, "y":2},
+              {"x":15, "y":2, "w":2.25},
+              {"x":17.25, "y":2},
+
+              {"x":0, "y":3},
+              {"x":1, "y":3},
+              {"x":2.25, "y":3, "w":1.25},
+              {"x":3.5, "y":3},
+              {"x":4.5, "y":3},
+              {"x":5.5, "y":3},
+              {"x":6.5, "y":3},
+              {"x":7.5, "y":3},
+              {"x":8.5, "y":3},
+              {"x":9.5, "y":3},
+              {"x":10.5, "y":3},
+              {"x":11.5, "y":3},
+              {"x":12.5, "y":3},
+              {"x":13.5, "y":3},
+              {"x":14.5, "y":3, "w":1.75},
+              {"x":16.25, "y":3},
+              {"x":17.25, "y":3},
+
+              {"x":0, "y":4},
+              {"x":1, "y":4},
+              {"x":2.25, "y":4, "w":1.25},
+              {"x":3.5, "y":4, "w":1.25},
+              {"x":4.75, "y":4, "w":1.25},
+              {"x":6, "y":4, "w":2.25},
+              {"x":8.25, "y":4, "w":1.25},
+              {"x":9.5, "y":4, "w":2.75},
+              {"x":12.25, "y":4},
+              {"x":15.25, "y":4},
+              {"x":16.25, "y":4},
+              {"x":17.25, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c b/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c
new file mode 100644
index 0000000000..bee4854f46
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c
@@ -0,0 +1,33 @@
+// Copyright 2022 Charue Design
+// 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_all(
+      KC_F1, KC_F2,   KC_GESC,  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_GRV, KC_BSPC,   KC_VOLU,
+      KC_F3, KC_F4,     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_VOLD,
+      KC_F5, KC_F6,      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_MUTE,
+      KC_F7, KC_F8,   KC_LSFT, KC_BSLS, 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_MNXT,
+      KC_F9, KC_F10,  KC_LCTRL,   KC_LGUI,   KC_LALT,      KC_SPC,     MO(_FN),        KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [_FN] = LAYOUT_all(
+      KC_F11, KC_F12,  RESET,   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_GRV, KC_BSPC,   KC_VOLU,
+      KC_F13, KC_F14,   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_VOLD,
+      KC_F15, KC_F16,    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_MUTE,
+      KC_F17, KC_F18, KC_LSFT, KC_BSLS, 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_MNXT,
+      RGB_MOD, KC_F20, KC_LCTRL,   KC_LGUI,   KC_LALT,      KC_SPC,     KC_TRNS,       KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
+    )
+};
+
+void keyboard_post_init_user(void) {
+  debug_enable=true;
+  debug_matrix=true;
+}
diff --git a/keyboards/charue/sunsetter_r2/keymaps/debug/readme.md b/keyboards/charue/sunsetter_r2/keymaps/debug/readme.md
new file mode 100644
index 0000000000..e4883ef86f
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/keymaps/debug/readme.md
@@ -0,0 +1 @@
+# The debug keymap for Sunsetter R2
diff --git a/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c b/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f50d8ea822
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2022 Charue Design
+// 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_all(
+      KC_F1, KC_F2,   KC_GESC,  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_GRV, KC_BSPC,   KC_VOLU,
+      KC_F3, KC_F4,     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_VOLD,
+      KC_F5, KC_F6,      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_MUTE,
+      KC_F7, KC_F8,   KC_LSFT, KC_BSLS, 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_MNXT,
+      KC_F9, KC_F10,  KC_LCTRL,   KC_LGUI,   KC_LALT,      KC_SPC,     MO(_FN),        KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [_FN] = LAYOUT_all(
+      KC_F11, KC_F12,  RESET,   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_GRV, KC_BSPC,   KC_VOLU,
+      KC_F13, KC_F14,   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_VOLD,
+      KC_F15, KC_F16,    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_MUTE,
+      KC_F17, KC_F18, KC_LSFT, KC_BSLS, 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_MNXT,
+      RGB_MOD, KC_F20, KC_LCTRL,   KC_LGUI,   KC_LALT,      KC_SPC,     KC_TRNS,       KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
+    )
+};
diff --git a/keyboards/charue/sunsetter_r2/keymaps/default/readme.md b/keyboards/charue/sunsetter_r2/keymaps/default/readme.md
new file mode 100644
index 0000000000..c42ac9da88
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Sunsetter R2
diff --git a/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c b/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..cb84247e42
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+// Copyright 2022 Charue Design
+// 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,
+    _FN0,
+    _FN1,
+    _FN2,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_all(
+      KC_F1, KC_F2,   KC_GESC,  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_GRV, KC_BSPC,   KC_VOLU,
+      KC_F3, KC_F4,     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_VOLD,
+      KC_F5, KC_F6,      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_MUTE,
+      KC_F7, KC_F8,   KC_LSFT, KC_BSLS, 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_MNXT,
+      KC_F9, KC_F10,  KC_LCTRL,   KC_LGUI,   KC_LALT,     MO(_FN0),     KC_SPC,        KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [_FN0] = LAYOUT_all(
+      KC_F11, KC_F12,  RESET,   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_GRV, KC_BSPC,   KC_VOLU,
+      KC_F13, KC_F14,   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_VOLD,
+      KC_F15, KC_F16,    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_MUTE,
+      KC_F17, KC_F18, KC_LSFT, KC_BSLS, 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_MNXT,
+      KC_F19, KC_F20, KC_LCTRL,   KC_LGUI,   KC_LALT,     KC_TRNS,       KC_SPC,       KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [_FN1] = 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_LCTRL,   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_LCTRL,   KC_TRNS,   KC_TRNS,         KC_TRNS,         KC_TRNS,          KC_TRNS,         KC_TRNS,                                 KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/charue/sunsetter_r2/keymaps/via/readme.md b/keyboards/charue/sunsetter_r2/keymaps/via/readme.md
new file mode 100644
index 0000000000..5e3de8d376
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA keymap for Sunsetter R2
diff --git a/keyboards/charue/sunsetter_r2/keymaps/via/rules.mk b/keyboards/charue/sunsetter_r2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/charue/sunsetter_r2/readme.md b/keyboards/charue/sunsetter_r2/readme.md
new file mode 100644
index 0000000000..8bfa046a93
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/readme.md
@@ -0,0 +1,31 @@
+# Sunsetter R2
+
+![Sunsetter R2](https://i.imgur.com/rQRuHRkh.jpeg)
+
+A 65 + 10% F-Key Column Keyboard kit made and sold by Charue Design.
+
+Round 2 includes RGB underglow, new case colors, a hotswap option, and a recessed USB port.
+
+[More info on charue-design.com](https://charue-design.com/)
+
+* Keyboard Maintainer: [ILWrites](https://github.com/PiKeeb)
+* Hardware Supported: [Sunsetter PCB](https://charue-design.com/collections/sunsetter)
+* Hardware Availability: [Charue Design](https://charue-design.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make charue/sunsetter_r2:default
+
+Flashing example for this keyboard:
+
+    make charue/sunsetter_r2: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 `RESET` if it is available
diff --git a/keyboards/charue/sunsetter_r2/rules.mk b/keyboards/charue/sunsetter_r2/rules.mk
new file mode 100644
index 0000000000..0edc71f6e9
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/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 = yes         # Console for debug
+COMMAND_ENABLE = yes         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/charue/sunsetter_r2/sunsetter_r2.c b/keyboards/charue/sunsetter_r2/sunsetter_r2.c
new file mode 100644
index 0000000000..86b75fdd18
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/sunsetter_r2.c
@@ -0,0 +1,4 @@
+// Copyright 2022 Charue Design
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "sunsetter_r2.h"
diff --git a/keyboards/charue/sunsetter_r2/sunsetter_r2.h b/keyboards/charue/sunsetter_r2/sunsetter_r2.h
new file mode 100644
index 0000000000..42536fd28f
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/sunsetter_r2.h
@@ -0,0 +1,20 @@
+// Copyright 2022 Charue Design
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    k00, k01,   k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k1g, \
+    k10, k11,    k12,   k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,  k1f,  k2f, \
+    k20, k21,     k22,   k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,    k2e,    k3f, \
+    k30, k31,    k32,  k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,   k3e,  k3g, k4g, \
+    k40, k41,    k42,   k43,   k44,   k45,   k48,      k4a,  k4c,                k4d, k4e, k4f  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06,   k07,   k08, k09,   k0a, k0b,   k0c, k0d, k0e, k0f, k0g   }, \
+    { k10, k11, k12, k13, k14, k15, k16,   k17,   k18, k19,   k1a, k1b,   k1c, k1d, k1e, k1f, k1g   }, \
+    { k20, k21, k22, k23, k24, k25, k26,   k27,   k28, k29,   k2a, k2b,   k2c, k2d, k2e, k2f, KC_NO }, \
+    { k30, k31, k32, k33, k34, k35, k36,   k37,   k38, k39,   k3a, k3b,   k3c, k3d, k3e, k3f, k3g   }, \
+    { k40, k41, k42, k43, k44, k45, KC_NO, KC_NO, k48, KC_NO, k4a, KC_NO, k4c, k4d, k4e, k4f, k4g   }  \
+}