From 4195eb8fe1de39855b622ee282950c10fdbf0988 Mon Sep 17 00:00:00 2001 From: Xelus22 <17491233+Xelus22@users.noreply.github.com> Date: Sun, 14 Aug 2022 17:17:11 +1000 Subject: [PATCH] [Keyboard] Add Valor FRL TKL rev2.0 and 2.1 (#17992) * add valor frl tkl rev2 by xelus22 --- .../valor_frl_tkl/keymaps/default/keymap.c | 2 +- .../xelus/valor_frl_tkl/keymaps/via/keymap.c | 2 +- .../xelus/valor_frl_tkl/{ => rev1}/chconf.h | 0 .../xelus/valor_frl_tkl/{ => rev1}/config.h | 0 .../xelus/valor_frl_tkl/{ => rev1}/halconf.h | 0 .../xelus/valor_frl_tkl/{ => rev1}/mcuconf.h | 0 .../xelus/valor_frl_tkl/{ => rev1}/readme.md | 2 +- keyboards/xelus/valor_frl_tkl/rev1/rev1.c | 24 ++++++ keyboards/xelus/valor_frl_tkl/rev1/rev1.h | 35 ++++++++ .../xelus/valor_frl_tkl/{ => rev1}/rules.mk | 0 keyboards/xelus/valor_frl_tkl/rev2_0/.noci | 0 keyboards/xelus/valor_frl_tkl/rev2_0/config.h | 44 +++++++++++ .../xelus/valor_frl_tkl/rev2_0/mcuconf.h | 34 ++++++++ .../xelus/valor_frl_tkl/rev2_0/readme.md | 79 +++++++++++++++++++ keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk | 23 ++++++ keyboards/xelus/valor_frl_tkl/rev2_1/config.h | 44 +++++++++++ .../xelus/valor_frl_tkl/rev2_1/mcuconf.h | 34 ++++++++ .../xelus/valor_frl_tkl/rev2_1/readme.md | 14 ++++ keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk | 23 ++++++ keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c | 5 -- keyboards/xelus/valor_frl_tkl/valor_frl_tkl.h | 2 +- 21 files changed, 358 insertions(+), 9 deletions(-) rename keyboards/xelus/valor_frl_tkl/{ => rev1}/chconf.h (100%) rename keyboards/xelus/valor_frl_tkl/{ => rev1}/config.h (100%) rename keyboards/xelus/valor_frl_tkl/{ => rev1}/halconf.h (100%) rename keyboards/xelus/valor_frl_tkl/{ => rev1}/mcuconf.h (100%) rename keyboards/xelus/valor_frl_tkl/{ => rev1}/readme.md (92%) create mode 100644 keyboards/xelus/valor_frl_tkl/rev1/rev1.c create mode 100644 keyboards/xelus/valor_frl_tkl/rev1/rev1.h rename keyboards/xelus/valor_frl_tkl/{ => rev1}/rules.mk (100%) create mode 100644 keyboards/xelus/valor_frl_tkl/rev2_0/.noci create mode 100644 keyboards/xelus/valor_frl_tkl/rev2_0/config.h create mode 100644 keyboards/xelus/valor_frl_tkl/rev2_0/mcuconf.h create mode 100644 keyboards/xelus/valor_frl_tkl/rev2_0/readme.md create mode 100644 keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk create mode 100644 keyboards/xelus/valor_frl_tkl/rev2_1/config.h create mode 100644 keyboards/xelus/valor_frl_tkl/rev2_1/mcuconf.h create mode 100644 keyboards/xelus/valor_frl_tkl/rev2_1/readme.md create mode 100644 keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk diff --git a/keyboards/xelus/valor_frl_tkl/keymaps/default/keymap.c b/keyboards/xelus/valor_frl_tkl/keymaps/default/keymap.c index 24c1571995..c7b3a1818f 100644 --- a/keyboards/xelus/valor_frl_tkl/keymaps/default/keymap.c +++ b/keyboards/xelus/valor_frl_tkl/keymaps/default/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_TILD, 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_DEL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_GRV, 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_DEL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, 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_DEL, KC_END, KC_PGDN, 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_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_RGUI, KC_UP, diff --git a/keyboards/xelus/valor_frl_tkl/keymaps/via/keymap.c b/keyboards/xelus/valor_frl_tkl/keymaps/via/keymap.c index 24d2627272..d73d3c646f 100644 --- a/keyboards/xelus/valor_frl_tkl/keymaps/via/keymap.c +++ b/keyboards/xelus/valor_frl_tkl/keymaps/via/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_TILD, 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_DEL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_GRV, 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_DEL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, 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_DEL, KC_END, KC_PGDN, 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_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_RGUI, KC_UP, diff --git a/keyboards/xelus/valor_frl_tkl/chconf.h b/keyboards/xelus/valor_frl_tkl/rev1/chconf.h similarity index 100% rename from keyboards/xelus/valor_frl_tkl/chconf.h rename to keyboards/xelus/valor_frl_tkl/rev1/chconf.h diff --git a/keyboards/xelus/valor_frl_tkl/config.h b/keyboards/xelus/valor_frl_tkl/rev1/config.h similarity index 100% rename from keyboards/xelus/valor_frl_tkl/config.h rename to keyboards/xelus/valor_frl_tkl/rev1/config.h diff --git a/keyboards/xelus/valor_frl_tkl/halconf.h b/keyboards/xelus/valor_frl_tkl/rev1/halconf.h similarity index 100% rename from keyboards/xelus/valor_frl_tkl/halconf.h rename to keyboards/xelus/valor_frl_tkl/rev1/halconf.h diff --git a/keyboards/xelus/valor_frl_tkl/mcuconf.h b/keyboards/xelus/valor_frl_tkl/rev1/mcuconf.h similarity index 100% rename from keyboards/xelus/valor_frl_tkl/mcuconf.h rename to keyboards/xelus/valor_frl_tkl/rev1/mcuconf.h diff --git a/keyboards/xelus/valor_frl_tkl/readme.md b/keyboards/xelus/valor_frl_tkl/rev1/readme.md similarity index 92% rename from keyboards/xelus/valor_frl_tkl/readme.md rename to keyboards/xelus/valor_frl_tkl/rev1/readme.md index da85ebbd47..7069a57f06 100644 --- a/keyboards/xelus/valor_frl_tkl/readme.md +++ b/keyboards/xelus/valor_frl_tkl/rev1/readme.md @@ -8,6 +8,6 @@ An Alice-esque FRL TKL keyboard PCB. Make example for this keyboard (after setting up your build environment): - make xelus/valor_frl_tkl:default + make xelus/valor_frl_tkl/rev1:default 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/xelus/valor_frl_tkl/rev1/rev1.c b/keyboards/xelus/valor_frl_tkl/rev1/rev1.c new file mode 100644 index 0000000000..d26d2021f9 --- /dev/null +++ b/keyboards/xelus/valor_frl_tkl/rev1/rev1.c @@ -0,0 +1,24 @@ +/* Copyright 2020 Harrison Chan (Xelus) + * + * 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 . + */ + +// Nothing to see here, move along... ;-) + +#include "rev1.h" + +void board_init(void) { + SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP; + SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP); +} diff --git a/keyboards/xelus/valor_frl_tkl/rev1/rev1.h b/keyboards/xelus/valor_frl_tkl/rev1/rev1.h new file mode 100644 index 0000000000..94ae0fcbab --- /dev/null +++ b/keyboards/xelus/valor_frl_tkl/rev1/rev1.h @@ -0,0 +1,35 @@ +/* Copyright 2020 Harrison Chan (Xelus) + * + * 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 + +#include "quantum.h" + +#define ____ KC_NO + +#define LAYOUT_all( \ + K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, K014, K015, K016, \ + K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \ + K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \ + K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, \ + K400, K402, K404, K405, K407, K409, K412, K414, K415, K416 \ +) { \ + { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016 }, \ + { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \ + { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, ____, ____ }, \ + { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, ____, K315, ____ }, \ + { K400, ____, K402, ____, K404, K405, ____, K407, ____, K409, ____, ____, K412, ____, K414, K415, K416 } \ +} diff --git a/keyboards/xelus/valor_frl_tkl/rules.mk b/keyboards/xelus/valor_frl_tkl/rev1/rules.mk similarity index 100% rename from keyboards/xelus/valor_frl_tkl/rules.mk rename to keyboards/xelus/valor_frl_tkl/rev1/rules.mk diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/.noci b/keyboards/xelus/valor_frl_tkl/rev2_0/.noci new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h new file mode 100644 index 0000000000..04dbefb537 --- /dev/null +++ b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h @@ -0,0 +1,44 @@ +/* Copyright 2022 Harrison Chan (Xelus) + * + * 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 + +/* USB Device descriptor parameter */ +#define DEVICE_VER 0x0002 +#define PRODUCT Xelus Valor FRL TKL Rev2.0 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 17 + +/* key matrix pins */ +#define MATRIX_ROW_PINS { A15, A14, A10, B3, B4 } +#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B9, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Set 0 if debouncing isn't 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 + +#define STM32_HSECLK 16000000 diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/mcuconf.h b/keyboards/xelus/valor_frl_tkl/rev2_0/mcuconf.h new file mode 100644 index 0000000000..d7550e5c76 --- /dev/null +++ b/keyboards/xelus/valor_frl_tkl/rev2_0/mcuconf.h @@ -0,0 +1,34 @@ +/* Copyright 2022 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 + +#include_next + +#undef STM32_PLLM_VALUE +#undef STM32_PLLN_VALUE +#undef STM32_PLLP_VALUE +#undef STM32_PLLQ_VALUE +#undef STM32_PPRE1 +#undef STM32_PPRE2 + +// 96MHz core +#define STM32_PLLM_VALUE 8 +#define STM32_PLLN_VALUE 96 +#define STM32_PLLP_VALUE 2 +#define STM32_PLLQ_VALUE 4 +#define STM32_PPRE1 STM32_PPRE1_DIV2 +#define STM32_PPRE2 STM32_PPRE1_DIV1 diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/readme.md b/keyboards/xelus/valor_frl_tkl/rev2_0/readme.md new file mode 100644 index 0000000000..3a1b4d53b5 --- /dev/null +++ b/keyboards/xelus/valor_frl_tkl/rev2_0/readme.md @@ -0,0 +1,79 @@ +# Valor FRL TKL Rev2.0 + +An Alice-esque FRL TKL keyboard PCB. + +* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22) +* Hardware Supported: Valor FRL TKL +* Hardware Availability: Custom keyboard group buys + +### Important Note +This version uses the pin PA9 which is un-usable with the current ChibiOS. The first column will be disabled if this firmware is compiled normally. +A patch is required locally to use this version. +Please use this patch: +```diff --git a/os/hal/ports/STM32/LLD/OTGv1/hal_usb_lld.c b/os/hal/ports/STM32/LLD/OTGv1/hal_usb_lld.c +index 0f48d1fd0..38aff8554 100644 +--- a/os/hal/ports/STM32/LLD/OTGv1/hal_usb_lld.c ++++ b/os/hal/ports/STM32/LLD/OTGv1/hal_usb_lld.c +@@ -40,18 +40,18 @@ + + #if STM32_OTG_STEPPING == 1 + #if defined(BOARD_OTG_NOVBUSSENS) +-#define GCCFG_INIT_VALUE (GCCFG_NOVBUSSENS | GCCFG_VBUSASEN | \ +- GCCFG_VBUSBSEN | GCCFG_PWRDWN) ++#define GCCFG_INIT_VALUE (GCCFG_NOVBUSSENS | \ ++ GCCFG_PWRDWN) + #else +-#define GCCFG_INIT_VALUE (GCCFG_VBUSASEN | GCCFG_VBUSBSEN | \ ++#define GCCFG_INIT_VALUE (GCCFG_NOVBUSSENS | \ + GCCFG_PWRDWN) + #endif + + #elif STM32_OTG_STEPPING == 2 + #if defined(BOARD_OTG_NOVBUSSENS) +-#define GCCFG_INIT_VALUE GCCFG_PWRDWN ++#define GCCFG_INIT_VALUE (GCCFG_NOVBUSSENS | GCCFG_PWRDWN) + #else +-#define GCCFG_INIT_VALUE (GCCFG_VBDEN | GCCFG_PWRDWN) ++#define GCCFG_INIT_VALUE (GCCFG_NOVBUSSENS | GCCFG_VBDEN | GCCFG_PWRDWN) + #endif + + #endif +@@ -815,7 +815,7 @@ void usb_lld_start(USBDriver *usbp) { + otgp->PCGCCTL = 0; + + /* VBUS sensing and transceiver enabled.*/ +- otgp->GOTGCTL = GOTGCTL_BVALOEN | GOTGCTL_BVALOVAL; ++ // otgp->GOTGCTL = GOTGCTL_BVALOEN | GOTGCTL_BVALOVAL; + + #if defined(BOARD_OTG2_USES_ULPI) + #if STM32_USB_USE_OTG1 +diff --git a/os/hal/ports/STM32/LLD/OTGv1/hal_usb_lld.h b/os/hal/ports/STM32/LLD/OTGv1/hal_usb_lld.h +index 69a5ab603..200b4b91a 100644 +--- a/os/hal/ports/STM32/LLD/OTGv1/hal_usb_lld.h ++++ b/os/hal/ports/STM32/LLD/OTGv1/hal_usb_lld.h +@@ -534,7 +534,7 @@ struct USBDriver { + * @notapi + */ + #if (STM32_OTG_STEPPING == 1) || defined(__DOXYGEN__) +-#define usb_lld_connect_bus(usbp) ((usbp)->otg->GCCFG |= GCCFG_VBUSBSEN) ++#define usb_lld_connect_bus(usbp) + #else + #define usb_lld_connect_bus(usbp) ((usbp)->otg->DCTL &= ~DCTL_SDIS) + #endif +@@ -545,7 +545,7 @@ struct USBDriver { + * @notapi + */ + #if (STM32_OTG_STEPPING == 1) || defined(__DOXYGEN__) +-#define usb_lld_disconnect_bus(usbp) ((usbp)->otg->GCCFG &= ~GCCFG_VBUSBSEN) ++#define usb_lld_disconnect_bus(usbp) + #else + #define usb_lld_disconnect_bus(usbp) ((usbp)->otg->DCTL |= DCTL_SDIS) + #endif +``` + +Make example for this keyboard (after setting up your build environment): + + make xelus/valor_frl_tkl/rev2_0:default + make xelus/valor_frl_tkl/rev2_0:via + +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/xelus/valor_frl_tkl/rev2_0/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk new file mode 100644 index 0000000000..ba22afdc26 --- /dev/null +++ b/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk @@ -0,0 +1,23 @@ +# MCU name +MCU = STM32F411 + +# Bootloader selection +BOOTLOADER = stm32-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 = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE + +KEYBOARD_SHARED_EP = yes diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h new file mode 100644 index 0000000000..1cbd3e29f6 --- /dev/null +++ b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h @@ -0,0 +1,44 @@ +/* Copyright 2022 Harrison Chan (Xelus) + * + * 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 + +/* USB Device descriptor parameter */ +#define DEVICE_VER 0x0003 +#define PRODUCT Xelus Valor FRL TKL Rev2.1 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 17 + +/* key matrix pins */ +#define MATRIX_ROW_PINS { A15, A14, A13, B3, B4 } +#define MATRIX_COL_PINS { A10, A8, B15, B14, B13, B12, B9, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Set 0 if debouncing isn't 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 + +#define STM32_HSECLK 16000000 diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/mcuconf.h b/keyboards/xelus/valor_frl_tkl/rev2_1/mcuconf.h new file mode 100644 index 0000000000..f25665e06e --- /dev/null +++ b/keyboards/xelus/valor_frl_tkl/rev2_1/mcuconf.h @@ -0,0 +1,34 @@ +/* Copyright 2022 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 + +#include_next + +#undef STM32_PLLM_VALUE +#undef STM32_PLLN_VALUE +#undef STM32_PLLP_VALUE +#undef STM32_PLLQ_VALUE +#undef STM32_PPRE1 +#undef STM32_PPRE2 + +// 84MHz core +#define STM32_PLLM_VALUE 8 +#define STM32_PLLN_VALUE 168 +#define STM32_PLLP_VALUE 4 +#define STM32_PLLQ_VALUE 7 +#define STM32_PPRE1 STM32_PPRE1_DIV2 +#define STM32_PPRE2 STM32_PPRE1_DIV1 diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/readme.md b/keyboards/xelus/valor_frl_tkl/rev2_1/readme.md new file mode 100644 index 0000000000..c0f409b3ae --- /dev/null +++ b/keyboards/xelus/valor_frl_tkl/rev2_1/readme.md @@ -0,0 +1,14 @@ +# Valor FRL TKL Rev2.1 + +An Alice-esque FRL TKL keyboard PCB. + +* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22) +* Hardware Supported: Valor FRL TKL +* Hardware Availability: Custom keyboard group buys + +Make example for this keyboard (after setting up your build environment): + + make xelus/valor_frl_tkl/rev2_1:default + make xelus/valor_frl_tkl/rev2_1:via + +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/xelus/valor_frl_tkl/rev2_1/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk new file mode 100644 index 0000000000..72dda3e6f8 --- /dev/null +++ b/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk @@ -0,0 +1,23 @@ +# MCU name +MCU = STM32F401 + +# Bootloader selection +BOOTLOADER = stm32-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 = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE + +KEYBOARD_SHARED_EP = yes diff --git a/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c b/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c index 08e08068b9..b5eca9abde 100644 --- a/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c +++ b/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c @@ -17,8 +17,3 @@ // Nothing to see here, move along... ;-) #include "valor_frl_tkl.h" - -void board_init(void) { - SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP; - SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP); -} diff --git a/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.h b/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.h index 757f64adf9..94ae0fcbab 100644 --- a/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.h +++ b/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.h @@ -17,7 +17,7 @@ #pragma once #include "quantum.h" - + #define ____ KC_NO #define LAYOUT_all( \