From 905505ab51f258072126d2d9b77930bb396e6ccd Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Wed, 17 Jan 2024 20:33:14 -0300 Subject: [PATCH 1/9] Add Valhalla V2 PCB support --- keyboards/noxary/valhalla_v2/config.h | 43 ++++ keyboards/noxary/valhalla_v2/halconf.h | 21 ++ keyboards/noxary/valhalla_v2/info.json | 219 ++++++++++++++++++ .../valhalla_v2/keymaps/default/keymap.c | 48 ++++ .../noxary/valhalla_v2/keymaps/via/keymap.c | 48 ++++ .../noxary/valhalla_v2/keymaps/via/rules.mk | 1 + .../noxary/valhalla_v2/matrix_diagram.md | 21 ++ keyboards/noxary/valhalla_v2/mcuconf.h | 27 +++ keyboards/noxary/valhalla_v2/readme.md | 32 +++ keyboards/noxary/valhalla_v2/rules.mk | 1 + 10 files changed, 461 insertions(+) create mode 100644 keyboards/noxary/valhalla_v2/config.h create mode 100644 keyboards/noxary/valhalla_v2/halconf.h create mode 100644 keyboards/noxary/valhalla_v2/info.json create mode 100755 keyboards/noxary/valhalla_v2/keymaps/default/keymap.c create mode 100755 keyboards/noxary/valhalla_v2/keymaps/via/keymap.c create mode 100644 keyboards/noxary/valhalla_v2/keymaps/via/rules.mk create mode 100644 keyboards/noxary/valhalla_v2/matrix_diagram.md create mode 100644 keyboards/noxary/valhalla_v2/mcuconf.h create mode 100644 keyboards/noxary/valhalla_v2/readme.md create mode 100644 keyboards/noxary/valhalla_v2/rules.mk diff --git a/keyboards/noxary/valhalla_v2/config.h b/keyboards/noxary/valhalla_v2/config.h new file mode 100644 index 000000000000..e2b538f0ba26 --- /dev/null +++ b/keyboards/noxary/valhalla_v2/config.h @@ -0,0 +1,43 @@ +/* +Copyright 2015 Álvaro "Gondolindrim" Volpato + +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 . +*/ + +#pragma once + +#define BACKLIGHT_PWM_DRIVER PWMD3 +#define BACKLIGHT_PWM_CHANNEL 2 +#define BACKLIGHT_PAL_MODE 2 + +/* 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 + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/noxary/valhalla_v2/halconf.h b/keyboards/noxary/valhalla_v2/halconf.h new file mode 100644 index 000000000000..612ce4fc4a8f --- /dev/null +++ b/keyboards/noxary/valhalla_v2/halconf.h @@ -0,0 +1,21 @@ +/* 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 . + */ + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/noxary/valhalla_v2/info.json b/keyboards/noxary/valhalla_v2/info.json new file mode 100644 index 000000000000..b259de7c6cb3 --- /dev/null +++ b/keyboards/noxary/valhalla_v2/info.json @@ -0,0 +1,219 @@ +{ + "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": false, + "extrakey": false, + "console": false, + "backlight": true, + "nkro": true + }, + "build": { + "lto": true + }, + "eeprom": { + "driver": "wear_leveling", + "wear_leveling": { + "driver": "embedded_flash", + "backing_size": 4096, + "logical_size": 2048 + } + }, + "diode_direction": "COL2ROW", + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "backlight": { + "as_caps_lock": true, + "breathing": false, + "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 000000000000..88330acf5c1f --- /dev/null +++ b/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c @@ -0,0 +1,48 @@ +/* +Copyright 2012,2013 Jun Wako + +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 . +*/ +#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 + ), + [2] = 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 + ), + [3] = 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 + ) +}; 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 000000000000..88330acf5c1f --- /dev/null +++ b/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* +Copyright 2012,2013 Jun Wako + +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 . +*/ +#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 + ), + [2] = 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 + ), + [3] = 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 + ) +}; 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 000000000000..1e5b99807cb7 --- /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 000000000000..74d3206a0054 --- /dev/null +++ b/keyboards/noxary/valhalla_v2/matrix_diagram.md @@ -0,0 +1,21 @@ +# Matrix Diagram for Noxary Valhalla + +``` + ┌───────┐ + 2u Backspace │0D │ + └───────┘ +┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │06 │ │07 │08 │09 │0A │0B │0C │0D │0E │2E │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ +│10 │11 │12 │13 │14 │15 │ │16 │17 │18 │19 │1A │1B │1C │1D │1E │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ +│20 │21 │22 │23 │24 │25 │ │26 │27 │28 │29 │2A │2B │2C │2D │ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ +│30 │31 │32 │33 │34 │35 │ │36 │37 │38 │39 │3A │3B │3C │3D │3E │ +├─────┬──┴┬──┴──┬┴───┴─┬─┴─┬─┘ ┌┴──┬┴───┼───┴─┬─┴─┬─┴───┼──┬───┼───┼───┤ +│40 │41 │42 │43 │44 │ │45 │46 │47 │48 │49 │ │4C │4D │4E │ +└─────┴───┴─────┴──────┴───┘ └───┴────┴─────┴───┴─────┘ └───┴───┴───┘ + 2.75u ┌──────────┐ ┌────────┐ 2.25u + Left Space │44 │ │46 │ Right Space + └──────────┘ └────────┘ +``` diff --git a/keyboards/noxary/valhalla_v2/mcuconf.h b/keyboards/noxary/valhalla_v2/mcuconf.h new file mode 100644 index 000000000000..4ff4af80c0d6 --- /dev/null +++ b/keyboards/noxary/valhalla_v2/mcuconf.h @@ -0,0 +1,27 @@ +/* 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 . + */ + +/* + * 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 + +#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 000000000000..36e3403daed0 --- /dev/null +++ b/keyboards/noxary/valhalla_v2/readme.md @@ -0,0 +1,32 @@ +# Noxary Valhalla + +![valhalla](https://cdn.shopify.com/s/files/1/0071/6377/3043/products/BG_AngleL_a247224d-f9ca-4093-b0de-df776e34b02d_900x.jpg?v=1598742611) + +An ergonomic 65% by Noxary + +* Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim) +* Hardware Supported: proprietary PCB +* Hardware Availability: [Noxary](https://noxary.co/collections/valhalla). As of november 17, the group buy has ended. + + +## 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:default + +To directly flash the PCB after it is put into a DFU state, use + + make noxary/valhalla: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 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/noxary/valhalla_v2/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 9a3226684da180d5db924c03c7920dd6e3343e3a Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Wed, 17 Jan 2024 20:38:57 -0300 Subject: [PATCH 2/9] Correct README and matrix diagram --- keyboards/noxary/valhalla_v2/matrix_diagram.md | 16 ++++++++-------- keyboards/noxary/valhalla_v2/readme.md | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/noxary/valhalla_v2/matrix_diagram.md b/keyboards/noxary/valhalla_v2/matrix_diagram.md index 74d3206a0054..895960ed9697 100644 --- a/keyboards/noxary/valhalla_v2/matrix_diagram.md +++ b/keyboards/noxary/valhalla_v2/matrix_diagram.md @@ -1,21 +1,21 @@ -# Matrix Diagram for Noxary Valhalla +# Matrix Diagram for Noxary Valhalla V2 ``` ┌───────┐ - 2u Backspace │0D │ + 2u Backspace │5C │ └───────┘ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┐ -│00 │01 │02 │03 │04 │05 │06 │ │07 │08 │09 │0A │0B │0C │0D │0E │2E │ +│00 │01 │02 │03 │04 │05 │45 │ │56 │57 │58 │59 │5A │5B │5C │5D │8E │ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ -│10 │11 │12 │13 │14 │15 │ │16 │17 │18 │19 │1A │1B │1C │1D │1E │ +│10 │11 │12 │13 │14 │15 │ │66 │67 │68 │69 │6A │6B │6C │6D │6E │ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ -│20 │21 │22 │23 │24 │25 │ │26 │27 │28 │29 │2A │2B │2C │2D │ +│20 │21 │22 │23 │24 │25 │ │76 │77 │78 │79 │7A │7B │7C │7E │ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ -│30 │31 │32 │33 │34 │35 │ │36 │37 │38 │39 │3A │3B │3C │3D │3E │ +│30 │31 │32 │33 │34 │35 │ │86 │87 │88 │89 │8A │8B │8C │8D │8E │ ├─────┬──┴┬──┴──┬┴───┴─┬─┴─┬─┘ ┌┴──┬┴───┼───┴─┬─┴─┬─┴───┼──┬───┼───┼───┤ -│40 │41 │42 │43 │44 │ │45 │46 │47 │48 │49 │ │4C │4D │4E │ +│40 │41 │42 │43 │44 │ │96 │97 │98 │99 │9A │ │9B │9C │9D │ └─────┴───┴─────┴──────┴───┘ └───┴────┴─────┴───┴─────┘ └───┴───┴───┘ 2.75u ┌──────────┐ ┌────────┐ 2.25u - Left Space │44 │ │46 │ Right Space + Left Space │44 │ │97 │ Right Space └──────────┘ └────────┘ ``` diff --git a/keyboards/noxary/valhalla_v2/readme.md b/keyboards/noxary/valhalla_v2/readme.md index 36e3403daed0..c91aafc8e1a4 100644 --- a/keyboards/noxary/valhalla_v2/readme.md +++ b/keyboards/noxary/valhalla_v2/readme.md @@ -1,4 +1,4 @@ -# Noxary Valhalla +# Noxary Valhalla V2 ![valhalla](https://cdn.shopify.com/s/files/1/0071/6377/3043/products/BG_AngleL_a247224d-f9ca-4093-b0de-df776e34b02d_900x.jpg?v=1598742611) @@ -6,7 +6,7 @@ An ergonomic 65% by Noxary * Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim) * Hardware Supported: proprietary PCB -* Hardware Availability: [Noxary](https://noxary.co/collections/valhalla). As of november 17, the group buy has ended. +* Hardware Availability: group buy ran by Gondolindrim. Closed in february 22, 2024. ## How to flash @@ -23,10 +23,10 @@ The DFU state in the bootloader can be accessed in 3 ways: Make example for this keyboard (after setting up your build environment): - make noxary/valhalla:default + make noxary/valhalla_v2:default To directly flash the PCB after it is put into a DFU state, use - make noxary/valhalla:default:flash + 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). From 07516c57f2b4b4631bda17aed29f1892f1122549 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Thu, 18 Jan 2024 02:16:30 -0300 Subject: [PATCH 3/9] Remove unused layers and update license headers --- keyboards/noxary/valhalla_v2/config.h | 18 +----------------- keyboards/noxary/valhalla_v2/halconf.h | 2 +- .../valhalla_v2/keymaps/default/keymap.c | 16 +--------------- .../noxary/valhalla_v2/keymaps/via/keymap.c | 16 +--------------- keyboards/noxary/valhalla_v2/mcuconf.h | 2 +- 5 files changed, 5 insertions(+), 49 deletions(-) diff --git a/keyboards/noxary/valhalla_v2/config.h b/keyboards/noxary/valhalla_v2/config.h index e2b538f0ba26..a6b0e3af57a2 100644 --- a/keyboards/noxary/valhalla_v2/config.h +++ b/keyboards/noxary/valhalla_v2/config.h @@ -1,5 +1,5 @@ /* -Copyright 2015 Álvaro "Gondolindrim" Volpato +Copyright 2023 Gondolindrim 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 @@ -25,19 +25,3 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/noxary/valhalla_v2/halconf.h b/keyboards/noxary/valhalla_v2/halconf.h index 612ce4fc4a8f..1251bb13acb0 100644 --- a/keyboards/noxary/valhalla_v2/halconf.h +++ b/keyboards/noxary/valhalla_v2/halconf.h @@ -1,4 +1,4 @@ -/* Copyright 2020 QMK +/* Copyright 2023 Gondolindrim * * 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 diff --git a/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c b/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c index 88330acf5c1f..02272b9290e4 100755 --- a/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c +++ b/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c @@ -1,5 +1,5 @@ /* -Copyright 2012,2013 Jun Wako +Copyright 2023 Gondolindrim 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 @@ -30,19 +30,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [2] = 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 - ), - [3] = 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 ) }; diff --git a/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c b/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c index 88330acf5c1f..02272b9290e4 100755 --- a/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c +++ b/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c @@ -1,5 +1,5 @@ /* -Copyright 2012,2013 Jun Wako +Copyright 2023 Gondolindrim 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 @@ -30,19 +30,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [2] = 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 - ), - [3] = 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 ) }; diff --git a/keyboards/noxary/valhalla_v2/mcuconf.h b/keyboards/noxary/valhalla_v2/mcuconf.h index 4ff4af80c0d6..caa959ced79c 100644 --- a/keyboards/noxary/valhalla_v2/mcuconf.h +++ b/keyboards/noxary/valhalla_v2/mcuconf.h @@ -1,4 +1,4 @@ -/* Copyright 2020 QMK +/* Copyright 2023 Gondolindrim * * 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 From 082c3274f66bdd038c1ab19cfbe38178dcc74b87 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Thu, 18 Jan 2024 02:17:42 -0300 Subject: [PATCH 4/9] Remove EEPROM logical size definition --- keyboards/noxary/valhalla_v2/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/noxary/valhalla_v2/info.json b/keyboards/noxary/valhalla_v2/info.json index b259de7c6cb3..3c2fe14fa913 100644 --- a/keyboards/noxary/valhalla_v2/info.json +++ b/keyboards/noxary/valhalla_v2/info.json @@ -27,8 +27,7 @@ "driver": "wear_leveling", "wear_leveling": { "driver": "embedded_flash", - "backing_size": 4096, - "logical_size": 2048 + "backing_size": 4096 } }, "diode_direction": "COL2ROW", From c51455e324c67363ac49bbd1684fe1b726dc22a9 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Thu, 18 Jan 2024 02:18:15 -0300 Subject: [PATCH 5/9] Remove breathing definition from backlight --- keyboards/noxary/valhalla_v2/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/noxary/valhalla_v2/info.json b/keyboards/noxary/valhalla_v2/info.json index 3c2fe14fa913..dbda5f6de185 100644 --- a/keyboards/noxary/valhalla_v2/info.json +++ b/keyboards/noxary/valhalla_v2/info.json @@ -35,7 +35,6 @@ "bootloader": "stm32-dfu", "backlight": { "as_caps_lock": true, - "breathing": false, "driver": "pwm", "levels": 20, "pin": "A7" From 9c2345eaaad0cb2d76060dcbc1701403b4429205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Sun, 21 Jan 2024 21:44:15 -0300 Subject: [PATCH 6/9] Remove locking defs from `config.h` Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/noxary/valhalla_v2/config.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/noxary/valhalla_v2/config.h b/keyboards/noxary/valhalla_v2/config.h index a6b0e3af57a2..627429a6f255 100644 --- a/keyboards/noxary/valhalla_v2/config.h +++ b/keyboards/noxary/valhalla_v2/config.h @@ -20,8 +20,3 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 2 #define BACKLIGHT_PAL_MODE 2 - -/* 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 From 4f8bf6bf2b7be703c59d6234a5ffb0b64d426c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Sun, 21 Jan 2024 21:44:26 -0300 Subject: [PATCH 7/9] Enable mousekey and extrakey Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/noxary/valhalla_v2/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/noxary/valhalla_v2/info.json b/keyboards/noxary/valhalla_v2/info.json index dbda5f6de185..80f4b6222841 100644 --- a/keyboards/noxary/valhalla_v2/info.json +++ b/keyboards/noxary/valhalla_v2/info.json @@ -14,8 +14,8 @@ }, "features": { "bootmagic": true, - "mousekey": false, - "extrakey": false, + "mousekey": true, + "extrakey": true, "console": false, "backlight": true, "nkro": true From b82db1f7e1f5274354a11d203f335afdf4e494a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Sun, 21 Jan 2024 21:44:46 -0300 Subject: [PATCH 8/9] Move locking defs to `info.json` Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/noxary/valhalla_v2/info.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/keyboards/noxary/valhalla_v2/info.json b/keyboards/noxary/valhalla_v2/info.json index 80f4b6222841..671bd0b775a3 100644 --- a/keyboards/noxary/valhalla_v2/info.json +++ b/keyboards/noxary/valhalla_v2/info.json @@ -20,6 +20,12 @@ "backlight": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, From 8e33530073e80e8a724c49938bd5f78b44a0e09b Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Sun, 21 Jan 2024 21:57:50 -0300 Subject: [PATCH 9/9] Rehost README file on imgur --- keyboards/noxary/valhalla_v2/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/noxary/valhalla_v2/readme.md b/keyboards/noxary/valhalla_v2/readme.md index c91aafc8e1a4..afd2dffd60f4 100644 --- a/keyboards/noxary/valhalla_v2/readme.md +++ b/keyboards/noxary/valhalla_v2/readme.md @@ -1,6 +1,6 @@ # Noxary Valhalla V2 -![valhalla](https://cdn.shopify.com/s/files/1/0071/6377/3043/products/BG_AngleL_a247224d-f9ca-4093-b0de-df776e34b02d_900x.jpg?v=1598742611) +![valhalla](https://imgur.com/281HMjnh.jpg) An ergonomic 65% by Noxary