From ec51cdd681158b2d1e148164d71db26b72365ab4 Mon Sep 17 00:00:00 2001 From: duilchoi Date: Tue, 9 May 2023 00:24:38 +0900 Subject: [PATCH 01/33] add fave60 add fave60 --- keyboards/linworks/fave60/config.h | 59 ++++++++++++++ keyboards/linworks/fave60/fave60.c | 17 ++++ keyboards/linworks/fave60/fave60.h | 34 ++++++++ keyboards/linworks/fave60/info.json | 78 +++++++++++++++++++ .../linworks/fave60/keymaps/default/keymap.c | 33 ++++++++ .../linworks/fave60/keymaps/via/keymap.c | 33 ++++++++ .../linworks/fave60/keymaps/via/rules.mk | 1 + keyboards/linworks/fave60/readme.md | 27 +++++++ keyboards/linworks/fave60/rules.mk | 17 ++++ 9 files changed, 299 insertions(+) create mode 100644 keyboards/linworks/fave60/config.h create mode 100644 keyboards/linworks/fave60/fave60.c create mode 100644 keyboards/linworks/fave60/fave60.h create mode 100644 keyboards/linworks/fave60/info.json create mode 100644 keyboards/linworks/fave60/keymaps/default/keymap.c create mode 100644 keyboards/linworks/fave60/keymaps/via/keymap.c create mode 100644 keyboards/linworks/fave60/keymaps/via/rules.mk create mode 100644 keyboards/linworks/fave60/readme.md create mode 100644 keyboards/linworks/fave60/rules.mk diff --git a/keyboards/linworks/fave60/config.h b/keyboards/linworks/fave60/config.h new file mode 100644 index 000000000000..2fc72933db8f --- /dev/null +++ b/keyboards/linworks/fave60/config.h @@ -0,0 +1,59 @@ +/* +Copyright 2020 Moritz Plattner + +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 "config_common.h" + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +/* key matrix pins */ +#define MATRIX_ROW_PINS { F6, F7, D7, F1, D0 } +#define MATRIX_COL_PINS { D6, D4, B5, B4, B6, C6, C7, F4, F0, E6, D1, D2, D3, D5, B0 } + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* number of backlight levels */ +#define BACKLIGHT_PIN B7 +#define BACKLIGHT_LEVELS 3 +#define BACKLIGHT_BREATHING +#define BACKLIGHT_ON_STATE 1 + +#define RGB_DI_PIN F5 +#define RGBLED_NUM 18 +#define RGBLIGHT_SLEEP // Turns LEDs off if the PC goes to sleep/shutdown +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL + +/* 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 + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + diff --git a/keyboards/linworks/fave60/fave60.c b/keyboards/linworks/fave60/fave60.c new file mode 100644 index 000000000000..3ca29e0c746a --- /dev/null +++ b/keyboards/linworks/fave60/fave60.c @@ -0,0 +1,17 @@ +/* Copyright 2020 Moritz Plattner + * + * 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 "fave60.h" diff --git a/keyboards/linworks/fave60/fave60.h b/keyboards/linworks/fave60/fave60.h new file mode 100644 index 000000000000..81f897d6fba5 --- /dev/null +++ b/keyboards/linworks/fave60/fave60.h @@ -0,0 +1,34 @@ +/* Copyright 2021 Moritz Plattner + * + * 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 KEYMAP( \ + K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ + K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ + K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ + K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ + K400, K401, K403, K406, K410, K411, K413, K414 \ +) { \ + { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ + { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ + { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO }, \ + { KC_NO, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO }, \ + { K400, K401, KC_NO, K403, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413, K414 } \ +} + diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json new file mode 100644 index 000000000000..82b59d028121 --- /dev/null +++ b/keyboards/linworks/fave60/info.json @@ -0,0 +1,78 @@ +{ + "keyboard_name": "fave60", + "manufacturer": "Lx3", + "maintainer": "keydler", + "url": "", + "usb": { + "vid": "0x4C58", + "pid": "0x000D", + "device_version": "1.0.0" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "K00 (F6,D6)", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01 (F6,D4)", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02 (F6,B5)", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03 (F6,B4)", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K04 (F6,B6)", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "K05 (F6,C6)", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "K06 (F6,C7)", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "K07 (F6,F4)", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "K08 (F6,F0)", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "K09 (F6,E6)", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "K0A (F6,D1)", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "K0B (F6,D2)", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "K0C (F6,D3)", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "K0E (F6,B0)", "matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"label": "K10 (F7,D6)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "K12 (F7,B5)", "matrix": [1, 2], "x": 1.5, "y": 1}, + {"label": "K13 (F7,B4)", "matrix": [1, 3], "x": 2.5, "y": 1}, + {"label": "K14 (F7,B6)", "matrix": [1, 4], "x": 3.5, "y": 1}, + {"label": "K15 (F7,C6)", "matrix": [1, 5], "x": 4.5, "y": 1}, + {"label": "K16 (F7,C7)", "matrix": [1, 6], "x": 5.5, "y": 1}, + {"label": "K17 (F7,F4)", "matrix": [1, 7], "x": 6.5, "y": 1}, + {"label": "K18 (F7,F0)", "matrix": [1, 8], "x": 7.5, "y": 1}, + {"label": "K19 (F7,E6)", "matrix": [1, 9], "x": 8.5, "y": 1}, + {"label": "K1A (F7,D1)", "matrix": [1, 10], "x": 9.5, "y": 1}, + {"label": "K1B (F7,D2)", "matrix": [1, 11], "x": 10.5, "y": 1}, + {"label": "K1C (F7,D3)", "matrix": [1, 12], "x": 11.5, "y": 1}, + {"label": "K1D (F7,D5)", "matrix": [1, 13], "x": 12.5, "y": 1}, + {"label": "K1E (F7,B0)", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "K20 (D7,D6)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "K22 (D7,B5)", "matrix": [2, 2], "x": 1.75, "y": 2}, + {"label": "K23 (D7,B4)", "matrix": [2, 3], "x": 2.75, "y": 2}, + {"label": "K24 (D7,B6)", "matrix": [2, 4], "x": 3.75, "y": 2}, + {"label": "K25 (D7,C6)", "matrix": [2, 5], "x": 4.75, "y": 2}, + {"label": "K26 (D7,C7)", "matrix": [2, 6], "x": 5.75, "y": 2}, + {"label": "K27 (D7,F4)", "matrix": [2, 7], "x": 6.75, "y": 2}, + {"label": "K28 (D7,F0)", "matrix": [2, 8], "x": 7.75, "y": 2}, + {"label": "K29 (D7,E6)", "matrix": [2, 9], "x": 8.75, "y": 2}, + {"label": "K2A (D7,D1)", "matrix": [2, 10], "x": 9.75, "y": 2}, + {"label": "K2B (D7,D2)", "matrix": [2, 11], "x": 10.75, "y": 2}, + {"label": "K2C (D7,D3)", "matrix": [2, 12], "x": 11.75, "y": 2}, + {"label": "K2D (D7,D5)", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "K31 (F1,D4)", "matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"label": "K32 (F1,B5)", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "K33 (F1,B4)", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "K34 (F1,B6)", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "K35 (F1,C6)", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "K36 (F1,C7)", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "K37 (F1,F4)", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "K38 (F1,F0)", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "K39 (F1,E6)", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": "K3A (F1,D1)", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "K3B (F1,D2)", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "K3D (F1,D5)", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + {"label": "K40 (D0,D6)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "K41 (D0,D4)", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "K43 (D0,B4)", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "K46 (D0,C7)", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "K4A (D0,D1)", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"label": "K4B (D0,D2)", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "K4D (D0,D5)", "matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"label": "K4E (D0,B0)", "matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/linworks/fave60/keymaps/default/keymap.c b/keyboards/linworks/fave60/keymaps/default/keymap.c new file mode 100644 index 000000000000..64595c838ab0 --- /dev/null +++ b/keyboards/linworks/fave60/keymaps/default/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2020 noroadsleft + * + * 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( + 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_BSPC, + 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_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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL + ), + [1] = LAYOUT( + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, + _______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_LCBR, KC_RCBR, KC_PIPE, + _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, KC_COLN, KC_DQUO, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_LT, KC_GT, KC_QUES, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/linworks/fave60/keymaps/via/keymap.c b/keyboards/linworks/fave60/keymaps/via/keymap.c new file mode 100644 index 000000000000..64595c838ab0 --- /dev/null +++ b/keyboards/linworks/fave60/keymaps/via/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2020 noroadsleft + * + * 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( + 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_BSPC, + 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_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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL + ), + [1] = LAYOUT( + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, + _______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_LCBR, KC_RCBR, KC_PIPE, + _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, KC_COLN, KC_DQUO, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_LT, KC_GT, KC_QUES, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/linworks/fave60/keymaps/via/rules.mk b/keyboards/linworks/fave60/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/linworks/fave60/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/linworks/fave60/readme.md b/keyboards/linworks/fave60/readme.md new file mode 100644 index 000000000000..2c0b5ac390b0 --- /dev/null +++ b/keyboards/linworks/fave60/readme.md @@ -0,0 +1,27 @@ +# linworks/fave60 + +![linworks/fave60](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [keydler](https://github.com/duilchoi) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make linworks/fave60:default + +Flashing example for this keyboard: + + make linworks/fave60: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). + +## Bootloader + +Enter the bootloader 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**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/linworks/fave60/rules.mk b/keyboards/linworks/fave60/rules.mk new file mode 100644 index 000000000000..cc3f2b1db207 --- /dev/null +++ b/keyboards/linworks/fave60/rules.mk @@ -0,0 +1,17 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-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 = yes # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow From 7458af0c21bae928f5df111758029cf0209834a5 Mon Sep 17 00:00:00 2001 From: duilchoi Date: Tue, 9 May 2023 06:53:11 +0900 Subject: [PATCH 02/33] add pcb image link --- keyboards/linworks/fave60/readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/linworks/fave60/readme.md b/keyboards/linworks/fave60/readme.md index 2c0b5ac390b0..e3d6a91e3dd7 100644 --- a/keyboards/linworks/fave60/readme.md +++ b/keyboards/linworks/fave60/readme.md @@ -1,6 +1,7 @@ # linworks/fave60 -![linworks/fave60](imgur.com image replace me!) +![linworks/fave60 front] (https://imgur.com/lv97Ymu) +![linworks/fave60 back] https://imgur.com/xBLhQIo *A short description of the keyboard/project* From 5d8fa85bf3d9028d8650f11301f850f90dd014f6 Mon Sep 17 00:00:00 2001 From: duilchoi Date: Wed, 10 May 2023 00:56:42 +0900 Subject: [PATCH 03/33] update fave60 json file update fave60 json file --- keyboards/linworks/fave60/config.h | 59 --------- keyboards/linworks/fave60/fave60.c | 17 --- keyboards/linworks/fave60/fave60.h | 34 ------ keyboards/linworks/fave60/info.json | 182 ++++++++++++++++++---------- keyboards/linworks/fave60/rules.mk | 17 --- 5 files changed, 117 insertions(+), 192 deletions(-) delete mode 100644 keyboards/linworks/fave60/config.h delete mode 100644 keyboards/linworks/fave60/fave60.c delete mode 100644 keyboards/linworks/fave60/fave60.h diff --git a/keyboards/linworks/fave60/config.h b/keyboards/linworks/fave60/config.h deleted file mode 100644 index 2fc72933db8f..000000000000 --- a/keyboards/linworks/fave60/config.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -Copyright 2020 Moritz Plattner - -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 "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F6, F7, D7, F1, D0 } -#define MATRIX_COL_PINS { D6, D4, B5, B4, B6, C6, C7, F4, F0, E6, D1, D2, D3, D5, B0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* number of backlight levels */ -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 3 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_ON_STATE 1 - -#define RGB_DI_PIN F5 -#define RGBLED_NUM 18 -#define RGBLIGHT_SLEEP // Turns LEDs off if the PC goes to sleep/shutdown -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL - -/* 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 - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - diff --git a/keyboards/linworks/fave60/fave60.c b/keyboards/linworks/fave60/fave60.c deleted file mode 100644 index 3ca29e0c746a..000000000000 --- a/keyboards/linworks/fave60/fave60.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Moritz Plattner - * - * 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 "fave60.h" diff --git a/keyboards/linworks/fave60/fave60.h b/keyboards/linworks/fave60/fave60.h deleted file mode 100644 index 81f897d6fba5..000000000000 --- a/keyboards/linworks/fave60/fave60.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 Moritz Plattner - * - * 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 KEYMAP( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ - K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ - K400, K401, K403, K406, K410, K411, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO }, \ - { KC_NO, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO }, \ - { K400, K401, KC_NO, K403, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413, K414 } \ -} - diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index 82b59d028121..3a2461e2d1a1 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -1,78 +1,130 @@ { - "keyboard_name": "fave60", "manufacturer": "Lx3", + "keyboard_name": "fave60", "maintainer": "keydler", + "backlight": { + "breathing": false, + "levels": 3, + "on_state": 1, + "pin": "B7" + }, + "bootloader": "atmel-dfu", + "debounce": 5, + "diode_direction": "COL2ROW", + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["D6", "D4", "B5", "B4", "B6", "C6", "C7", "F4", "F0", "E6", "D1", "D2", "D3", "D5", "B0"], + "rows": ["F6", "F7", "D7", "F1", "D0"] + }, + "matrix_size": { + "cols": 15, + "rows": 5 + }, + "mouse_key": { + "enabled": true + }, + "platform": "unknown", + "processor": "atmega32u4", + "processor_type": "avr", + "protocol": "LUFA", + "rgblight": { + "led_count": 18, + "pin": "F5", + "sleep": false, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, "url": "", "usb": { - "vid": "0x4C58", + "device_version": "1.0.0", "pid": "0x000D", - "device_version": "1.0.0" + "vid": "0x4C58" }, "layouts": { "LAYOUT": { + "c_macro": false, "layout": [ - {"label": "K00 (F6,D6)", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "K01 (F6,D4)", "matrix": [0, 1], "x": 1, "y": 0}, - {"label": "K02 (F6,B5)", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "K03 (F6,B4)", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "K04 (F6,B6)", "matrix": [0, 4], "x": 4, "y": 0}, - {"label": "K05 (F6,C6)", "matrix": [0, 5], "x": 5, "y": 0}, - {"label": "K06 (F6,C7)", "matrix": [0, 6], "x": 6, "y": 0}, - {"label": "K07 (F6,F4)", "matrix": [0, 7], "x": 7, "y": 0}, - {"label": "K08 (F6,F0)", "matrix": [0, 8], "x": 8, "y": 0}, - {"label": "K09 (F6,E6)", "matrix": [0, 9], "x": 9, "y": 0}, - {"label": "K0A (F6,D1)", "matrix": [0, 10], "x": 10, "y": 0}, - {"label": "K0B (F6,D2)", "matrix": [0, 11], "x": 11, "y": 0}, - {"label": "K0C (F6,D3)", "matrix": [0, 12], "x": 12, "y": 0}, - {"label": "K0E (F6,B0)", "matrix": [0, 14], "x": 13, "y": 0, "w": 2}, - {"label": "K10 (F7,D6)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"label": "K12 (F7,B5)", "matrix": [1, 2], "x": 1.5, "y": 1}, - {"label": "K13 (F7,B4)", "matrix": [1, 3], "x": 2.5, "y": 1}, - {"label": "K14 (F7,B6)", "matrix": [1, 4], "x": 3.5, "y": 1}, - {"label": "K15 (F7,C6)", "matrix": [1, 5], "x": 4.5, "y": 1}, - {"label": "K16 (F7,C7)", "matrix": [1, 6], "x": 5.5, "y": 1}, - {"label": "K17 (F7,F4)", "matrix": [1, 7], "x": 6.5, "y": 1}, - {"label": "K18 (F7,F0)", "matrix": [1, 8], "x": 7.5, "y": 1}, - {"label": "K19 (F7,E6)", "matrix": [1, 9], "x": 8.5, "y": 1}, - {"label": "K1A (F7,D1)", "matrix": [1, 10], "x": 9.5, "y": 1}, - {"label": "K1B (F7,D2)", "matrix": [1, 11], "x": 10.5, "y": 1}, - {"label": "K1C (F7,D3)", "matrix": [1, 12], "x": 11.5, "y": 1}, - {"label": "K1D (F7,D5)", "matrix": [1, 13], "x": 12.5, "y": 1}, - {"label": "K1E (F7,B0)", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, - {"label": "K20 (D7,D6)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"label": "K22 (D7,B5)", "matrix": [2, 2], "x": 1.75, "y": 2}, - {"label": "K23 (D7,B4)", "matrix": [2, 3], "x": 2.75, "y": 2}, - {"label": "K24 (D7,B6)", "matrix": [2, 4], "x": 3.75, "y": 2}, - {"label": "K25 (D7,C6)", "matrix": [2, 5], "x": 4.75, "y": 2}, - {"label": "K26 (D7,C7)", "matrix": [2, 6], "x": 5.75, "y": 2}, - {"label": "K27 (D7,F4)", "matrix": [2, 7], "x": 6.75, "y": 2}, - {"label": "K28 (D7,F0)", "matrix": [2, 8], "x": 7.75, "y": 2}, - {"label": "K29 (D7,E6)", "matrix": [2, 9], "x": 8.75, "y": 2}, - {"label": "K2A (D7,D1)", "matrix": [2, 10], "x": 9.75, "y": 2}, - {"label": "K2B (D7,D2)", "matrix": [2, 11], "x": 10.75, "y": 2}, - {"label": "K2C (D7,D3)", "matrix": [2, 12], "x": 11.75, "y": 2}, - {"label": "K2D (D7,D5)", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"label": "K31 (F1,D4)", "matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, - {"label": "K32 (F1,B5)", "matrix": [3, 2], "x": 2.25, "y": 3}, - {"label": "K33 (F1,B4)", "matrix": [3, 3], "x": 3.25, "y": 3}, - {"label": "K34 (F1,B6)", "matrix": [3, 4], "x": 4.25, "y": 3}, - {"label": "K35 (F1,C6)", "matrix": [3, 5], "x": 5.25, "y": 3}, - {"label": "K36 (F1,C7)", "matrix": [3, 6], "x": 6.25, "y": 3}, - {"label": "K37 (F1,F4)", "matrix": [3, 7], "x": 7.25, "y": 3}, - {"label": "K38 (F1,F0)", "matrix": [3, 8], "x": 8.25, "y": 3}, - {"label": "K39 (F1,E6)", "matrix": [3, 9], "x": 9.25, "y": 3}, - {"label": "K3A (F1,D1)", "matrix": [3, 10], "x": 10.25, "y": 3}, - {"label": "K3B (F1,D2)", "matrix": [3, 11], "x": 11.25, "y": 3}, - {"label": "K3D (F1,D5)", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, - {"label": "K40 (D0,D6)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"label": "K41 (D0,D4)", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"label": "K43 (D0,B4)", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, - {"label": "K46 (D0,C7)", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, - {"label": "K4A (D0,D1)", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, - {"label": "K4B (D0,D2)", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, - {"label": "K4D (D0,D5)", "matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, - {"label": "K4E (D0,B0)", "matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} - ] + { "label": "K00 (F6,D6)", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "K01 (F6,D4)", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "K02 (F6,B5)", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "K03 (F6,B4)", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "K04 (F6,B6)", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "K05 (F6,C6)", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "K06 (F6,C7)", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "K07 (F6,F4)", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "K08 (F6,F0)", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "K09 (F6,E6)", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "K0A (F6,D1)", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "K0B (F6,D2)", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "K0C (F6,D3)", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "K0E (F6,B0)", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 }, + { "label": "K10 (F7,D6)", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "label": "K12 (F7,B5)", "matrix": [1, 2], "x": 1.5, "y": 1 }, + { "label": "K13 (F7,B4)", "matrix": [1, 3], "x": 2.5, "y": 1 }, + { "label": "K14 (F7,B6)", "matrix": [1, 4], "x": 3.5, "y": 1 }, + { "label": "K15 (F7,C6)", "matrix": [1, 5], "x": 4.5, "y": 1 }, + { "label": "K16 (F7,C7)", "matrix": [1, 6], "x": 5.5, "y": 1 }, + { "label": "K17 (F7,F4)", "matrix": [1, 7], "x": 6.5, "y": 1 }, + { "label": "K18 (F7,F0)", "matrix": [1, 8], "x": 7.5, "y": 1 }, + { "label": "K19 (F7,E6)", "matrix": [1, 9], "x": 8.5, "y": 1 }, + { "label": "K1A (F7,D1)", "matrix": [1, 10], "x": 9.5, "y": 1 }, + { "label": "K1B (F7,D2)", "matrix": [1, 11], "x": 10.5, "y": 1 }, + { "label": "K1C (F7,D3)", "matrix": [1, 12], "x": 11.5, "y": 1 }, + { "label": "K1D (F7,D5)", "matrix": [1, 13], "x": 12.5, "y": 1 }, + { "label": "K1E (F7,B0)", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "K20 (D7,D6)", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "K22 (D7,B5)", "matrix": [2, 2], "x": 1.75, "y": 2 }, + { "label": "K23 (D7,B4)", "matrix": [2, 3], "x": 2.75, "y": 2 }, + { "label": "K24 (D7,B6)", "matrix": [2, 4], "x": 3.75, "y": 2 }, + { "label": "K25 (D7,C6)", "matrix": [2, 5], "x": 4.75, "y": 2 }, + { "label": "K26 (D7,C7)", "matrix": [2, 6], "x": 5.75, "y": 2 }, + { "label": "K27 (D7,F4)", "matrix": [2, 7], "x": 6.75, "y": 2 }, + { "label": "K28 (D7,F0)", "matrix": [2, 8], "x": 7.75, "y": 2 }, + { "label": "K29 (D7,E6)", "matrix": [2, 9], "x": 8.75, "y": 2 }, + { "label": "K2A (D7,D1)", "matrix": [2, 10], "x": 9.75, "y": 2 }, + { "label": "K2B (D7,D2)", "matrix": [2, 11], "x": 10.75, "y": 2 }, + { "label": "K2C (D7,D3)", "matrix": [2, 12], "x": 11.75, "y": 2 }, + { "label": "K2D (D7,D5)", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "label": "K31 (F1,D4)", "matrix": [3, 1], "w": 2.25, "x": 0, "y": 3 }, + { "label": "K32 (F1,B5)", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "K33 (F1,B4)", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "K34 (F1,B6)", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "K35 (F1,C6)", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "K36 (F1,C7)", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "K37 (F1,F4)", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "K38 (F1,F0)", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": "K39 (F1,E6)", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": "K3A (F1,D1)", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "K3B (F1,D2)", "matrix": [3, 11], "x": 11.25, "y": 3 }, + { "label": "K3D (F1,D5)", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 }, + { "label": "K40 (D0,D6)", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "label": "K41 (D0,D4)", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "label": "K43 (D0,B4)", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 }, + { "label": "K46 (D0,C7)", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, + { "label": "K4A (D0,D1)", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 }, + { "label": "K4B (D0,D2)", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 }, + { "label": "K4D (D0,D5)", "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 }, + { "label": "K4E (D0,B0)", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 } + ] } } } \ No newline at end of file diff --git a/keyboards/linworks/fave60/rules.mk b/keyboards/linworks/fave60/rules.mk index cc3f2b1db207..e69de29bb2d1 100644 --- a/keyboards/linworks/fave60/rules.mk +++ b/keyboards/linworks/fave60/rules.mk @@ -1,17 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow From 87c66e102997cd69d489ac8a21a81a2cb2a3954e Mon Sep 17 00:00:00 2001 From: duilchoi Date: Wed, 10 May 2023 03:08:39 +0900 Subject: [PATCH 04/33] update rgb_matrix update rgb_matrix --- keyboards/linworks/fave60/config.h | 41 +++++++++++++++++++++++++++++ keyboards/linworks/fave60/info.json | 23 ---------------- 2 files changed, 41 insertions(+), 23 deletions(-) create mode 100644 keyboards/linworks/fave60/config.h diff --git a/keyboards/linworks/fave60/config.h b/keyboards/linworks/fave60/config.h new file mode 100644 index 000000000000..3e8b756bb8ed --- /dev/null +++ b/keyboards/linworks/fave60/config.h @@ -0,0 +1,41 @@ +/* +Copyright 2020 Moritz Plattner + +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 . +*/ + +/* number of backlight levels */ +#define BACKLIGHT_PIN B7 +#define BACKLIGHT_LEVELS 3 +#define BACKLIGHT_BREATHING +#define BACKLIGHT_ON_STATE 1 + +#define RGB_DI_PIN F5 +#define RGBLED_NUM 18 +#define RGBLIGHT_SLEEP // Turns LEDs off if the PC goes to sleep/shutdown +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL + +/* 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 + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index 3a2461e2d1a1..dd9cc464c1d6 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -2,12 +2,6 @@ "manufacturer": "Lx3", "keyboard_name": "fave60", "maintainer": "keydler", - "backlight": { - "breathing": false, - "levels": 3, - "on_state": 1, - "pin": "B7" - }, "bootloader": "atmel-dfu", "debounce": 5, "diode_direction": "COL2ROW", @@ -36,23 +30,6 @@ "processor": "atmega32u4", "processor_type": "avr", "protocol": "LUFA", - "rgblight": { - "led_count": 18, - "pin": "F5", - "sleep": false, - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": true, - "snake": true, - "static_gradient": true, - "twinkle": true - } - }, "url": "", "usb": { "device_version": "1.0.0", From 65d196a31f241332418e1b4d5468862b701b67c3 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Fri, 12 May 2023 08:17:10 +0900 Subject: [PATCH 05/33] Update keyboards/linworks/fave60/readme.md thanks bro! Co-authored-by: Drashna Jaelre --- keyboards/linworks/fave60/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/linworks/fave60/readme.md b/keyboards/linworks/fave60/readme.md index e3d6a91e3dd7..1d98785a4eef 100644 --- a/keyboards/linworks/fave60/readme.md +++ b/keyboards/linworks/fave60/readme.md @@ -1,7 +1,7 @@ # linworks/fave60 -![linworks/fave60 front] (https://imgur.com/lv97Ymu) -![linworks/fave60 back] https://imgur.com/xBLhQIo +![linworks/fave60 front](https://i.imgur.com/lv97Ymuh.png) +![linworks/fave60 back](https://i.imgur.com/xBLhQIoh.png) *A short description of the keyboard/project* From 94df9a436782e4a6abc0c23018719f6bb4047ed4 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Fri, 12 May 2023 08:17:28 +0900 Subject: [PATCH 06/33] Update keyboards/linworks/fave60/info.json thanks bro! Co-authored-by: Drashna Jaelre --- keyboards/linworks/fave60/info.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index dd9cc464c1d6..5078fc5a3e10 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -19,10 +19,6 @@ "cols": ["D6", "D4", "B5", "B4", "B6", "C6", "C7", "F4", "F0", "E6", "D1", "D2", "D3", "D5", "B0"], "rows": ["F6", "F7", "D7", "F1", "D0"] }, - "matrix_size": { - "cols": 15, - "rows": 5 - }, "mouse_key": { "enabled": true }, From 54f94f801a5f4864932ef186841d46aa8d724455 Mon Sep 17 00:00:00 2001 From: duilchoi Date: Fri, 12 May 2023 08:22:15 +0900 Subject: [PATCH 07/33] update config.h update config.h --- keyboards/linworks/fave60/config.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/linworks/fave60/config.h b/keyboards/linworks/fave60/config.h index 3e8b756bb8ed..c94a5004322f 100644 --- a/keyboards/linworks/fave60/config.h +++ b/keyboards/linworks/fave60/config.h @@ -34,8 +34,3 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - From d46de39e7b1e4e3b53bb10ff0b9122d6756032ec Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Fri, 12 May 2023 14:38:44 +0900 Subject: [PATCH 08/33] Update keyboards/linworks/fave60/info.json thanks bro! Co-authored-by: Drashna Jaelre --- keyboards/linworks/fave60/info.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index 5078fc5a3e10..1c9bf774527a 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -19,13 +19,8 @@ "cols": ["D6", "D4", "B5", "B4", "B6", "C6", "C7", "F4", "F0", "E6", "D1", "D2", "D3", "D5", "B0"], "rows": ["F6", "F7", "D7", "F1", "D0"] }, - "mouse_key": { - "enabled": true - }, - "platform": "unknown", "processor": "atmega32u4", - "processor_type": "avr", - "protocol": "LUFA", + "bootloader": "atmel-dfu", "url": "", "usb": { "device_version": "1.0.0", From a4a8388feb4997c5ab672978420d8cd87f3f2c48 Mon Sep 17 00:00:00 2001 From: duilchoi Date: Fri, 12 May 2023 14:55:36 +0900 Subject: [PATCH 09/33] Update info.json --- keyboards/linworks/fave60/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index 1c9bf774527a..336eb1895d0e 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -2,6 +2,7 @@ "manufacturer": "Lx3", "keyboard_name": "fave60", "maintainer": "keydler", + "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 5, "diode_direction": "COL2ROW", @@ -19,8 +20,6 @@ "cols": ["D6", "D4", "B5", "B4", "B6", "C6", "C7", "F4", "F0", "E6", "D1", "D2", "D3", "D5", "B0"], "rows": ["F6", "F7", "D7", "F1", "D0"] }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", "url": "", "usb": { "device_version": "1.0.0", From 510f80bf6ed693345b526e88c466d552306172e6 Mon Sep 17 00:00:00 2001 From: duilchoi Date: Fri, 12 May 2023 17:11:28 +0900 Subject: [PATCH 10/33] Update info.json --- keyboards/linworks/fave60/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index 336eb1895d0e..e777b88b8c4d 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -28,7 +28,6 @@ }, "layouts": { "LAYOUT": { - "c_macro": false, "layout": [ { "label": "K00 (F6,D6)", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "K01 (F6,D4)", "matrix": [0, 1], "x": 1, "y": 0 }, From 5fa36b46aac103883fc04849981099688084ae7f Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Sun, 14 May 2023 19:03:13 +0900 Subject: [PATCH 11/33] Update keyboards/linworks/fave60/config.h Co-authored-by: Drashna Jaelre --- keyboards/linworks/fave60/config.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/linworks/fave60/config.h b/keyboards/linworks/fave60/config.h index c94a5004322f..6c30a62f3f64 100644 --- a/keyboards/linworks/fave60/config.h +++ b/keyboards/linworks/fave60/config.h @@ -21,7 +21,8 @@ along with this program. If not, see . #define BACKLIGHT_BREATHING #define BACKLIGHT_ON_STATE 1 -#define RGB_DI_PIN F5 +#define WS2812_DI_PIN F5 +#define RGB_DI_PIN WS2812_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_SLEEP // Turns LEDs off if the PC goes to sleep/shutdown #define RGBLIGHT_EFFECT_BREATHING From 9585034b0f48ed2cecd7888f0a4483bd0ed29148 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Sun, 14 May 2023 23:28:07 +0900 Subject: [PATCH 12/33] Update keyboards/linworks/fave60/info.json Co-authored-by: Ryan --- keyboards/linworks/fave60/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index e777b88b8c4d..99600ccccfd9 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -4,7 +4,6 @@ "maintainer": "keydler", "processor": "atmega32u4", "bootloader": "atmel-dfu", - "debounce": 5, "diode_direction": "COL2ROW", "features": { "backlight": true, From 23dfaa408e25ea0196928a6b820109d3fe086851 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Sun, 14 May 2023 23:28:25 +0900 Subject: [PATCH 13/33] Update keyboards/linworks/fave60/info.json Co-authored-by: Ryan --- keyboards/linworks/fave60/info.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index 99600ccccfd9..0841c07b306c 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -4,6 +4,10 @@ "maintainer": "keydler", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "backlight": { + "pin": "B7", + "breathing": true + }, "diode_direction": "COL2ROW", "features": { "backlight": true, From 28124d9fdef7157317d240202545e7bb1582f046 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Sun, 14 May 2023 23:31:25 +0900 Subject: [PATCH 14/33] Update readme.md --- keyboards/linworks/fave60/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/linworks/fave60/readme.md b/keyboards/linworks/fave60/readme.md index 1d98785a4eef..000c3a82a458 100644 --- a/keyboards/linworks/fave60/readme.md +++ b/keyboards/linworks/fave60/readme.md @@ -4,6 +4,7 @@ ![linworks/fave60 back](https://i.imgur.com/xBLhQIoh.png) *A short description of the keyboard/project* +The Fave60 PCB is a 60 keys keyboard designed by Lx3 (Linworks). * Keyboard Maintainer: [keydler](https://github.com/duilchoi) * Hardware Supported: *The PCBs, controllers supported* From 3668c03d6a1e44c6abcb9f5932aebda0084d5ee5 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Sun, 14 May 2023 23:31:44 +0900 Subject: [PATCH 15/33] Update keyboards/linworks/fave60/config.h Co-authored-by: Ryan --- keyboards/linworks/fave60/config.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/keyboards/linworks/fave60/config.h b/keyboards/linworks/fave60/config.h index 6c30a62f3f64..135f7bf3c55c 100644 --- a/keyboards/linworks/fave60/config.h +++ b/keyboards/linworks/fave60/config.h @@ -15,12 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* number of backlight levels */ -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 3 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_ON_STATE 1 - #define WS2812_DI_PIN F5 #define RGB_DI_PIN WS2812_DI_PIN #define RGBLED_NUM 18 From 7c07e6041f072ba67a9e29269dbfae37e288aed9 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Mon, 15 May 2023 10:17:32 +0900 Subject: [PATCH 16/33] Update keyboards/linworks/fave60/readme.md Co-authored-by: Ryan --- keyboards/linworks/fave60/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/linworks/fave60/readme.md b/keyboards/linworks/fave60/readme.md index 000c3a82a458..49dc6edfbdae 100644 --- a/keyboards/linworks/fave60/readme.md +++ b/keyboards/linworks/fave60/readme.md @@ -3,7 +3,6 @@ ![linworks/fave60 front](https://i.imgur.com/lv97Ymuh.png) ![linworks/fave60 back](https://i.imgur.com/xBLhQIoh.png) -*A short description of the keyboard/project* The Fave60 PCB is a 60 keys keyboard designed by Lx3 (Linworks). * Keyboard Maintainer: [keydler](https://github.com/duilchoi) From b6620655959f4c0f52976c2202b8352f3bc855ed Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Mon, 15 May 2023 10:28:02 +0900 Subject: [PATCH 17/33] Update readme.md --- keyboards/linworks/fave60/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/linworks/fave60/readme.md b/keyboards/linworks/fave60/readme.md index 49dc6edfbdae..234010e00c6b 100644 --- a/keyboards/linworks/fave60/readme.md +++ b/keyboards/linworks/fave60/readme.md @@ -6,8 +6,8 @@ The Fave60 PCB is a 60 keys keyboard designed by Lx3 (Linworks). * Keyboard Maintainer: [keydler](https://github.com/duilchoi) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Hardware Supported: Fave 60 PCBs +* Hardware Availability: Groupbuy.Check the ongoing ones on [the Linworks Discord](https://discord.gg/UC8gTdVnsj) Make example for this keyboard (after setting up your build environment): From d1800566c904c1d06ea1dfb05c8ccc6094fe7286 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Tue, 30 May 2023 13:21:16 +0900 Subject: [PATCH 18/33] Update keyboards/linworks/fave60/config.h Co-authored-by: Drashna Jaelre --- keyboards/linworks/fave60/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/linworks/fave60/config.h b/keyboards/linworks/fave60/config.h index 135f7bf3c55c..541f8e1e25a8 100644 --- a/keyboards/linworks/fave60/config.h +++ b/keyboards/linworks/fave60/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #define WS2812_DI_PIN F5 -#define RGB_DI_PIN WS2812_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_SLEEP // Turns LEDs off if the PC goes to sleep/shutdown #define RGBLIGHT_EFFECT_BREATHING From 35e464c15946e9ed35be2f9240d537c74dfa18a3 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Mon, 5 Jun 2023 18:38:51 +0900 Subject: [PATCH 19/33] Update keyboards/linworks/fave60/config.h Co-authored-by: Ryan --- keyboards/linworks/fave60/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/linworks/fave60/config.h b/keyboards/linworks/fave60/config.h index 541f8e1e25a8..aa8c4659a82b 100644 --- a/keyboards/linworks/fave60/config.h +++ b/keyboards/linworks/fave60/config.h @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#define WS2812_DI_PIN F5 #define RGBLED_NUM 18 #define RGBLIGHT_SLEEP // Turns LEDs off if the PC goes to sleep/shutdown #define RGBLIGHT_EFFECT_BREATHING From 94a3069085a80499658320204348c67b6172e3bc Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Mon, 5 Jun 2023 18:39:06 +0900 Subject: [PATCH 20/33] Update keyboards/linworks/fave60/info.json Co-authored-by: Ryan --- keyboards/linworks/fave60/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index 0841c07b306c..2e16f0141e7c 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -8,6 +8,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "F5" + }, "diode_direction": "COL2ROW", "features": { "backlight": true, From 6cb491d04b7d2f68f8d8cdc9178323833fc7d817 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Tue, 4 Jul 2023 11:03:22 +0900 Subject: [PATCH 21/33] Update config.h --- keyboards/linworks/fave60/config.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/keyboards/linworks/fave60/config.h b/keyboards/linworks/fave60/config.h index aa8c4659a82b..1be15def4dd0 100644 --- a/keyboards/linworks/fave60/config.h +++ b/keyboards/linworks/fave60/config.h @@ -15,12 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#define RGBLED_NUM 18 -#define RGBLIGHT_SLEEP // Turns LEDs off if the PC goes to sleep/shutdown -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE From fd46eea5b48f11891c51d50f9c62b27594467963 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Tue, 4 Jul 2023 11:04:11 +0900 Subject: [PATCH 22/33] Update info.json --- keyboards/linworks/fave60/info.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index 2e16f0141e7c..b34d8eca4ec9 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -8,8 +8,17 @@ "pin": "B7", "breathing": true }, - "ws2812": { - "pin": "F5" + "rgblight": { + "pin": "F5", + "led_count":18, + "sleep":true, + "animations": { + "knight":true, + "rainbow_mood":true, + "rainbow_swirl":true, + "snake":true, + "twinkle":true + } }, "diode_direction": "COL2ROW", "features": { @@ -99,4 +108,4 @@ ] } } -} \ No newline at end of file +} From 578209770e38505aa3a3f741f1925723d30c7eaf Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Tue, 4 Jul 2023 11:08:47 +0900 Subject: [PATCH 23/33] Update info.json --- keyboards/linworks/fave60/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index b34d8eca4ec9..fc8dcd551d9d 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -8,7 +8,7 @@ "pin": "B7", "breathing": true }, - "rgblight": { + "ws2812": { "pin": "F5", "led_count":18, "sleep":true, From e9d3421537865d124f602dad9d45df5c51ef6d85 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Tue, 4 Jul 2023 11:11:58 +0900 Subject: [PATCH 24/33] Update info.json --- keyboards/linworks/fave60/info.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index fc8dcd551d9d..1b0993d4da6b 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -8,7 +8,10 @@ "pin": "B7", "breathing": true }, - "ws2812": { + "ws2812": { + "pin": "F5", + }, + "rgblight": { "pin": "F5", "led_count":18, "sleep":true, From bbe95c72f346b9e856fc3de67a711bb3296b06c0 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Tue, 4 Jul 2023 11:22:59 +0900 Subject: [PATCH 25/33] Update info.json --- keyboards/linworks/fave60/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index 1b0993d4da6b..5885c94fba79 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -12,7 +12,6 @@ "pin": "F5", }, "rgblight": { - "pin": "F5", "led_count":18, "sleep":true, "animations": { From bbd9fd777b4bcd672baa77f5d40a7fdce663124d Mon Sep 17 00:00:00 2001 From: duilchoi Date: Tue, 4 Jul 2023 11:53:49 +0900 Subject: [PATCH 26/33] Update info.json --- keyboards/linworks/fave60/info.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index 5885c94fba79..a90a192f7931 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -8,10 +8,8 @@ "pin": "B7", "breathing": true }, - "ws2812": { - "pin": "F5", - }, "rgblight": { + "pin": "F5", "led_count":18, "sleep":true, "animations": { From 91289a6702261e98609a8bb7f0de268ef5d5aff7 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Tue, 4 Jul 2023 12:53:44 +0900 Subject: [PATCH 27/33] Update keyboards/linworks/fave60/info.json Co-authored-by: Ryan --- keyboards/linworks/fave60/info.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index a90a192f7931..a7bf49b0aafb 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -7,9 +7,11 @@ "backlight": { "pin": "B7", "breathing": true + }, + "ws2812": { + "pin": "F5" }, "rgblight": { - "pin": "F5", "led_count":18, "sleep":true, "animations": { From a27e235d4ebf6f7c69e91bae204c5eb8a8d71484 Mon Sep 17 00:00:00 2001 From: duilchoi Date: Sat, 19 Aug 2023 18:10:10 +0900 Subject: [PATCH 28/33] keylayout update keylayout update --- keyboards/linworks/fave60/info.json | 256 +++++++++++++----- .../linworks/fave60/keymaps/default/keymap.c | 4 +- .../linworks/fave60/keymaps/via/keymap.c | 4 +- 3 files changed, 198 insertions(+), 66 deletions(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index a7bf49b0aafb..1297ab585963 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -44,70 +44,202 @@ "vid": "0x4C58" }, "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ - { "label": "K00 (F6,D6)", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "K01 (F6,D4)", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "K02 (F6,B5)", "matrix": [0, 2], "x": 2, "y": 0 }, - { "label": "K03 (F6,B4)", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "K04 (F6,B6)", "matrix": [0, 4], "x": 4, "y": 0 }, - { "label": "K05 (F6,C6)", "matrix": [0, 5], "x": 5, "y": 0 }, - { "label": "K06 (F6,C7)", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "K07 (F6,F4)", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "K08 (F6,F0)", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "K09 (F6,E6)", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": "K0A (F6,D1)", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "K0B (F6,D2)", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "K0C (F6,D3)", "matrix": [0, 12], "x": 12, "y": 0 }, - { "label": "K0E (F6,B0)", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 }, - { "label": "K10 (F7,D6)", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "K12 (F7,B5)", "matrix": [1, 2], "x": 1.5, "y": 1 }, - { "label": "K13 (F7,B4)", "matrix": [1, 3], "x": 2.5, "y": 1 }, - { "label": "K14 (F7,B6)", "matrix": [1, 4], "x": 3.5, "y": 1 }, - { "label": "K15 (F7,C6)", "matrix": [1, 5], "x": 4.5, "y": 1 }, - { "label": "K16 (F7,C7)", "matrix": [1, 6], "x": 5.5, "y": 1 }, - { "label": "K17 (F7,F4)", "matrix": [1, 7], "x": 6.5, "y": 1 }, - { "label": "K18 (F7,F0)", "matrix": [1, 8], "x": 7.5, "y": 1 }, - { "label": "K19 (F7,E6)", "matrix": [1, 9], "x": 8.5, "y": 1 }, - { "label": "K1A (F7,D1)", "matrix": [1, 10], "x": 9.5, "y": 1 }, - { "label": "K1B (F7,D2)", "matrix": [1, 11], "x": 10.5, "y": 1 }, - { "label": "K1C (F7,D3)", "matrix": [1, 12], "x": 11.5, "y": 1 }, - { "label": "K1D (F7,D5)", "matrix": [1, 13], "x": 12.5, "y": 1 }, - { "label": "K1E (F7,B0)", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "K20 (D7,D6)", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "K22 (D7,B5)", "matrix": [2, 2], "x": 1.75, "y": 2 }, - { "label": "K23 (D7,B4)", "matrix": [2, 3], "x": 2.75, "y": 2 }, - { "label": "K24 (D7,B6)", "matrix": [2, 4], "x": 3.75, "y": 2 }, - { "label": "K25 (D7,C6)", "matrix": [2, 5], "x": 4.75, "y": 2 }, - { "label": "K26 (D7,C7)", "matrix": [2, 6], "x": 5.75, "y": 2 }, - { "label": "K27 (D7,F4)", "matrix": [2, 7], "x": 6.75, "y": 2 }, - { "label": "K28 (D7,F0)", "matrix": [2, 8], "x": 7.75, "y": 2 }, - { "label": "K29 (D7,E6)", "matrix": [2, 9], "x": 8.75, "y": 2 }, - { "label": "K2A (D7,D1)", "matrix": [2, 10], "x": 9.75, "y": 2 }, - { "label": "K2B (D7,D2)", "matrix": [2, 11], "x": 10.75, "y": 2 }, - { "label": "K2C (D7,D3)", "matrix": [2, 12], "x": 11.75, "y": 2 }, - { "label": "K2D (D7,D5)", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, - { "label": "K31 (F1,D4)", "matrix": [3, 1], "w": 2.25, "x": 0, "y": 3 }, - { "label": "K32 (F1,B5)", "matrix": [3, 2], "x": 2.25, "y": 3 }, - { "label": "K33 (F1,B4)", "matrix": [3, 3], "x": 3.25, "y": 3 }, - { "label": "K34 (F1,B6)", "matrix": [3, 4], "x": 4.25, "y": 3 }, - { "label": "K35 (F1,C6)", "matrix": [3, 5], "x": 5.25, "y": 3 }, - { "label": "K36 (F1,C7)", "matrix": [3, 6], "x": 6.25, "y": 3 }, - { "label": "K37 (F1,F4)", "matrix": [3, 7], "x": 7.25, "y": 3 }, - { "label": "K38 (F1,F0)", "matrix": [3, 8], "x": 8.25, "y": 3 }, - { "label": "K39 (F1,E6)", "matrix": [3, 9], "x": 9.25, "y": 3 }, - { "label": "K3A (F1,D1)", "matrix": [3, 10], "x": 10.25, "y": 3 }, - { "label": "K3B (F1,D2)", "matrix": [3, 11], "x": 11.25, "y": 3 }, - { "label": "K3D (F1,D5)", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 }, - { "label": "K40 (D0,D6)", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "label": "K41 (D0,D4)", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, - { "label": "K43 (D0,B4)", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 }, - { "label": "K46 (D0,C7)", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, - { "label": "K4A (D0,D1)", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 }, - { "label": "K4B (D0,D2)", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 }, - { "label": "K4D (D0,D5)", "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 }, - { "label": "K4E (D0,B0)", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 } + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 14], "w": 2, "x": 13, "y": 0 }, + { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 2], "x": 1.5, "y": 1 }, + { "matrix": [1, 3], "x": 2.5, "y": 1 }, + { "matrix": [1, 4], "x": 3.5, "y": 1 }, + { "matrix": [1, 5], "x": 4.5, "y": 1 }, + { "matrix": [1, 6], "x": 5.5, "y": 1 }, + { "matrix": [1, 7], "x": 6.5, "y": 1 }, + { "matrix": [1, 8], "x": 7.5, "y": 1 }, + { "matrix": [1, 9], "x": 8.5, "y": 1 }, + { "matrix": [1, 10], "x": 9.5, "y": 1 }, + { "matrix": [1, 11], "x": 10.5, "y": 1 }, + { "matrix": [1, 12], "x": 11.5, "y": 1 }, + { "matrix": [1, 13], "x": 12.5, "y": 1 }, + { "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 }, + { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 2], "x": 1.75, "y": 2 }, + { "matrix": [2, 3], "x": 2.75, "y": 2 }, + { "matrix": [2, 4], "x": 3.75, "y": 2 }, + { "matrix": [2, 5], "x": 4.75, "y": 2 }, + { "matrix": [2, 6], "x": 5.75, "y": 2 }, + { "matrix": [2, 7], "x": 6.75, "y": 2 }, + { "matrix": [2, 8], "x": 7.75, "y": 2 }, + { "matrix": [2, 9], "x": 8.75, "y": 2 }, + { "matrix": [2, 10], "x": 9.75, "y": 2 }, + { "matrix": [2, 11], "x": 10.75, "y": 2 }, + { "matrix": [2, 12], "x": 11.75, "y": 2 }, + { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "matrix": [3, 1], "w": 2.25, "x": 0, "y": 3 }, + { "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "matrix": [3, 11], "x": 11.25, "y": 3 }, + { "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 }, + { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 }, + { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 }, + { "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 } + ] + }, + + "LAYOUT_winkeyless": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 14], "w": 2, "x": 13, "y": 0 }, + { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 2], "x": 1.5, "y": 1 }, + { "matrix": [1, 3], "x": 2.5, "y": 1 }, + { "matrix": [1, 4], "x": 3.5, "y": 1 }, + { "matrix": [1, 5], "x": 4.5, "y": 1 }, + { "matrix": [1, 6], "x": 5.5, "y": 1 }, + { "matrix": [1, 7], "x": 6.5, "y": 1 }, + { "matrix": [1, 8], "x": 7.5, "y": 1 }, + { "matrix": [1, 9], "x": 8.5, "y": 1 }, + { "matrix": [1, 10], "x": 9.5, "y": 1 }, + { "matrix": [1, 11], "x": 10.5, "y": 1 }, + { "matrix": [1, 12], "x": 11.5, "y": 1 }, + { "matrix": [1, 13], "x": 12.5, "y": 1 }, + { "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 }, + { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 2], "x": 1.75, "y": 2 }, + { "matrix": [2, 3], "x": 2.75, "y": 2 }, + { "matrix": [2, 4], "x": 3.75, "y": 2 }, + { "matrix": [2, 5], "x": 4.75, "y": 2 }, + { "matrix": [2, 6], "x": 5.75, "y": 2 }, + { "matrix": [2, 7], "x": 6.75, "y": 2 }, + { "matrix": [2, 8], "x": 7.75, "y": 2 }, + { "matrix": [2, 9], "x": 8.75, "y": 2 }, + { "matrix": [2, 10], "x": 9.75, "y": 2 }, + { "matrix": [2, 11], "x": 10.75, "y": 2 }, + { "matrix": [2, 12], "x": 11.75, "y": 2 }, + { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "matrix": [3, 1], "w": 2.25, "x": 0, "y": 3 }, + { "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "matrix": [3, 11], "x": 11.25, "y": 3 }, + { "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 }, + { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 }, + { "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 }, + { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 }, + { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 }, + { "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 } + ] + }, + + "LAYOUT_winkeyless_split": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "x": 13, "y": 0 }, + { "matrix": [0, 14], "x": 14, "y": 0 }, + { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 2], "x": 1.5, "y": 1 }, + { "matrix": [1, 3], "x": 2.5, "y": 1 }, + { "matrix": [1, 4], "x": 3.5, "y": 1 }, + { "matrix": [1, 5], "x": 4.5, "y": 1 }, + { "matrix": [1, 6], "x": 5.5, "y": 1 }, + { "matrix": [1, 7], "x": 6.5, "y": 1 }, + { "matrix": [1, 8], "x": 7.5, "y": 1 }, + { "matrix": [1, 9], "x": 8.5, "y": 1 }, + { "matrix": [1, 10], "x": 9.5, "y": 1 }, + { "matrix": [1, 11], "x": 10.5, "y": 1 }, + { "matrix": [1, 12], "x": 11.5, "y": 1 }, + { "matrix": [1, 13], "x": 12.5, "y": 1 }, + { "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 }, + { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 2], "x": 1.75, "y": 2 }, + { "matrix": [2, 3], "x": 2.75, "y": 2 }, + { "matrix": [2, 4], "x": 3.75, "y": 2 }, + { "matrix": [2, 5], "x": 4.75, "y": 2 }, + { "matrix": [2, 6], "x": 5.75, "y": 2 }, + { "matrix": [2, 7], "x": 6.75, "y": 2 }, + { "matrix": [2, 8], "x": 7.75, "y": 2 }, + { "matrix": [2, 9], "x": 8.75, "y": 2 }, + { "matrix": [2, 10], "x": 9.75, "y": 2 }, + { "matrix": [2, 11], "x": 10.75, "y": 2 }, + { "matrix": [2, 12], "x": 11.75, "y": 2 }, + { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "matrix": [3, 1], "w": 2.25, "x": 0, "y": 3 }, + { "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "matrix": [3, 11], "x": 11.25, "y": 3 }, + { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, + { "matrix": [3, 14], "x": 14, "y": 3 }, + { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 }, + { "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 }, + { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 }, + { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 }, + { "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 } ] } } } + + + + diff --git a/keyboards/linworks/fave60/keymaps/default/keymap.c b/keyboards/linworks/fave60/keymaps/default/keymap.c index 64595c838ab0..3fa20fe9c031 100644 --- a/keyboards/linworks/fave60/keymaps/default/keymap.c +++ b/keyboards/linworks/fave60/keymaps/default/keymap.c @@ -16,14 +16,14 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_all( 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_BSPC, 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_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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL ), - [1] = LAYOUT( + [1] = LAYOUT_all( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, _______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_LCBR, KC_RCBR, KC_PIPE, _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, KC_COLN, KC_DQUO, _______, diff --git a/keyboards/linworks/fave60/keymaps/via/keymap.c b/keyboards/linworks/fave60/keymaps/via/keymap.c index 64595c838ab0..3fa20fe9c031 100644 --- a/keyboards/linworks/fave60/keymaps/via/keymap.c +++ b/keyboards/linworks/fave60/keymaps/via/keymap.c @@ -16,14 +16,14 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_all( 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_BSPC, 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_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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL ), - [1] = LAYOUT( + [1] = LAYOUT_all( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, _______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_LCBR, KC_RCBR, KC_PIPE, _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, KC_COLN, KC_DQUO, _______, From 577bedc86fda34f896c365c7da8689bb3396a0bc Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Sun, 24 Sep 2023 22:07:00 +0900 Subject: [PATCH 29/33] Update keyboards/linworks/fave60/info.json Co-authored-by: Duncan Sutherland --- keyboards/linworks/fave60/info.json | 213 +++++++++++++++++++++++++++- 1 file changed, 207 insertions(+), 6 deletions(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index 1297ab585963..6a9676932c9d 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -43,8 +43,17 @@ "pid": "0x000D", "vid": "0x4C58" }, + "Layout_aliases": { + "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift" + }, + "community_layouts": [ + "60_ansi", + "60_ansi_tsangan", + "60_ansi_split_bs_rshift", + "60_tsangan_hhkb" + ], "layouts": { - "LAYOUT_all": { + "LAYOUT_60_ansi": { "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 }, @@ -109,7 +118,203 @@ { "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 } ] }, - + "LAYOUT_60_ansi_split_bs_rshift": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "x": 13, "y": 0 }, + { "matrix": [0, 14], "x": 14, "y": 0 }, + { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 2], "x": 1.5, "y": 1 }, + { "matrix": [1, 3], "x": 2.5, "y": 1 }, + { "matrix": [1, 4], "x": 3.5, "y": 1 }, + { "matrix": [1, 5], "x": 4.5, "y": 1 }, + { "matrix": [1, 6], "x": 5.5, "y": 1 }, + { "matrix": [1, 7], "x": 6.5, "y": 1 }, + { "matrix": [1, 8], "x": 7.5, "y": 1 }, + { "matrix": [1, 9], "x": 8.5, "y": 1 }, + { "matrix": [1, 10], "x": 9.5, "y": 1 }, + { "matrix": [1, 11], "x": 10.5, "y": 1 }, + { "matrix": [1, 12], "x": 11.5, "y": 1 }, + { "matrix": [1, 13], "x": 12.5, "y": 1 }, + { "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 }, + { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 2], "x": 1.75, "y": 2 }, + { "matrix": [2, 3], "x": 2.75, "y": 2 }, + { "matrix": [2, 4], "x": 3.75, "y": 2 }, + { "matrix": [2, 5], "x": 4.75, "y": 2 }, + { "matrix": [2, 6], "x": 5.75, "y": 2 }, + { "matrix": [2, 7], "x": 6.75, "y": 2 }, + { "matrix": [2, 8], "x": 7.75, "y": 2 }, + { "matrix": [2, 9], "x": 8.75, "y": 2 }, + { "matrix": [2, 10], "x": 9.75, "y": 2 }, + { "matrix": [2, 11], "x": 10.75, "y": 2 }, + { "matrix": [2, 12], "x": 11.75, "y": 2 }, + { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "matrix": [3, 1], "w": 2.25, "x": 0, "y": 3 }, + { "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "matrix": [3, 11], "x": 11.25, "y": 3 }, + { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, + { "matrix": [3, 14], "x": 14, "y": 3 }, + { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 }, + { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 }, + { "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 } + ] + }, + "LAYOUT_60_ansi_tsangan": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 14], "w": 2, "x": 13, "y": 0 }, + { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 2], "x": 1.5, "y": 1 }, + { "matrix": [1, 3], "x": 2.5, "y": 1 }, + { "matrix": [1, 4], "x": 3.5, "y": 1 }, + { "matrix": [1, 5], "x": 4.5, "y": 1 }, + { "matrix": [1, 6], "x": 5.5, "y": 1 }, + { "matrix": [1, 7], "x": 6.5, "y": 1 }, + { "matrix": [1, 8], "x": 7.5, "y": 1 }, + { "matrix": [1, 9], "x": 8.5, "y": 1 }, + { "matrix": [1, 10], "x": 9.5, "y": 1 }, + { "matrix": [1, 11], "x": 10.5, "y": 1 }, + { "matrix": [1, 12], "x": 11.5, "y": 1 }, + { "matrix": [1, 13], "x": 12.5, "y": 1 }, + { "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 }, + { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 2], "x": 1.75, "y": 2 }, + { "matrix": [2, 3], "x": 2.75, "y": 2 }, + { "matrix": [2, 4], "x": 3.75, "y": 2 }, + { "matrix": [2, 5], "x": 4.75, "y": 2 }, + { "matrix": [2, 6], "x": 5.75, "y": 2 }, + { "matrix": [2, 7], "x": 6.75, "y": 2 }, + { "matrix": [2, 8], "x": 7.75, "y": 2 }, + { "matrix": [2, 9], "x": 8.75, "y": 2 }, + { "matrix": [2, 10], "x": 9.75, "y": 2 }, + { "matrix": [2, 11], "x": 10.75, "y": 2 }, + { "matrix": [2, 12], "x": 11.75, "y": 2 }, + { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "matrix": [3, 1], "w": 2.25, "x": 0, "y": 3 }, + { "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "matrix": [3, 11], "x": 11.25, "y": 3 }, + { "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 }, + { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 }, + { "matrix": [4, 1], "x": 1.5, "y": 4 }, + { "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 }, + { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 }, + { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 }, + { "matrix": [4, 13], "x": 12.5, "y": 4 }, + { "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 } + ] + }, + "LAYOUT_60_tsangan_hhkb": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "x": 13, "y": 0 }, + { "matrix": [0, 14], "x": 14, "y": 0 }, + { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 2], "x": 1.5, "y": 1 }, + { "matrix": [1, 3], "x": 2.5, "y": 1 }, + { "matrix": [1, 4], "x": 3.5, "y": 1 }, + { "matrix": [1, 5], "x": 4.5, "y": 1 }, + { "matrix": [1, 6], "x": 5.5, "y": 1 }, + { "matrix": [1, 7], "x": 6.5, "y": 1 }, + { "matrix": [1, 8], "x": 7.5, "y": 1 }, + { "matrix": [1, 9], "x": 8.5, "y": 1 }, + { "matrix": [1, 10], "x": 9.5, "y": 1 }, + { "matrix": [1, 11], "x": 10.5, "y": 1 }, + { "matrix": [1, 12], "x": 11.5, "y": 1 }, + { "matrix": [1, 13], "x": 12.5, "y": 1 }, + { "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 }, + { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 2], "x": 1.75, "y": 2 }, + { "matrix": [2, 3], "x": 2.75, "y": 2 }, + { "matrix": [2, 4], "x": 3.75, "y": 2 }, + { "matrix": [2, 5], "x": 4.75, "y": 2 }, + { "matrix": [2, 6], "x": 5.75, "y": 2 }, + { "matrix": [2, 7], "x": 6.75, "y": 2 }, + { "matrix": [2, 8], "x": 7.75, "y": 2 }, + { "matrix": [2, 9], "x": 8.75, "y": 2 }, + { "matrix": [2, 10], "x": 9.75, "y": 2 }, + { "matrix": [2, 11], "x": 10.75, "y": 2 }, + { "matrix": [2, 12], "x": 11.75, "y": 2 }, + { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "matrix": [3, 1], "w": 2.25, "x": 0, "y": 3 }, + { "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "matrix": [3, 11], "x": 11.25, "y": 3 }, + { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, + { "matrix": [3, 14], "x": 14, "y": 3 }, + { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 }, + { "matrix": [4, 1], "x": 1.5, "y": 4 }, + { "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 }, + { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 }, + { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 }, + { "matrix": [4, 13], "x": 12.5, "y": 4 }, + { "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 } + ] + }, "LAYOUT_winkeyless": { "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, @@ -172,7 +377,6 @@ { "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 } ] }, - "LAYOUT_winkeyless_split": { "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, @@ -240,6 +444,3 @@ } } - - - From 134ae4a064ab3362afdc0b4680233859782c5dba Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Sun, 24 Sep 2023 22:07:11 +0900 Subject: [PATCH 30/33] Update keyboards/linworks/fave60/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland --- keyboards/linworks/fave60/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/linworks/fave60/keymaps/default/keymap.c b/keyboards/linworks/fave60/keymaps/default/keymap.c index 3fa20fe9c031..497aabde0fb2 100644 --- a/keyboards/linworks/fave60/keymaps/default/keymap.c +++ b/keyboards/linworks/fave60/keymaps/default/keymap.c @@ -16,14 +16,14 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT_60_ansi( 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_BSPC, 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_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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL ), - [1] = LAYOUT_all( + [1] = LAYOUT_60_ansi( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, _______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_LCBR, KC_RCBR, KC_PIPE, _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, KC_COLN, KC_DQUO, _______, From e1bf426c4391607435e1dfe0adce935f0faa2d02 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Sun, 24 Sep 2023 22:07:21 +0900 Subject: [PATCH 31/33] Update keyboards/linworks/fave60/keymaps/via/keymap.c Co-authored-by: Duncan Sutherland --- keyboards/linworks/fave60/keymaps/via/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/linworks/fave60/keymaps/via/keymap.c b/keyboards/linworks/fave60/keymaps/via/keymap.c index 3fa20fe9c031..497aabde0fb2 100644 --- a/keyboards/linworks/fave60/keymaps/via/keymap.c +++ b/keyboards/linworks/fave60/keymaps/via/keymap.c @@ -16,14 +16,14 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT_60_ansi( 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_BSPC, 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_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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL ), - [1] = LAYOUT_all( + [1] = LAYOUT_60_ansi( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, _______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_LCBR, KC_RCBR, KC_PIPE, _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, KC_COLN, KC_DQUO, _______, From e55658d816a1835a8c75c0951808eb70dcc93c59 Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Thu, 28 Sep 2023 12:21:28 +0900 Subject: [PATCH 32/33] Update keyboards/linworks/fave60/config.h Co-authored-by: Drashna Jaelre --- keyboards/linworks/fave60/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/linworks/fave60/config.h b/keyboards/linworks/fave60/config.h index 1be15def4dd0..55402104ddb0 100644 --- a/keyboards/linworks/fave60/config.h +++ b/keyboards/linworks/fave60/config.h @@ -15,6 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#pragma once + /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE From 969f0227862202543c2edfcc4e99c10f864d225f Mon Sep 17 00:00:00 2001 From: DUILCHOI <48977039+duilchoi@users.noreply.github.com> Date: Thu, 28 Sep 2023 12:21:35 +0900 Subject: [PATCH 33/33] Update keyboards/linworks/fave60/info.json Co-authored-by: Drashna Jaelre --- keyboards/linworks/fave60/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json index 6a9676932c9d..c801c594caee 100644 --- a/keyboards/linworks/fave60/info.json +++ b/keyboards/linworks/fave60/info.json @@ -12,14 +12,14 @@ "pin": "F5" }, "rgblight": { - "led_count":18, - "sleep":true, + "led_count": 18, + "sleep": true, "animations": { - "knight":true, - "rainbow_mood":true, - "rainbow_swirl":true, - "snake":true, - "twinkle":true + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "twinkle": true } }, "diode_direction": "COL2ROW",