Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Valhalla v2 PCB support #22914

Merged
merged 9 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions keyboards/noxary/valhalla_v2/config.h
Original file line number Diff line number Diff line change
@@ -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/>.
*/

#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
Gondolindrim marked this conversation as resolved.
Show resolved Hide resolved
21 changes: 21 additions & 0 deletions keyboards/noxary/valhalla_v2/halconf.h
Original file line number Diff line number Diff line change
@@ -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>
217 changes: 217 additions & 0 deletions keyboards/noxary/valhalla_v2/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
{
"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,
Gondolindrim marked this conversation as resolved.
Show resolved Hide resolved
"console": false,
"backlight": true,
"nkro": true
},
Gondolindrim marked this conversation as resolved.
Show resolved Hide resolved
"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}
]
}
}
}
34 changes: 34 additions & 0 deletions keyboards/noxary/valhalla_v2/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -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
)
};
34 changes: 34 additions & 0 deletions keyboards/noxary/valhalla_v2/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -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
)
};
1 change: 1 addition & 0 deletions keyboards/noxary/valhalla_v2/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
Loading