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

10 files changed, 416 insertions, 0 deletions

diff --git a/keyboards/noxary/valhalla_v2/config.h b/keyboards/noxary/valhalla_v2/config.h
new file mode 100644
index 0000000000..627429a6f2
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/config.h
@@ -0,0 +1,22 @@
+/*
+Copyright 2023 Gondolindrim <gondolindrim@acheronproject.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 2
+#define BACKLIGHT_PAL_MODE 2
diff --git a/keyboards/noxary/valhalla_v2/halconf.h b/keyboards/noxary/valhalla_v2/halconf.h
new file mode 100644
index 0000000000..1251bb13ac
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Gondolindrim <gondolindrim@acheronproject.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 HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/noxary/valhalla_v2/info.json b/keyboards/noxary/valhalla_v2/info.json
new file mode 100644
index 0000000000..671bd0b775
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/info.json
@@ -0,0 +1,223 @@
+{
+    "keyboard_name": "Valhalla V2",
+    "manufacturer": "Noxary",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x4E58",
+        "pid": "0x5649",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C5" , "C4" , "A6" , "A5" , "A4" , "A3" , "B8" , "C2" , "C1" , "C0" , "B4" , "B3" , "D2" , "C12", "C11"],
+        "rows": ["B1" , "B10", "A2" , "A1" , "B0" , "A15", "C10", "B9" , "C3" , "A0"]
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey":  true,
+        "extrakey":  true,
+        "console":   false,
+        "backlight": true,
+        "nkro":      true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "build": {
+        "lto": true
+    },
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "embedded_flash",
+            "backing_size": 4096
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "backlight": {
+        "as_caps_lock": true,
+        "driver": "pwm",
+        "levels": 20,
+        "pin": "A7"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "6", "matrix": [4, 5], "x": 6, "y": 0},
+                {"label": "7", "matrix": [5, 6], "x": 9, "y": 0},
+                {"label": "8", "matrix": [5, 7], "x": 10, "y": 0},
+                {"label": "9", "matrix": [5, 8], "x": 11, "y": 0},
+                {"label": "0", "matrix": [5, 9], "x": 12, "y": 0},
+                {"label": "-", "matrix": [5, 10], "x": 13, "y": 0},
+                {"label": "=", "matrix": [5, 11], "x": 14, "y": 0},
+                {"label": "Backspace", "matrix": [5, 12], "x": 15, "y": 0},
+                {"label": "Backspace", "matrix": [5, 13], "x": 16, "y": 0},
+                {"label": "Delete", "matrix": [8, 14], "x": 17, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"label": "Y", "matrix": [6, 6], "x": 8.5, "y": 1},
+                {"label": "U", "matrix": [6, 7], "x": 9.5, "y": 1},
+                {"label": "I", "matrix": [6, 8], "x": 10.5, "y": 1},
+                {"label": "O", "matrix": [6, 9], "x": 11.5, "y": 1},
+                {"label": "P", "matrix": [6, 10], "x": 12.5, "y": 1},
+                {"label": "[", "matrix": [6, 11], "x": 13.5, "y": 1},
+                {"label": "]", "matrix": [6, 12], "x": 14.5, "y": 1},
+                {"label": "\\", "matrix": [6, 13], "x": 15.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [6, 14], "x": 17, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"label": "H", "matrix": [7, 6], "x": 8.75, "y": 2},
+                {"label": "J", "matrix": [7, 7], "x": 9.75, "y": 2},
+                {"label": "K", "matrix": [7, 8], "x": 10.75, "y": 2},
+                {"label": "L", "matrix": [7, 9], "x": 11.75, "y": 2},
+                {"label": ";", "matrix": [7, 10], "x": 12.75, "y": 2},
+                {"label": "'", "matrix": [7, 11], "x": 13.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 12], "x": 14.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [7, 14], "x": 17, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"label": "B", "matrix": [8, 6], "x": 8.25, "y": 3},
+                {"label": "N", "matrix": [8, 7], "x": 9.25, "y": 3},
+                {"label": "M", "matrix": [8, 8], "x": 10.25, "y": 3},
+                {"label": ",", "matrix": [8, 9], "x": 11.25, "y": 3},
+                {"label": ".", "matrix": [8, 10], "x": 12.25, "y": 3},
+                {"label": "/", "matrix": [8, 11], "x": 13.25, "y": 3},
+                {"label": "Shift", "matrix": [8, 12], "x": 14.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [8, 13], "x": 16, "y": 3},
+                {"label": "Fn", "matrix": [9, 14], "x": 17, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.75},
+                {"label": "Space", "matrix": [4, 4], "x": 5.75, "y": 4},
+
+                {"label": "Space", "matrix": [9, 6], "x": 8, "y": 4},
+                {"label": "Space", "matrix": [9, 7], "x": 9, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 8], "x": 10.25, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [9, 9], "x": 11.75, "y": 4},
+                {"label": "Ctrl", "matrix": [9, 10], "x": 12.75, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [9, 11], "x": 15, "y": 4},
+                {"label": "\u2193", "matrix": [9, 12], "x": 16, "y": 4},
+                {"label": "\u2192", "matrix": [9, 13], "x": 17, "y": 4}
+            ]
+        },
+        "LAYOUT_full_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "6", "matrix": [4, 5], "x": 6, "y": 0},
+                {"label": "7", "matrix": [5, 6], "x": 9, "y": 0},
+                {"label": "8", "matrix": [5, 7], "x": 10, "y": 0},
+                {"label": "9", "matrix": [5, 8], "x": 11, "y": 0},
+                {"label": "0", "matrix": [5, 9], "x": 12, "y": 0},
+                {"label": "-", "matrix": [5, 10], "x": 13, "y": 0},
+                {"label": "=", "matrix": [5, 11], "x": 14, "y": 0},
+                {"label": "Backspace", "matrix": [5, 12], "x": 15, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [8, 14], "x": 17, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"label": "Y", "matrix": [6, 6], "x": 8.5, "y": 1},
+                {"label": "U", "matrix": [6, 7], "x": 9.5, "y": 1},
+                {"label": "I", "matrix": [6, 8], "x": 10.5, "y": 1},
+                {"label": "O", "matrix": [6, 9], "x": 11.5, "y": 1},
+                {"label": "P", "matrix": [6, 10], "x": 12.5, "y": 1},
+                {"label": "[", "matrix": [6, 11], "x": 13.5, "y": 1},
+                {"label": "]", "matrix": [6, 12], "x": 14.5, "y": 1},
+                {"label": "\\", "matrix": [6, 13], "x": 15.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [6, 14], "x": 17, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"label": "H", "matrix": [7, 6], "x": 8.75, "y": 2},
+                {"label": "J", "matrix": [7, 7], "x": 9.75, "y": 2},
+                {"label": "K", "matrix": [7, 8], "x": 10.75, "y": 2},
+                {"label": "L", "matrix": [7, 9], "x": 11.75, "y": 2},
+                {"label": ";", "matrix": [7, 10], "x": 12.75, "y": 2},
+                {"label": "'", "matrix": [7, 11], "x": 13.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 12], "x": 14.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [7, 14], "x": 17, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"label": "B", "matrix": [8, 6], "x": 8.25, "y": 3},
+                {"label": "N", "matrix": [8, 7], "x": 9.25, "y": 3},
+                {"label": "M", "matrix": [8, 8], "x": 10.25, "y": 3},
+                {"label": ",", "matrix": [8, 9], "x": 11.25, "y": 3},
+                {"label": ".", "matrix": [8, 10], "x": 12.25, "y": 3},
+                {"label": "/", "matrix": [8, 11], "x": 13.25, "y": 3},
+                {"label": "Shift", "matrix": [8, 12], "x": 14.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [8, 13], "x": 16, "y": 3},
+                {"label": "Fn", "matrix": [9, 14], "x": 17, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.75},
+                {"label": "Space", "matrix": [4, 4], "x": 5.75, "y": 4},
+
+                {"label": "Space", "matrix": [9, 6], "x": 8, "y": 4},
+                {"label": "Space", "matrix": [9, 7], "x": 9, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 8], "x": 10.25, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [9, 9], "x": 11.75, "y": 4},
+                {"label": "Ctrl", "matrix": [9, 10], "x": 12.75, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [9, 11], "x": 15, "y": 4},
+                {"label": "\u2193", "matrix": [9, 12], "x": 16, "y": 4},
+                {"label": "\u2192", "matrix": [9, 13], "x": 17, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c b/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c
new file mode 100755
index 0000000000..02272b9290
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2023 Gondolindrim <gondolindrim@acheronproject.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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        QK_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_BSPC, KC_BSPC, KC_DEL ,
+        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, 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_PGDN,
+        KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP,   MO(1)  ,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        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_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, 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/noxary/valhalla_v2/keymaps/via/keymap.c b/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c
new file mode 100755
index 0000000000..02272b9290
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2023 Gondolindrim <gondolindrim@acheronproject.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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        QK_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_BSPC, KC_BSPC, KC_DEL ,
+        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, 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_PGDN,
+        KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP,   MO(1)  ,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        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_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, 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/noxary/valhalla_v2/keymaps/via/rules.mk b/keyboards/noxary/valhalla_v2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/noxary/valhalla_v2/matrix_diagram.md b/keyboards/noxary/valhalla_v2/matrix_diagram.md
new file mode 100644
index 0000000000..895960ed96
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Noxary Valhalla V2
+
+```
+                                                            ┌───────┐
+                                               2u Backspace │5C     │
+                                                            └───────┘
+┌───┬───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │45 │       │56 │57 │58 │59 │5A │5B │5C │5D │8E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│10   │11 │12 │13 │14 │15 │       │66 │67 │68 │69 │6A │6B │6C │6D   │6E │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐      └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│20    │21 │22 │23 │24 │25 │       │76 │77 │78 │79 │7A │7B │7C      │7E │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐   ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│30      │31 │32 │33 │34 │35 │   │86 │87 │88 │89 │8A │8B │8C    │8D │8E │
+├─────┬──┴┬──┴──┬┴───┴─┬─┴─┬─┘  ┌┴──┬┴───┼───┴─┬─┴─┬─┴───┼──┬───┼───┼───┤
+│40   │41 │42   │43    │44 │    │96 │97  │98   │99 │9A   │  │9B │9C │9D │
+└─────┴───┴─────┴──────┴───┘    └───┴────┴─────┴───┴─────┘  └───┴───┴───┘
+          2.75u ┌──────────┐    ┌────────┐ 2.25u
+     Left Space │44        │    │97      │ Right Space
+                └──────────┘    └────────┘
+```
diff --git a/keyboards/noxary/valhalla_v2/mcuconf.h b/keyboards/noxary/valhalla_v2/mcuconf.h
new file mode 100644
index 0000000000..caa959ced7
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/mcuconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2023 Gondolindrim <gondolindrim@acheronproject.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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/acheron/arctic/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
diff --git a/keyboards/noxary/valhalla_v2/readme.md b/keyboards/noxary/valhalla_v2/readme.md
new file mode 100644
index 0000000000..afd2dffd60
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/readme.md
@@ -0,0 +1,32 @@
+# Noxary Valhalla V2
+
+![valhalla](https://imgur.com/281HMjnh.jpg)
+
+An ergonomic 65% by Noxary
+
+* Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim)
+* Hardware Supported: proprietary PCB
+* Hardware Availability: group buy ran by Gondolindrim. Closed in february 22, 2024.
+
+
+## How to flash
+
+### Enter bootloader
+
+The DFU state in the bootloader can be accessed 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**: press the button on the front of the PCB, next to caps lock, for at least five seconds
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+## Compile firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+    make noxary/valhalla_v2:default
+
+To directly flash the PCB after it is put into a DFU state, use
+
+    make noxary/valhalla_v2: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).
diff --git a/keyboards/noxary/valhalla_v2/rules.mk b/keyboards/noxary/valhalla_v2/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank