diff options
author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/weirdo | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/weirdo')
22 files changed, 25 insertions, 113 deletions
diff --git a/keyboards/weirdo/geminate60/chconf.h b/keyboards/weirdo/geminate60/chconf.h index a70b65c879..171f2f9bd0 100644 --- a/keyboards/weirdo/geminate60/chconf.h +++ b/keyboards/weirdo/geminate60/chconf.h @@ -14,6 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#pragma once + // Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303 // so we need to change resolution and frequency to match. #define CH_CFG_ST_RESOLUTION 16 diff --git a/keyboards/weirdo/geminate60/config.h b/keyboards/weirdo/geminate60/config.h index 16e5170168..f187c1b234 100644 --- a/keyboards/weirdo/geminate60/config.h +++ b/keyboards/weirdo/geminate60/config.h @@ -14,18 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 #define MATRIX_ROW_PINS { A9, A10, B10, B11, B15} #define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8} #define DIODE_DIRECTION ROW2COL -#define DEBOUNCE 5 - - #define RGB_DI_PIN A6 #define RGBLED_NUM 1 diff --git a/keyboards/weirdo/geminate60/info.json b/keyboards/weirdo/geminate60/info.json index fd7170b6c1..890a017867 100644 --- a/keyboards/weirdo/geminate60/info.json +++ b/keyboards/weirdo/geminate60/info.json @@ -8,6 +8,9 @@ "pid": "0x676D", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/weirdo/geminate60/rules.mk b/keyboards/weirdo/geminate60/rules.mk index f6ad535987..3c777809b4 100644 --- a/keyboards/weirdo/geminate60/rules.mk +++ b/keyboards/weirdo/geminate60/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # @@ -17,5 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -#LAYOUTS = ortho_5x15 diff --git a/keyboards/weirdo/kelowna/rgb64/config.h b/keyboards/weirdo/kelowna/rgb64/config.h index b6045bc7d6..92fa599442 100644 --- a/keyboards/weirdo/kelowna/rgb64/config.h +++ b/keyboards/weirdo/kelowna/rgb64/config.h @@ -14,18 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 #define MATRIX_COL_PINS { A3, A4, A5, A7, B0, B1, B10, B15, A8, A9, A10, B7, B6, B5, B4} #define MATRIX_ROW_PINS { B12, B13, B14, C11, A1} #define DIODE_DIRECTION ROW2COL -#define DEBOUNCE 5 - - #define RGB_DI_PIN A6 #define RGBLED_NUM 64 diff --git a/keyboards/weirdo/kelowna/rgb64/info.json b/keyboards/weirdo/kelowna/rgb64/info.json index 3aedc2d7c9..934da67ee4 100644 --- a/keyboards/weirdo/kelowna/rgb64/info.json +++ b/keyboards/weirdo/kelowna/rgb64/info.json @@ -8,6 +8,10 @@ "pid": "0x4C64", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", + "community_layouts": ["64_ansi"], "layouts": { "LAYOUT_64_ansi": { "layout": [ diff --git a/keyboards/weirdo/kelowna/rgb64/rules.mk b/keyboards/weirdo/kelowna/rgb64/rules.mk index 4e81168041..3c777809b4 100644 --- a/keyboards/weirdo/kelowna/rgb64/rules.mk +++ b/keyboards/weirdo/kelowna/rgb64/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # @@ -17,4 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -LAYOUTS = 64_ansi diff --git a/keyboards/weirdo/ls_60/config.h b/keyboards/weirdo/ls_60/config.h index 640664dd4a..46340f7833 100644 --- a/keyboards/weirdo/ls_60/config.h +++ b/keyboards/weirdo/ls_60/config.h @@ -14,18 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 #define MATRIX_ROW_PINS { A9, A10, B10, B11, B15} #define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8} #define DIODE_DIRECTION ROW2COL -#define DEBOUNCE 5 - - #define RGB_DI_PIN A6 #define RGBLED_NUM 1 diff --git a/keyboards/weirdo/ls_60/info.json b/keyboards/weirdo/ls_60/info.json index 5268567433..906a993884 100644 --- a/keyboards/weirdo/ls_60/info.json +++ b/keyboards/weirdo/ls_60/info.json @@ -8,6 +8,9 @@ "pid": "0x4C53", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/weirdo/ls_60/rules.mk b/keyboards/weirdo/ls_60/rules.mk index bcc109f6d4..3c777809b4 100644 --- a/keyboards/weirdo/ls_60/rules.mk +++ b/keyboards/weirdo/ls_60/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/weirdo/naiping/np64/config.h b/keyboards/weirdo/naiping/np64/config.h index 2044a9546b..8fa16298e2 100644 --- a/keyboards/weirdo/naiping/np64/config.h +++ b/keyboards/weirdo/naiping/np64/config.h @@ -14,18 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 #define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } #define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 } #define DIODE_DIRECTION ROW2COL -#define DEBOUNCE 5 - - #define RGB_DI_PIN B1 #define RGBLED_NUM 80 diff --git a/keyboards/weirdo/naiping/np64/info.json b/keyboards/weirdo/naiping/np64/info.json index 83a9c07193..c188d4bb11 100644 --- a/keyboards/weirdo/naiping/np64/info.json +++ b/keyboards/weirdo/naiping/np64/info.json @@ -8,9 +8,13 @@ "pid": "0x7064", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layout_aliases": { "LAYOUT": "LAYOUT_64_ansi" }, + "community_layouts": ["64_ansi"], "layouts": { "LAYOUT_64_ansi": { "layout": [ diff --git a/keyboards/weirdo/naiping/np64/rules.mk b/keyboards/weirdo/naiping/np64/rules.mk index 55c914453e..3c777809b4 100644 --- a/keyboards/weirdo/naiping/np64/rules.mk +++ b/keyboards/weirdo/naiping/np64/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # @@ -17,5 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -LAYOUTS = 64_ansi diff --git a/keyboards/weirdo/naiping/nphhkb/config.h b/keyboards/weirdo/naiping/nphhkb/config.h index 25b4534a9a..43b8d1c32e 100644 --- a/keyboards/weirdo/naiping/nphhkb/config.h +++ b/keyboards/weirdo/naiping/nphhkb/config.h @@ -14,18 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 #define MATRIX_COL_PINS { A4, C15, C14, A5, A6, A15, B1, B10, B12, B13, B14, B15, B6, A8, B5} #define MATRIX_ROW_PINS { B7, B8, B9, C13, B4} #define DIODE_DIRECTION ROW2COL -#define DEBOUNCE 5 - - #define RGB_DI_PIN A7 #define RGBLED_NUM 78 diff --git a/keyboards/weirdo/naiping/nphhkb/info.json b/keyboards/weirdo/naiping/nphhkb/info.json index 8b69fcabb4..b1b1c1f23d 100644 --- a/keyboards/weirdo/naiping/nphhkb/info.json +++ b/keyboards/weirdo/naiping/nphhkb/info.json @@ -8,9 +8,13 @@ "pid": "0x7068", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layout_aliases": { "LAYOUT": "LAYOUT_60_tsangan_hhkb" }, + "community_layouts": ["60_tsangan_hhkb"], "layouts": { "LAYOUT_60_tsangan_hhkb": { "layout": [ diff --git a/keyboards/weirdo/naiping/nphhkb/rules.mk b/keyboards/weirdo/naiping/nphhkb/rules.mk index 64284e913b..3c777809b4 100644 --- a/keyboards/weirdo/naiping/nphhkb/rules.mk +++ b/keyboards/weirdo/naiping/nphhkb/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # @@ -17,5 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -LAYOUTS = 60_tsangan_hhkb diff --git a/keyboards/weirdo/naiping/npminila/config.h b/keyboards/weirdo/naiping/npminila/config.h index 29a8d9d2f3..265ae2e207 100644 --- a/keyboards/weirdo/naiping/npminila/config.h +++ b/keyboards/weirdo/naiping/npminila/config.h @@ -14,17 +14,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 #define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } #define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 } #define DIODE_DIRECTION ROW2COL -#define DEBOUNCE 5 - #define RGB_DI_PIN D1 #define RGBLED_NUM 82 diff --git a/keyboards/weirdo/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/info.json index be15116ed7..9904ca28fc 100644 --- a/keyboards/weirdo/naiping/npminila/info.json +++ b/keyboards/weirdo/naiping/npminila/info.json @@ -8,6 +8,9 @@ "pid": "0x706D", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/weirdo/naiping/npminila/rules.mk b/keyboards/weirdo/naiping/npminila/rules.mk index bcc109f6d4..3c777809b4 100644 --- a/keyboards/weirdo/naiping/npminila/rules.mk +++ b/keyboards/weirdo/naiping/npminila/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/weirdo/tiger910/config.h b/keyboards/weirdo/tiger910/config.h index 44b1ef434f..34f2b70605 100644 --- a/keyboards/weirdo/tiger910/config.h +++ b/keyboards/weirdo/tiger910/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } #define MATRIX_COL_PINS { B5, B6, B7, C0, C1, C2, C3, C4, C5, C6, C7, D0, D1, D2, D3, D4 } @@ -29,12 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION ROW2COL -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/weirdo/tiger910/info.json b/keyboards/weirdo/tiger910/info.json index 50edcced1a..9634cc6f9a 100644 --- a/keyboards/weirdo/tiger910/info.json +++ b/keyboards/weirdo/tiger910/info.json @@ -8,6 +8,8 @@ "pid": "0x5447", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/weirdo/tiger910/rules.mk b/keyboards/weirdo/tiger910/rules.mk index ee0b9bc30c..1533e2ee82 100644 --- a/keyboards/weirdo/tiger910/rules.mk +++ b/keyboards/weirdo/tiger910/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |