diff options
Diffstat (limited to 'keyboards/linworks')
27 files changed, 69 insertions, 162 deletions
diff --git a/keyboards/linworks/dolice/config.h b/keyboards/linworks/dolice/config.h index b8648e64db..394b953afb 100644 --- a/keyboards/linworks/dolice/config.h +++ b/keyboards/linworks/dolice/config.h @@ -14,31 +14,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" /* Force USB NKRO */ #define FORCE_NKRO -/* key matrix size */ -#define MATRIX_ROWS 9 -#define MATRIX_COLS 8 - #define MATRIX_ROW_PINS { F5, F4, F6, F7, B0, B7, D7, D6, D4 } #define MATRIX_COL_PINS { E6, F0, F1, B4, D5, D3, D2, B2 } /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* Backlight */ -#define BACKLIGHT_PIN B5 // Timer 1 on mega32u4 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_ON_STATE 1 - -/* Indicator LEDs */ -#define LED_NUM_LOCK_PIN B6 -#define LED_CAPS_LOCK_PIN C7 -#define LED_SCROLL_LOCK_PIN C6 -#define LED_PIN_ON_STATE 0
\ No newline at end of file diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json index 4cc1a71a55..1db5f48470 100644 --- a/keyboards/linworks/dolice/info.json +++ b/keyboards/linworks/dolice/info.json @@ -7,6 +7,18 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "breathing": true + }, + "indicators": { + "caps_lock": "C7", + "num_lock": "B6", + "scroll_lock": "C6", + "on_state": 0 + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_alice": { "layout": [ diff --git a/keyboards/linworks/dolice/rules.mk b/keyboards/linworks/dolice/rules.mk index a3d10eaaaa..477fb5989c 100644 --- a/keyboards/linworks/dolice/rules.mk +++ b/keyboards/linworks/dolice/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/em8/config.h b/keyboards/linworks/em8/config.h deleted file mode 100644 index 176c814e35..0000000000 --- a/keyboards/linworks/em8/config.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2022 moritz plattner (@moritz plattner) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -// Move Bootmagic key from ~ to ESC (0,0 to 1,0) -#define BOOTMAGIC_LITE_ROW 1 -#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/linworks/em8/info.json b/keyboards/linworks/em8/info.json index 2743270970..4abcb323a4 100644 --- a/keyboards/linworks/em8/info.json +++ b/keyboards/linworks/em8/info.json @@ -23,6 +23,9 @@ "pid": "0x0006", "vid": "0x4C58" }, + "bootmagic": { + "matrix": [1, 0] + }, "indicators": { "num_lock": "D2", "caps_lock": "D3", diff --git a/keyboards/linworks/fave104/config.h b/keyboards/linworks/fave104/config.h index e631c079f0..5d3830ef6c 100644 --- a/keyboards/linworks/fave104/config.h +++ b/keyboards/linworks/fave104/config.h @@ -17,30 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 12 -#define MATRIX_COLS 11 #define MATRIX_ROW_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A0 } #define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, A10, A13, A14, A15, B3 } -#define LED_NUM_LOCK_PIN B6 -#define LED_CAPS_LOCK_PIN B5 -#define LED_SCROLL_LOCK_PIN B4 -#define LED_PIN_ON_STATE 0 - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 -/* Backlight */ -#define BACKLIGHT_PIN A1 -#define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD2 #define BACKLIGHT_PWM_CHANNEL 2 #define BACKLIGHT_PAL_MODE 2 -#define BACKLIGHT_LEVELS 5 -#define BACKLIGHT_ON_STATE 1 #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it. diff --git a/keyboards/linworks/fave104/info.json b/keyboards/linworks/fave104/info.json index f675f8c51f..03beb2ad89 100644 --- a/keyboards/linworks/fave104/info.json +++ b/keyboards/linworks/fave104/info.json @@ -8,6 +8,19 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "backlight": { + "pin": "A1", + "levels": 5, + "breathing": true + }, + "indicators": { + "caps_lock": "B5", + "num_lock": "B6", + "scroll_lock": "B4", + "on_state": 0 + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/linworks/fave104/rules.mk b/keyboards/linworks/fave104/rules.mk index 296105bb2b..af31ae9eca 100644 --- a/keyboards/linworks/fave104/rules.mk +++ b/keyboards/linworks/fave104/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/fave65h/config.h b/keyboards/linworks/fave65h/config.h index e366a62668..22e23f1a71 100644 --- a/keyboards/linworks/fave65h/config.h +++ b/keyboards/linworks/fave65h/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 15 // Checked with Eagle Schematic #define MATRIX_ROW_PINS { D1, D0, D2, D3, D5 } @@ -30,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Define RGB */ #define RGBLED_NUM 67 #define RGB_MATRIX_LED_COUNT 67 diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/info.json index 23f73accb3..c04eb5644b 100644 --- a/keyboards/linworks/fave65h/info.json +++ b/keyboards/linworks/fave65h/info.json @@ -8,10 +8,13 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker_split_bs", "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" }, + "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs"], "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ diff --git a/keyboards/linworks/fave65h/readme.md b/keyboards/linworks/fave65h/readme.md index 09649fa860..7a95f65ac5 100644 --- a/keyboards/linworks/fave65h/readme.md +++ b/keyboards/linworks/fave65h/readme.md @@ -17,7 +17,7 @@ Make example for this keyboard (after setting up your build environment): ## Bootloader Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key ESC key and plug in the keyboard (Top Left most switch) -* **Physical reset short**: Briefly short the 2 pads labelled QK_BOOT on the back of the PCB +* **Physical reset short**: Briefly short the 2 pads labelled `RESET` on the back of the PCB * **Keycode in layout**: Press the B key on layer 1 which is mapped to `QK_BOOT` 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/linworks/fave65h/rules.mk b/keyboards/linworks/fave65h/rules.mk index 8c6797a8fe..f876ea8a18 100644 --- a/keyboards/linworks/fave65h/rules.mk +++ b/keyboards/linworks/fave65h/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -21,5 +15,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 - -LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json index 1d2ab8bd42..95df89fd4e 100644 --- a/keyboards/linworks/fave84h/info.json +++ b/keyboards/linworks/fave84h/info.json @@ -2,6 +2,7 @@ "manufacturer": "Lx3", "keyboard_name": "FAve 84H", "maintainer": "ToastyStoemp", + "processor": "atmega32u4", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "features": { @@ -18,7 +19,6 @@ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"], "rows": ["B1", "B2", "B3", "D3", "D1", "D0"] }, - "processor": "atmega32u4", "rgb_matrix": { "driver": "WS2812", "layout": [ @@ -178,7 +178,7 @@ { "matrix": [0, 14], "x": 15.25, "y": 0 }, { "matrix": [0, 15], "x": 16.25, "y": 0 }, { "matrix": [0, 16], "x": 17.25, "y": 0 }, - + { "matrix": [1, 0], "x": 0, "y": 1.25 }, { "matrix": [1, 1], "x": 1, "y": 1.25 }, { "matrix": [1, 2], "x": 2, "y": 1.25 }, @@ -274,7 +274,7 @@ { "matrix": [0, 14], "x": 15.25, "y": 0 }, { "matrix": [0, 15], "x": 16.25, "y": 0 }, { "matrix": [0, 16], "x": 17.25, "y": 0 }, - + { "matrix": [1, 0], "x": 0, "y": 1.25 }, { "matrix": [1, 1], "x": 1, "y": 1.25 }, { "matrix": [1, 2], "x": 2, "y": 1.25 }, @@ -338,7 +338,7 @@ { "matrix": [4, 10], "x": 11.25, "y": 4.25 }, { "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.25 }, { "matrix": [4, 15], "x": 16.25, "y": 4.25 }, - + { "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 }, { "matrix": [5, 1], "x": 1.5, "y": 5.25 }, { "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 }, @@ -352,4 +352,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/keyboards/linworks/fave84h/readme.md b/keyboards/linworks/fave84h/readme.md index 22ce5fd428..dab29f6766 100644 --- a/keyboards/linworks/fave84h/readme.md +++ b/keyboards/linworks/fave84h/readme.md @@ -19,5 +19,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to ## Bootloader Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key ESC key and plug in the keyboard (Top Left most switch) -* **Physical reset short**: Briefly short the 2 pads labelled QK_BOOT on the back of the PCB +* **Physical reset short**: Briefly short the 2 pads labelled `RESET` on the back of the PCB * **Keycode in layout**: Press the B key on layer 1 which is mapped to `QK_BOOT` diff --git a/keyboards/linworks/fave84h/rules.mk b/keyboards/linworks/fave84h/rules.mk index 713f7f8a41..3437a35bdf 100644 --- a/keyboards/linworks/fave84h/rules.mk +++ b/keyboards/linworks/fave84h/rules.mk @@ -1,3 +1,2 @@ - # Processor frequency F_CPU = 8000000 diff --git a/keyboards/linworks/fave87/config.h b/keyboards/linworks/fave87/config.h index 867f66ed1e..37aa1a68fc 100644 --- a/keyboards/linworks/fave87/config.h +++ b/keyboards/linworks/fave87/config.h @@ -14,29 +14,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" /* Force USB NKRO */ #define FORCE_NKRO -/* key matrix size */ -#define MATRIX_ROWS 12 -#define MATRIX_COLS 9 - #define MATRIX_ROW_PINS { D3, D5, D1, D2, D4, D0, F5, F4, F7, F6, B5, B4 } #define MATRIX_COL_PINS { F1, F0, E6, B0, B1, B2, B3, D6, D7 } /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* Backlight */ -#define BACKLIGHT_PIN B7 // Timer 1 on mega32u4 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_ON_STATE 1 - /* Underglow */ #define RGB_DI_PIN E2 #define RGBLED_NUM 40 diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/info.json index e330cd7a35..b6ac9b78c1 100644 --- a/keyboards/linworks/fave87/info.json +++ b/keyboards/linworks/fave87/info.json @@ -7,6 +7,13 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/linworks/fave87/rules.mk b/keyboards/linworks/fave87/rules.mk index cda82bb82a..dd1bb7c54f 100644 --- a/keyboards/linworks/fave87/rules.mk +++ b/keyboards/linworks/fave87/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -15,5 +9,3 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow - -LAYOUTS = tkl_ansi tkl_iso diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h index 5bf82d9f5a..29d57ab51e 100644 --- a/keyboards/linworks/fave87h/config.h +++ b/keyboards/linworks/fave87h/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 6 -#define MATRIX_COLS 17 // Checked with Eagle Schematic #define MATRIX_ROW_PINS { B1, B2, B3, D3, D1, D0 } @@ -30,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Define RGB */ #define RGBLED_NUM 87 #define RGB_MATRIX_LED_COUNT 87 diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json index b6a836e0ec..1746353c26 100644 --- a/keyboards/linworks/fave87h/info.json +++ b/keyboards/linworks/fave87h/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_tkl_ansi_split_bs" }, diff --git a/keyboards/linworks/fave87h/readme.md b/keyboards/linworks/fave87h/readme.md index bda921a61b..f06d8458c0 100644 --- a/keyboards/linworks/fave87h/readme.md +++ b/keyboards/linworks/fave87h/readme.md @@ -19,5 +19,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to ## Bootloader Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key ESC key and plug in the keyboard (Top Left most switch) -* **Physical reset short**: Briefly short the 2 pads labelled QK_BOOT on the back of the PCB +* **Physical reset short**: Briefly short the 2 pads labelled `RESET` on the back of the PCB * **Keycode in layout**: Press the B key on layer 1 which is mapped to `QK_BOOT` diff --git a/keyboards/linworks/fave87h/rules.mk b/keyboards/linworks/fave87h/rules.mk index cd0eb1ee64..f876ea8a18 100644 --- a/keyboards/linworks/fave87h/rules.mk +++ b/keyboards/linworks/fave87h/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/whale75/chconf.h b/keyboards/linworks/whale75/chconf.h deleted file mode 100644 index 156fcf1ee2..0000000000 --- a/keyboards/linworks/whale75/chconf.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 QMK Contributors - * - * 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 3 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_next <chconf.h> diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h index d70ff939e3..19580b9464 100644 --- a/keyboards/linworks/whale75/config.h +++ b/keyboards/linworks/whale75/config.h @@ -14,35 +14,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" /* Force USB NKRO */ #define FORCE_NKRO -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 16 - #define MATRIX_ROW_PINS { B3, B4, B5, B6, B7, A0 } #define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15 } /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 - -#define LED_NUM_LOCK_PIN A8 -#define LED_CAPS_LOCK_PIN A9 -#define LED_SCROLL_LOCK_PIN A13 -#define LED_PIN_ON_STATE 0 -/* Backlight */ -#define BACKLIGHT_PIN A10 -#define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 3 #define BACKLIGHT_PAL_MODE 6 -#define BACKLIGHT_LEVELS 5 -#define BACKLIGHT_ON_STATE 1 #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it. /* Underglow */ @@ -60,11 +44,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL - -/* Rotary encoder - set the resolution fitting your encoder. -Most will need a value of 4. If 1 encoder click results in 2 keycodes sent -double the value. If you need 2 clicks for 1 keycode, half it */ -#define ENCODER_RESOLUTION 2 -#define ENCODERS_PAD_A { A15 } -#define ENCODERS_PAD_B { A14 } #define TAP_CODE_DELAY 10 diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json index 1f6c3cdf14..b84425f6f6 100644 --- a/keyboards/linworks/whale75/info.json +++ b/keyboards/linworks/whale75/info.json @@ -7,6 +7,25 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "A15", "pin_b": "A14", "resolution": 2} + ] + }, + "backlight": { + "pin": "A10", + "levels": 5, + "breathing": true + }, + "indicators": { + "caps_lock": "A9", + "num_lock": "A8", + "scroll_lock": "A13", + "on_state": 0 + }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/linworks/whale75/mcuconf.h b/keyboards/linworks/whale75/mcuconf.h index f6dc94d2db..a89e1dd02b 100644 --- a/keyboards/linworks/whale75/mcuconf.h +++ b/keyboards/linworks/whale75/mcuconf.h @@ -14,6 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#pragma once + #include_next <mcuconf.h> // Underglow uses TIM4, Backlight TIM1, so both are enabled here. diff --git a/keyboards/linworks/whale75/rules.mk b/keyboards/linworks/whale75/rules.mk index adad6ab5d2..bd6499b239 100644 --- a/keyboards/linworks/whale75/rules.mk +++ b/keyboards/linworks/whale75/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 # |