From d5862391f4ec2023cf41f931c93775222b919371 Mon Sep 17 00:00:00 2001
From: TyraelWasTaken <96232590+TyraelWasTaken@users.noreply.github.com>
Date: Thu, 27 Jun 2024 04:55:47 +0100
Subject: [PATCH 1/2] Add support for Equanimity (#23965)

* Add Equanimity files

* Update keyboard.json format

* Update readme.md

* CRLF to LF

* Force LF and correct rules.mk

* Remove config.h

* Remove rules.mk

* Update keymap.c

* Update keyboard.json

* Update name in readme.md
---
 .../equanimity/keymaps/via/keymap.c           | 35 +++++++++++++++++++
 .../equanimity/keymaps/via/rules.mk           |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 keyboards/tyraelwastaken/equanimity/keymaps/via/keymap.c
 create mode 100644 keyboards/tyraelwastaken/equanimity/keymaps/via/rules.mk

diff --git a/keyboards/tyraelwastaken/equanimity/keymaps/via/keymap.c b/keyboards/tyraelwastaken/equanimity/keymaps/via/keymap.c
new file mode 100644
index 00000000..7430554f
--- /dev/null
+++ b/keyboards/tyraelwastaken/equanimity/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+// Copyright 2024 TyraelWasTaken (@TyraelWasTaken)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BL,
+    _FL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_BL] = LAYOUT(
+        KC_DELETE, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BACKSPACE,
+        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_LOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENT, KC_MEDIA_PLAY_PAUSE,
+        KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_SPC, MO(_FL), KC_SPC, KC_LALT, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_FL] = LAYOUT(
+        KC_TRNS, KC_GRAVE, 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_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
+    )  
+};
+
+#ifdef ENCODER_MAP_ENABLE
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+        [_BL] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+        [_FL] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    };
+#endif
\ No newline at end of file
diff --git a/keyboards/tyraelwastaken/equanimity/keymaps/via/rules.mk b/keyboards/tyraelwastaken/equanimity/keymaps/via/rules.mk
new file mode 100644
index 00000000..4253f570
--- /dev/null
+++ b/keyboards/tyraelwastaken/equanimity/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file

From 360731c4d6d5df3e2702ec31128c61f94afc2985 Mon Sep 17 00:00:00 2001
From: David Hoelscher <infinityis@users.noreply.github.com>
Date: Wed, 26 Jun 2024 22:56:16 -0500
Subject: [PATCH 2/2] [Keyboard] Add Elysian (#23949)

* adding Elysian

* corrections from zvecr
---
 .../custommk/elysian/keymaps/via/config.h     |  6 ++++++
 .../custommk/elysian/keymaps/via/keymap.c     | 19 +++++++++++++++++++
 .../custommk/elysian/keymaps/via/rules.mk     |  2 ++
 3 files changed, 27 insertions(+)
 create mode 100644 keyboards/custommk/elysian/keymaps/via/config.h
 create mode 100644 keyboards/custommk/elysian/keymaps/via/keymap.c
 create mode 100644 keyboards/custommk/elysian/keymaps/via/rules.mk

diff --git a/keyboards/custommk/elysian/keymaps/via/config.h b/keyboards/custommk/elysian/keymaps/via/config.h
new file mode 100644
index 00000000..c2dca382
--- /dev/null
+++ b/keyboards/custommk/elysian/keymaps/via/config.h
@@ -0,0 +1,6 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_MACRO_COUNT 128
diff --git a/keyboards/custommk/elysian/keymaps/via/keymap.c b/keyboards/custommk/elysian/keymaps/via/keymap.c
new file mode 100644
index 00000000..493a7834
--- /dev/null
+++ b/keyboards/custommk/elysian/keymaps/via/keymap.c
@@ -0,0 +1,19 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC, MO(1),
+        KC_Y,   KC_U, KC_I,     KC_O,   KC_P,
+        KC_H,   KC_J, KC_K,     KC_L,   KC_SCLN,  
+        KC_N,   KC_M, KC_COMMA, KC_DOT, KC_SLASH
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_WH_D, KC_WH_U) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/custommk/elysian/keymaps/via/rules.mk b/keyboards/custommk/elysian/keymaps/via/rules.mk
new file mode 100644
index 00000000..4253f570
--- /dev/null
+++ b/keyboards/custommk/elysian/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file