From b5da2c9db9af1f29c5fac453371d99755c6f4931 Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Sun, 9 Apr 2023 21:00:44 -0400 Subject: [PATCH] March merge additions pt2 (#433) * fix: move more Vial keymaps to intended folders * fix: builds * fix: libra_mini * fix: pull upstream changes for binepad/bn009 * fix: velocifire/sun20pro * fix: ekow/akira --------- Co-authored-by: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com> --- keyboards/binepad/bn009/info.json | 49 ++--- .../binepad/bn009/keymaps/default/keymap.json | 4 +- keyboards/binepad/bn009/r1/config.h | 11 -- keyboards/binepad/bn009/r1/info.json | 23 +-- keyboards/binepad/bn009/r2/config.h | 1 + keyboards/binepad/bn009/r2/readme.md | 2 +- keyboards/binepad/bn009/r2/rules.mk | 6 +- keyboards/binepad/bn009/readme.md | 2 +- keyboards/binepad/bn009/rules.mk | 15 +- keyboards/binepad/bn009r2/config.h | 12 -- keyboards/binepad/bn009r2/info.json | 42 ---- .../bn009r2/keymaps/default/keymap.json | 15 -- .../binepad/bn009r2/keymaps/via/keymap.json | 35 ---- keyboards/binepad/bn009r2/readme.md | 27 --- keyboards/binepad/bn009r2/rules.mk | 1 - keyboards/bongopad/bongopad.c | 3 - keyboards/bongopad/bongopad.h | 20 -- keyboards/bongopad/config.h | 68 ------- keyboards/bongopad/keymaps/default/keymap.c | 177 ----------------- keyboards/bongopad/keymaps/vial/keymap.c | 184 ------------------ keyboards/bongopad/rules.mk | 60 ------ keyboards/ekow/akira/akira.c | 16 -- keyboards/ekow/akira/config.h | 3 + keyboards/ekow/akira/keymaps/vial/config.h | 2 +- keyboards/ekow/akira/rules.mk | 5 - .../{ => base}/keymaps/vial/config.h | 0 .../{ => base}/keymaps/vial/keymap.c | 0 .../{ => base}/keymaps/vial/rules.mk | 0 .../{ => base}/keymaps/vial/vial.json | 0 keyboards/helix/rev2/keymaps/vial/config.h | 25 +-- keyboards/helix/rev2/keymaps/vial/rules.mk | 13 +- keyboards/helix/rev2/keymaps/vial/vial.json | 4 +- keyboards/keebio/iris/keymaps/vial/config.h | 3 - keyboards/keebio/iris/keymaps/vial/rules.mk | 3 + keyboards/keebio/iris/keymaps/vial/vial.json | 5 +- .../vial_rev2 => rev2/keymaps/vial}/config.h | 2 +- .../vial_rev2 => rev2/keymaps/vial}/keymap.c | 0 .../vial_rev2 => rev2/keymaps/vial}/rules.mk | 0 .../vial_rev2 => rev2/keymaps/vial}/vial.json | 6 +- .../keycapsss/plaid_pad/keymaps/vial/rules.mk | 5 + .../dimple/staggered/keymaps/vial/config.h | 4 + .../dimple/staggered/keymaps/vial/rules.mk | 4 + keyboards/libra_mini/config.h | 5 +- keyboards/libra_mini/keymaps/vial/keymap.c | 2 +- .../lily58/{ => rev1}/keymaps/vial/config.h | 0 .../lily58/{ => rev1}/keymaps/vial/keymap.c | 0 .../lily58/{ => rev1}/keymaps/vial/rules.mk | 0 .../lily58/{ => rev1}/keymaps/vial/vial.json | 0 .../ll3macorn/bongopad/keymaps/vial/config.h | 12 ++ .../ll3macorn/bongopad/keymaps/vial/keymap.c | 46 +++++ .../bongopad/keymaps/vial/rules.mk | 0 .../bongopad/keymaps/vial/vial.json | 0 .../sofle/{ => rev1}/keymaps/vial/config.h | 0 .../sofle/{ => rev1}/keymaps/vial/keymap.c | 0 .../sofle/{ => rev1}/keymaps/vial/oled.c | 0 .../sofle/{ => rev1}/keymaps/vial/readme.md | 0 .../sofle/{ => rev1}/keymaps/vial/rules.mk | 0 .../sofle/{ => rev1}/keymaps/vial/vial.json | 0 keyboards/velocifire/sun20pro/config.h | 21 +- .../sun20pro/keymaps/default/keymap.c | 112 +++-------- .../sun20pro/keymaps/default/rules.mk | 1 + .../velocifire/sun20pro/keymaps/vial/rules.mk | 13 -- keyboards/velocifire/sun20pro/rules.mk | 11 +- 63 files changed, 200 insertions(+), 880 deletions(-) delete mode 100644 keyboards/binepad/bn009/r1/config.h delete mode 100644 keyboards/binepad/bn009r2/config.h delete mode 100644 keyboards/binepad/bn009r2/info.json delete mode 100644 keyboards/binepad/bn009r2/keymaps/default/keymap.json delete mode 100644 keyboards/binepad/bn009r2/keymaps/via/keymap.json delete mode 100644 keyboards/binepad/bn009r2/readme.md delete mode 100644 keyboards/binepad/bn009r2/rules.mk delete mode 100644 keyboards/bongopad/bongopad.c delete mode 100644 keyboards/bongopad/bongopad.h delete mode 100644 keyboards/bongopad/config.h delete mode 100644 keyboards/bongopad/keymaps/default/keymap.c delete mode 100644 keyboards/bongopad/keymaps/vial/keymap.c delete mode 100644 keyboards/bongopad/rules.mk delete mode 100644 keyboards/ekow/akira/akira.c rename keyboards/ergodox_ez/{ => base}/keymaps/vial/config.h (100%) rename keyboards/ergodox_ez/{ => base}/keymaps/vial/keymap.c (100%) rename keyboards/ergodox_ez/{ => base}/keymaps/vial/rules.mk (100%) rename keyboards/ergodox_ez/{ => base}/keymaps/vial/vial.json (100%) rename keyboards/keebio/iris/{keymaps/vial_rev2 => rev2/keymaps/vial}/config.h (91%) rename keyboards/keebio/iris/{keymaps/vial_rev2 => rev2/keymaps/vial}/keymap.c (100%) rename keyboards/keebio/iris/{keymaps/vial_rev2 => rev2/keymaps/vial}/rules.mk (100%) rename keyboards/keebio/iris/{keymaps/vial_rev2 => rev2/keymaps/vial}/vial.json (93%) rename keyboards/lily58/{ => rev1}/keymaps/vial/config.h (100%) rename keyboards/lily58/{ => rev1}/keymaps/vial/keymap.c (100%) rename keyboards/lily58/{ => rev1}/keymaps/vial/rules.mk (100%) rename keyboards/lily58/{ => rev1}/keymaps/vial/vial.json (100%) create mode 100644 keyboards/ll3macorn/bongopad/keymaps/vial/config.h create mode 100644 keyboards/ll3macorn/bongopad/keymaps/vial/keymap.c rename keyboards/{ => ll3macorn}/bongopad/keymaps/vial/rules.mk (100%) rename keyboards/{ => ll3macorn}/bongopad/keymaps/vial/vial.json (100%) rename keyboards/sofle/{ => rev1}/keymaps/vial/config.h (100%) rename keyboards/sofle/{ => rev1}/keymaps/vial/keymap.c (100%) rename keyboards/sofle/{ => rev1}/keymaps/vial/oled.c (100%) rename keyboards/sofle/{ => rev1}/keymaps/vial/readme.md (100%) rename keyboards/sofle/{ => rev1}/keymaps/vial/rules.mk (100%) rename keyboards/sofle/{ => rev1}/keymaps/vial/vial.json (100%) create mode 100644 keyboards/velocifire/sun20pro/keymaps/default/rules.mk diff --git a/keyboards/binepad/bn009/info.json b/keyboards/binepad/bn009/info.json index 8e4221f49f..3f673566aa 100644 --- a/keyboards/binepad/bn009/info.json +++ b/keyboards/binepad/bn009/info.json @@ -1,28 +1,33 @@ { - "keyboard_name": "BN009", "manufacturer": "Binepad", - "url": "https://binepad.com", + "keyboard_name": "BN009", "maintainer": "binepad", - "usb": { - "vid": "0x4249", - "pid": "0x4295", - "device_version": "0.0.1" + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "url": "http://binepad.com", + "usb": { + "vid": "0x4249", + "pid": "0x4295" }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", "layouts": { - "LAYOUT": { - "layout": [ - {"x":0, "y":0, "matrix": [0, 0]}, - {"x":1, "y":0, "matrix": [0, 1]}, - {"x":2, "y":0, "matrix": [0, 2]}, - {"x":0, "y":1, "matrix": [1, 0]}, - {"x":1, "y":1, "matrix": [1, 1]}, - {"x":2, "y":1, "matrix": [1, 2]}, - {"x":0, "y":2, "matrix": [2, 0]}, - {"x":1, "y":2, "matrix": [2, 1]}, - {"x":2, "y":2, "matrix": [2, 2]} - ] - } + "LAYOUT_ortho_3x3": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0, "label": "k00" }, + { "matrix": [0, 1], "x": 1, "y": 0, "label": "k01" }, + { "matrix": [0, 2], "x": 2, "y": 0, "label": "k02" }, + { "matrix": [1, 0], "x": 0, "y": 1, "label": "k10" }, + { "matrix": [1, 1], "x": 1, "y": 1, "label": "k11" }, + { "matrix": [1, 2], "x": 2, "y": 1, "label": "k12" }, + { "matrix": [2, 0], "x": 0, "y": 2, "label": "k20" }, + { "matrix": [2, 1], "x": 1, "y": 2, "label": "k21" }, + { "matrix": [2, 2], "x": 2, "y": 2, "label": "k22" } + ] + } } -} \ No newline at end of file +} diff --git a/keyboards/binepad/bn009/keymaps/default/keymap.json b/keyboards/binepad/bn009/keymaps/default/keymap.json index adb7e3e886..2d5410de04 100644 --- a/keyboards/binepad/bn009/keymaps/default/keymap.json +++ b/keyboards/binepad/bn009/keymaps/default/keymap.json @@ -1,8 +1,8 @@ { - "keyboard": "binepad/bn009", + "keyboard": "binepad/bn009r2", "version": 1, "author": "binepad", - "notes": "This file is a keymap.json file for binepad/bn009", + "notes": "This file is a keymap.json file for binepad/bn009r2", "keymap": "default", "layout": "LAYOUT_ortho_3x3", "layers": [ diff --git a/keyboards/binepad/bn009/r1/config.h b/keyboards/binepad/bn009/r1/config.h deleted file mode 100644 index 6779c0f11e..0000000000 --- a/keyboards/binepad/bn009/r1/config.h +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2020 Binepad (@binepad) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "config_common.h" - -/* 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 diff --git a/keyboards/binepad/bn009/r1/info.json b/keyboards/binepad/bn009/r1/info.json index de0f07b7cd..b83ebd3ebc 100644 --- a/keyboards/binepad/bn009/r1/info.json +++ b/keyboards/binepad/bn009/r1/info.json @@ -1,13 +1,14 @@ { - "keyboard_name": "BN009 R1", - "bootloader": "atmel-dfu", - "diode_direction": "COL2ROW", - "matrix_pins": { - "cols": ["D2", "D1", "D0"], - "rows": ["B6", "B5", "B4"] - }, - "processor": "atmega32u4", - "usb": { - "device_version": "0.0.1" + "keyboard_name": "BN009 R1", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["D2", "D1", "D0"], + "rows": ["B6", "B5", "B4"] + }, + "processor": "atmega32u4", + "usb": { + "device_version": "0.0.1" + } } -} + \ No newline at end of file diff --git a/keyboards/binepad/bn009/r2/config.h b/keyboards/binepad/bn009/r2/config.h index d9051ee99e..45b63ec105 100644 --- a/keyboards/binepad/bn009/r2/config.h +++ b/keyboards/binepad/bn009/r2/config.h @@ -3,6 +3,7 @@ #pragma once + /* * Wear Leveling EEPROM Emulation */ diff --git a/keyboards/binepad/bn009/r2/readme.md b/keyboards/binepad/bn009/r2/readme.md index c30cc23d11..eee6d1608c 100644 --- a/keyboards/binepad/bn009/r2/readme.md +++ b/keyboards/binepad/bn009/r2/readme.md @@ -1,3 +1,3 @@ # BINEPAD BN009 R2 -* Hardware Supported: BN009 R2 *(ft. STM32F103)* +* Hardware Supported: BN009 *(ft. STM32F103)* diff --git a/keyboards/binepad/bn009/r2/rules.mk b/keyboards/binepad/bn009/r2/rules.mk index 58561c984b..837f4bffb5 100644 --- a/keyboards/binepad/bn009/r2/rules.mk +++ b/keyboards/binepad/bn009/r2/rules.mk @@ -1,5 +1 @@ -# Copyright 2022 Binepad (@binpad) -# SPDX-License-Identifier: GPL-2.0-or-later - -EPROM_DRIVER = wear_leveling -WEAR_LEVELING_DRIVER = embedded_flash +# This file is intentionally left blank diff --git a/keyboards/binepad/bn009/readme.md b/keyboards/binepad/bn009/readme.md index fcfe202938..2b3153ca4d 100644 --- a/keyboards/binepad/bn009/readme.md +++ b/keyboards/binepad/bn009/readme.md @@ -2,7 +2,7 @@ ![BINEPAD BN009](https://imgur.com/fu0iXD0h.jpg) -*A 9% macropad.* +A 9% macropad. * Keyboard Maintainer: [binepad](https://github.com/binepad) * Hardware Supported: diff --git a/keyboards/binepad/bn009/rules.mk b/keyboards/binepad/bn009/rules.mk index 5356b24d77..74214d60ed 100644 --- a/keyboards/binepad/bn009/rules.mk +++ b/keyboards/binepad/bn009/rules.mk @@ -1,12 +1,3 @@ -# 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 = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output +# This file is mostly left blank + +DEFAULT_FOLDER = binepad/bn009/r2 diff --git a/keyboards/binepad/bn009r2/config.h b/keyboards/binepad/bn009r2/config.h deleted file mode 100644 index 45b63ec105..0000000000 --- a/keyboards/binepad/bn009r2/config.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2023 Binepad (@binepad) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - -/* - * Wear Leveling EEPROM Emulation - */ - -#define WEAR_LEVELING_LOGICAL_SIZE 2048 // Number of bytes "exposed" to the rest of QMK and denotes the size of the usable EEPROM. -#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2) // Number of bytes used by the wear-leveling algorithm for its underlying storage, and needs to be a multiple of the logical size. diff --git a/keyboards/binepad/bn009r2/info.json b/keyboards/binepad/bn009r2/info.json deleted file mode 100644 index 5d126c866c..0000000000 --- a/keyboards/binepad/bn009r2/info.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "manufacturer": "Binepad", - "keyboard_name": "BN009 R2", - "maintainer": "binepad", - "bootloader": "stm32duino", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": false - }, - "matrix_pins": { - "cols": ["A1", "A2", "A6"], - "rows": ["B6", "B7", "B2"] - }, - "processor": "STM32F103", - "url": "http://binepad.com", - "usb": { - "vid": "0x4249", - "pid": "0x4295", - "device_version": "2.0.0" - }, - "community_layouts": ["ortho_3x3"], - "layouts": { - "LAYOUT_ortho_3x3": { - "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 1, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [1, 0], "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1, "y": 1 }, - { "matrix": [1, 2], "x": 2, "y": 1 }, - { "matrix": [2, 0], "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1, "y": 2 }, - { "matrix": [2, 2], "x": 2, "y": 2 } - ] - } - } -} diff --git a/keyboards/binepad/bn009r2/keymaps/default/keymap.json b/keyboards/binepad/bn009r2/keymaps/default/keymap.json deleted file mode 100644 index 2d5410de04..0000000000 --- a/keyboards/binepad/bn009r2/keymaps/default/keymap.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "keyboard": "binepad/bn009r2", - "version": 1, - "author": "binepad", - "notes": "This file is a keymap.json file for binepad/bn009r2", - "keymap": "default", - "layout": "LAYOUT_ortho_3x3", - "layers": [ - [ - "KC_7", "KC_8", "KC_9", - "KC_4", "KC_5", "KC_6", - "KC_1", "KC_2", "KC_3" - ] - ] -} diff --git a/keyboards/binepad/bn009r2/keymaps/via/keymap.json b/keyboards/binepad/bn009r2/keymaps/via/keymap.json deleted file mode 100644 index 797c54d43a..0000000000 --- a/keyboards/binepad/bn009r2/keymaps/via/keymap.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "config": { - "features": { - "via": true - } - }, - "keyboard": "binepad/bn009r2", - "version": 1, - "author": "binepad", - "notes": "This file is a keymap.json file for binepad/bn009r2", - "keymap": "via", - "layout": "LAYOUT_ortho_3x3", - "layers": [ - [ - "KC_7", "KC_8", "KC_9", - "KC_4", "KC_5", "KC_6", - "KC_1", "KC_2", "KC_3" - ], - [ - "KC_NO", "KC_NO", "KC_NO", - "KC_NO", "KC_NO", "KC_NO", - "KC_NO", "KC_NO", "KC_NO" - ], - [ - "KC_NO", "KC_NO", "KC_NO", - "KC_NO", "KC_NO", "KC_NO", - "KC_NO", "KC_NO", "KC_NO" - ], - [ - "KC_NO", "KC_NO", "KC_NO", - "KC_NO", "KC_NO", "KC_NO", - "KC_NO", "KC_NO", "KC_NO" - ] - ] -} diff --git a/keyboards/binepad/bn009r2/readme.md b/keyboards/binepad/bn009r2/readme.md deleted file mode 100644 index 5444a08843..0000000000 --- a/keyboards/binepad/bn009r2/readme.md +++ /dev/null @@ -1,27 +0,0 @@ -# BINEPAD BN009 R2 - -![BINEPAD BN009](https://imgur.com/fu0iXD0h.jpg) - -*A 9% macropad* - -* Keyboard Maintainer: [binepad](https://github.com/binepad) -* Hardware Supported: BN009 *(ft. STM32F103)* -* Hardware Availability: [binepad.com](https://www.binepad.com/bn009) - -Make example for this keyboard (after setting up your build environment): - - make binepad/bn009r2:default - -Flashing example for this keyboard: - - make binepad/bn009r2: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) and plug in the keyboard -* **Physical reset button**: Briefly press the button under the small hole on the back of the macropad -* **Keycode in layout**: Press the key mapped to `QK_BOOT` or `RESET` if it is available diff --git a/keyboards/binepad/bn009r2/rules.mk b/keyboards/binepad/bn009r2/rules.mk deleted file mode 100644 index 837f4bffb5..0000000000 --- a/keyboards/binepad/bn009r2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally left blank diff --git a/keyboards/bongopad/bongopad.c b/keyboards/bongopad/bongopad.c deleted file mode 100644 index 8fae6df3f4..0000000000 --- a/keyboards/bongopad/bongopad.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2021 Ll3macorn (@ll3macorn) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "bongopad.h" diff --git a/keyboards/bongopad/bongopad.h b/keyboards/bongopad/bongopad.h deleted file mode 100644 index 8496f2922c..0000000000 --- a/keyboards/bongopad/bongopad.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2021 Ll3macorn (@ll3macorn) -// SPDX-License-Identifier: GPL-2.0-or-later -#ifndef KB_H -#define KB_H - -#include "quantum.h" - -#define LAYOUT( \ - K00, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32 \ -) { \ - { K00, KC_NO, KC_NO }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 } \ -} - -#endif \ No newline at end of file diff --git a/keyboards/bongopad/config.h b/keyboards/bongopad/config.h deleted file mode 100644 index 67a4ba4ee2..0000000000 --- a/keyboards/bongopad/config.h +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright 2021 Ll3macorn (@ll3macorn) -// SPDX-License-Identifier: GPL-2.0-or-later -#ifndef CONFIG_H -#define CONFIG_H - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x1234 -#define PRODUCT_ID 0x2949 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ll3macorn -#define PRODUCT BongoPad -#define DESCRIPTION BongoPad -#define VIAL_KEYBOARD_UID {0x08, 0xDB, 0x6F, 0x28, 0x40, 0xFD, 0x6F, 0x58} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 2 } -#define NO_ACTION_TAPPING - -#define RGB_DI_PIN E6 -#define RGBLED_NUM 6 - - -#define VIAL_TAP_DANCE_ENTRIES 4 -#define DYNAMIC_KEYMAP_LAYER_COUNT 4 - -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 3 - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F7, D7, C6, D4 } -#define MATRIX_COL_PINS { F4, F5, F6 } -#define UNUSED_PINS - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define ENCODERS_PAD_A { B1 } -#define ENCODERS_PAD_B { B3 } -#define LAYER_STATE_8BIT -#define NO_ACTION_ONESHOT - - -/* number of backlight levels */ - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCING_DELAY 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)) \ -) - -/* prevent stuck modifiers */ -#define PREVENT_STUCK_MODIFIERS - - - - -#endif \ No newline at end of file diff --git a/keyboards/bongopad/keymaps/default/keymap.c b/keyboards/bongopad/keymaps/default/keymap.c deleted file mode 100644 index 9d73dd35f9..0000000000 --- a/keyboards/bongopad/keymaps/default/keymap.c +++ /dev/null @@ -1,177 +0,0 @@ -// Copyright 2021 Ll3macorn (@ll3macorn) -// SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H -#include - -enum layers { - Layer1, - Layer2, - Layer3, - Layer4 -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [Layer1] = LAYOUT( - KC__MUTE, - KC_7, KC_8, KC_9, - KC_4, KC_5, KC_6, - KC_1, KC_2, KC_3), - - [Layer2] = LAYOUT( - KC_SPC, - KC_SPC, KC_SPC, KC_SPC, - KC_SPC, KC_SPC, KC_SPC, - KC_SPC, KC_SPC, KC_SPC), - - [Layer3] = LAYOUT( - KC_SPC, - KC_SPC, KC_SPC, KC_SPC, - KC_SPC, KC_SPC, KC_SPC, - KC_SPC, KC_SPC, KC_SPC), - - [Layer4] = LAYOUT( - KC_SPC, - KC_SPC, KC_SPC, KC_SPC, - KC_SPC, KC_SPC, KC_SPC, - KC_SPC, KC_SPC, KC_SPC) - -}; - -// clang-format on - -#ifdef ENCODER_ENABLE -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC__VOLUP); - } else { - tap_code(KC__VOLDOWN); - } - return true; -} -#endif // ENCODER_ENABLE - -#ifdef OLED_ENABLE - -char wpm_str[32]; - -// WPM-responsive animation stuff here -#define IDLE_FRAMES 5 -#define IDLE_SPEED 0 // below this wpm value your animation will idle - -// #define PREP_FRAMES 1 // uncomment if >1 - -#define TAP_FRAMES 2 -#define TAP_SPEED 0 // above this wpm value typing animation to triggere - -#define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms -// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing -#define ANIM_SIZE 512 // number of bytes in array, minimize for adequate firmware size, max is 1024 - -uint32_t anim_timer = 0; -uint32_t anim_sleep = 0; -uint8_t current_idle_frame = 0; -// uint8_t current_prep_frame = 0; // uncomment if PREP_FRAMES >1 -uint8_t current_tap_frame = 0; - -// Images credit j-inc(/James Incandenza) and pixelbenny. Credit to obosob for initial animation approach. -static void render_anim(void) { - static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = { - { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16, 8, 8, 4, 4, 4, 8, 48, 64,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24,100,130, 2, 2, 2, 2, 2, 1, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0,192,193,193,194, 4, 8, 16, 32, 64,128, 0, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,192, 56, 4, 3, 0, 0, 0, 0, 0, 0, 0, 12, 12, 12, 13, 1, 0, 64,160, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8, 8, 8, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - }, - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16, 8, 8, 4, 4, 4, 8, 48, 64,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24,100,130, 2, 2, 2, 2, 2, 1, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0,192,193,193,194, 4, 8, 16, 32, 64,128, 0, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,192, 56, 4, 3, 0, 0, 0, 0, 0, 0, 0, 12, 12, 12, 13, 1, 0, 64,160, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8, 8, 8, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - }, - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 8, 4, 2, 2, 4, 24, 96,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60,194, 1, 1, 2, 2, 4, 4, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 96, 96, 0,129,130,130,132, 8, 16, 32, 64,128, 0, 0, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,112, 25, 6, 0, 0, 0, 0, 0, 0, 0, 24, 24, 24, 27, 3, 0, 64,160, 34, 36, 20, 18, 18, 18, 11, 8, 8, 8, 8, 5, 5, 9, 9, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8, 8, 8, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - }, - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 4, 2, 1, 1, 2, 12, 48, 64,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30,225, 0, 0, 1, 1, 2, 2, 1, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0,192,193,193,194, 4, 8, 16, 32, 64,128, 0, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,112, 12, 3, 0, 0, 0, 0, 0, 0, 0, 12, 12, 12, 13, 1, 0, 64,160, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8, 8, 8, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - }, - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 4, 2, 2, 2, 4, 56, 64,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28,226, 1, 1, 2, 2, 2, 2, 1, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0,192,193,193,194, 4, 8, 16, 32, 64,128, 0, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,112, 12, 3, 0, 0, 0, 0, 0, 0, 0, 12, 12, 12, 13, 1, 0, 64,160, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8, 8, 8, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - } - }; - static const char PROGMEM prep[][ANIM_SIZE] = { - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 4, 2, 1, 1, 2, 12, 48, 64,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30,225, 0, 0, 1, 1, 2, 2,129,128,128, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0, 0, 1,225, 26, 6, 9, 49, 53, 1,138,124, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,112, 12, 3, 0, 0, 24, 6, 5,152,153,132,195,124, 65, 65, 64, 64, 32, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - } - }; - static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = { - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 4, 2, 1, 1, 2, 12, 48, 64,128, 0, 0, 0, 0, 0, 0, 0,248,248,248,248, 0, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30,225, 0, 0, 1, 1, 2, 2,129,128,128, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0, 0, 1, 1, 2, 4, 8, 16, 32, 67,135, 7, 1, 0,184,188,190,159, 95, 95, 79, 76, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,112, 12, 3, 0, 0, 24, 6, 5,152,153,132, 67,124, 65, 65, 64, 64, 32, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 61,124,252,252,252,252,252, 60, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - }, - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 4, 2, 1, 1, 2, 12, 48, 64,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30,225, 0, 0, 1, 1, 2, 2, 1, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0, 0, 1,225, 26, 6, 9, 49, 53, 1,138,124, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,112, 12, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 64,160, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3,122,122,121,121,121,121, 57, 49, 2, 2, 4, 4, 8, 8, 8,8,8,7,0, 0, 0, 48, 60, 124, 124, 126, 126, 126, 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - }, - }; - - //assumes 1 frame prep stage - void animation_phase(void) { - if(get_current_wpm() <=IDLE_SPEED){ - current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES; - oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE); - } - if(get_current_wpm() >IDLE_SPEED && get_current_wpm() 1 - oled_write_raw_P(prep[0], ANIM_SIZE); // remove if IDLE_FRAMES >1 - } - if(get_current_wpm() >=TAP_SPEED){ - current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES; - oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE); - } - } - if(get_current_wpm() != 000) { - oled_on(); // not essential but turns on animation OLED with any alpha keypress - if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) { - anim_timer = timer_read32(); - animation_phase(); - } - anim_sleep = timer_read32(); - } else { - if(timer_elapsed32(anim_sleep) > OLED_TIMEOUT) { - oled_off(); - } else { - if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) { - anim_timer = timer_read32(); - animation_phase(); - } - } - } -} - -bool oled_task_user(void) { - render_anim(); - oled_set_cursor(0,0); - sprintf(wpm_str, "WPM:%03d", get_current_wpm()); - oled_write(wpm_str, false); - return false; -} - -oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }; -#endif \ No newline at end of file diff --git a/keyboards/bongopad/keymaps/vial/keymap.c b/keyboards/bongopad/keymaps/vial/keymap.c deleted file mode 100644 index ffa5cbe8f4..0000000000 --- a/keyboards/bongopad/keymaps/vial/keymap.c +++ /dev/null @@ -1,184 +0,0 @@ -// Copyright 2021 Ll3macorn (@ll3macorn) -// SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H -#include - -enum layers { - Layer1, - Layer2, - Layer3, - Layer4 -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [Layer1] = LAYOUT( - KC__MUTE, - KC_7, KC_8, KC_9, - KC_4, KC_5, KC_6, - KC_1, KC_2, KC_3), - - [Layer2] = LAYOUT( - KC_SPC, - KC_SPC, KC_SPC, KC_SPC, - KC_SPC, KC_SPC, KC_SPC, - KC_SPC, KC_SPC, KC_SPC), - - [Layer3] = LAYOUT( - KC_SPC, - KC_SPC, KC_SPC, KC_SPC, - KC_SPC, KC_SPC, KC_SPC, - KC_SPC, KC_SPC, KC_SPC), - - [Layer4] = LAYOUT( - KC_SPC, - KC_SPC, KC_SPC, KC_SPC, - KC_SPC, KC_SPC, KC_SPC, - KC_SPC, KC_SPC, KC_SPC) - -}; - -// clang-format on - -#ifdef ENCODER_ENABLE -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC__VOLUP); - } else { - tap_code(KC__VOLDOWN); - } - return true; -} -#endif // ENCODER_ENABLE - -#ifdef OLED_ENABLE - -char wpm_str[32]; - -// WPM-responsive animation stuff here -#define IDLE_FRAMES 5 -#define IDLE_SPEED 0 // below this wpm value your animation will idle - -// #define PREP_FRAMES 1 // uncomment if >1 - -#define TAP_FRAMES 2 -#define TAP_SPEED 0 // above this wpm value typing animation to triggere - -#define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms -// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing -#define ANIM_SIZE 512 // number of bytes in array, minimize for adequate firmware size, max is 1024 - -uint32_t anim_timer = 0; -uint32_t anim_sleep = 0; -uint8_t current_idle_frame = 0; -// uint8_t current_prep_frame = 0; // uncomment if PREP_FRAMES >1 -uint8_t current_tap_frame = 0; - -// Images credit j-inc(/James Incandenza) and pixelbenny. Credit to obosob for initial animation approach. -static void render_anim(void) { - static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = { - { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16, 8, 8, 4, 4, 4, 8, 48, 64,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24,100,130, 2, 2, 2, 2, 2, 1, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0,192,193,193,194, 4, 8, 16, 32, 64,128, 0, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,192, 56, 4, 3, 0, 0, 0, 0, 0, 0, 0, 12, 12, 12, 13, 1, 0, 64,160, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8, 8, 8, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - }, - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16, 8, 8, 4, 4, 4, 8, 48, 64,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24,100,130, 2, 2, 2, 2, 2, 1, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0,192,193,193,194, 4, 8, 16, 32, 64,128, 0, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,192, 56, 4, 3, 0, 0, 0, 0, 0, 0, 0, 12, 12, 12, 13, 1, 0, 64,160, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8, 8, 8, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - }, - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 8, 4, 2, 2, 4, 24, 96,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60,194, 1, 1, 2, 2, 4, 4, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 96, 96, 0,129,130,130,132, 8, 16, 32, 64,128, 0, 0, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,112, 25, 6, 0, 0, 0, 0, 0, 0, 0, 24, 24, 24, 27, 3, 0, 64,160, 34, 36, 20, 18, 18, 18, 11, 8, 8, 8, 8, 5, 5, 9, 9, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8, 8, 8, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - }, - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 4, 2, 1, 1, 2, 12, 48, 64,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30,225, 0, 0, 1, 1, 2, 2, 1, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0,192,193,193,194, 4, 8, 16, 32, 64,128, 0, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,112, 12, 3, 0, 0, 0, 0, 0, 0, 0, 12, 12, 12, 13, 1, 0, 64,160, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8, 8, 8, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - }, - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 4, 2, 2, 2, 4, 56, 64,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28,226, 1, 1, 2, 2, 2, 2, 1, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0,192,193,193,194, 4, 8, 16, 32, 64,128, 0, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,112, 12, 3, 0, 0, 0, 0, 0, 0, 0, 12, 12, 12, 13, 1, 0, 64,160, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8, 8, 8, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - } - }; - static const char PROGMEM prep[][ANIM_SIZE] = { - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 4, 2, 1, 1, 2, 12, 48, 64,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30,225, 0, 0, 1, 1, 2, 2,129,128,128, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0, 0, 1,225, 26, 6, 9, 49, 53, 1,138,124, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,112, 12, 3, 0, 0, 24, 6, 5,152,153,132,195,124, 65, 65, 64, 64, 32, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - } - }; - static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = { - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 4, 2, 1, 1, 2, 12, 48, 64,128, 0, 0, 0, 0, 0, 0, 0,248,248,248,248, 0, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30,225, 0, 0, 1, 1, 2, 2,129,128,128, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0, 0, 1, 1, 2, 4, 8, 16, 32, 67,135, 7, 1, 0,184,188,190,159, 95, 95, 79, 76, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,112, 12, 3, 0, 0, 24, 6, 5,152,153,132, 67,124, 65, 65, 64, 64, 32, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 61,124,252,252,252,252,252, 60, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - }, - { - 0, 0,0,0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0,0,0, 0, 0,0,0, 0,0,0, 0,0,0, 0, 0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 4, 2, 1, 1, 2, 12, 48, 64,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, - 0, 0, 0, 0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0,0,0,0,0, 0, 0, 0, 0,0,0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30,225, 0, 0, 1, 1, 2, 2, 1, 0, 0, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 48, 48, 0, 0, 1,225, 26, 6, 9, 49, 53, 1,138,124, 0, 0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8,196, 4,196, 4,196, 2,194, 2,194, 1, 1, 1, 1, 0, 0, 0, - 0, 0,0, 0, 0, 0,0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0, 0,0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,112, 12, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 64,160, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,170,255,255,195,191,127, 3,127,191,195,255,255,170,170, 0, 0, 0, 0, - 0, 0, 0,0,0, 0, 0, 0,0,0,0, 0, 0, 0, 0,0, 0,0, 0,0, 0, 128, 128, 128, 128,64,64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3,122,122,121,121,121,121, 57, 49, 2, 2, 4, 4, 8, 8, 8,8,8,7,0, 0, 0, 48, 60, 124, 124, 126, 126, 126, 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,2,7, 31, 7,31, 7, 28, 7,31, 7,31, 7, 2, 2, 0, 0, 0, 0, - }, - }; - - //assumes 1 frame prep stage - void animation_phase(void) { - if(get_current_wpm() <=IDLE_SPEED){ - current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES; - oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE); - } - if(get_current_wpm() >IDLE_SPEED && get_current_wpm() 1 - oled_write_raw_P(prep[0], ANIM_SIZE); // remove if IDLE_FRAMES >1 - } - if(get_current_wpm() >=TAP_SPEED){ - current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES; - oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE); - } - } - if(get_current_wpm() != 000) { - oled_on(); // not essential but turns on animation OLED with any alpha keypress - if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) { - anim_timer = timer_read32(); - animation_phase(); - } - anim_sleep = timer_read32(); - } else { - if(timer_elapsed32(anim_sleep) > OLED_TIMEOUT) { - oled_off(); - } else { - if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) { - anim_timer = timer_read32(); - animation_phase(); - } - } - } -} - -bool oled_task_user(void) { - render_anim(); - oled_set_cursor(0,0); - sprintf(wpm_str, "WPM:%03d", get_current_wpm()); - oled_write(wpm_str, false); - return false; -} - -oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }; -#endif - -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, -}; diff --git a/keyboards/bongopad/rules.mk b/keyboards/bongopad/rules.mk deleted file mode 100644 index 1fbd2beaa5..0000000000 --- a/keyboards/bongopad/rules.mk +++ /dev/null @@ -1,60 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = no # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = no # Commands for debug and configuration -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no -ENCODER_ENABLE = yes -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 -WPM_ENABLE = yes -RGBLIGHT_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ekow/akira/akira.c b/keyboards/ekow/akira/akira.c deleted file mode 100644 index 420a05e04a..0000000000 --- a/keyboards/ekow/akira/akira.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 eugenepy - * - * 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 "akira.h" diff --git a/keyboards/ekow/akira/config.h b/keyboards/ekow/akira/config.h index 9deabfe903..a3df356963 100644 --- a/keyboards/ekow/akira/config.h +++ b/keyboards/ekow/akira/config.h @@ -24,6 +24,9 @@ along with this program. If not, see . #define MATRIX_COL_PINS \ { B12, B13, B14, B15, A8, A9, A10, A15, B3, B4, B5, B6, B7, B8, B9 } +// Reset to QMK default for STM32042x6. Vial default is currently 8 pages. +#define FEE_PAGE_COUNT 2 + /* * Keyboard Matrix Assignments * diff --git a/keyboards/ekow/akira/keymaps/vial/config.h b/keyboards/ekow/akira/keymaps/vial/config.h index ff2e0c8bbb..f7a9c30fdb 100644 --- a/keyboards/ekow/akira/keymaps/vial/config.h +++ b/keyboards/ekow/akira/keymaps/vial/config.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once + #define DYNAMIC_KEYMAP_LAYER_COUNT 1 #define VIAL_KEYBOARD_UID {0xD6, 0xF4, 0x6F, 0x56, 0x82, 0xE8, 0x06, 0x7B} -#define FEE_PAGE_COUNT 2 #define VIAL_UNLOCK_COMBO_ROWS { 0, 0} #define VIAL_UNLOCK_COMBO_COLS { 0, 1 } diff --git a/keyboards/ekow/akira/rules.mk b/keyboards/ekow/akira/rules.mk index 5356b24d77..36fd57fd97 100644 --- a/keyboards/ekow/akira/rules.mk +++ b/keyboards/ekow/akira/rules.mk @@ -4,9 +4,4 @@ BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ergodox_ez/keymaps/vial/config.h b/keyboards/ergodox_ez/base/keymaps/vial/config.h similarity index 100% rename from keyboards/ergodox_ez/keymaps/vial/config.h rename to keyboards/ergodox_ez/base/keymaps/vial/config.h diff --git a/keyboards/ergodox_ez/keymaps/vial/keymap.c b/keyboards/ergodox_ez/base/keymaps/vial/keymap.c similarity index 100% rename from keyboards/ergodox_ez/keymaps/vial/keymap.c rename to keyboards/ergodox_ez/base/keymaps/vial/keymap.c diff --git a/keyboards/ergodox_ez/keymaps/vial/rules.mk b/keyboards/ergodox_ez/base/keymaps/vial/rules.mk similarity index 100% rename from keyboards/ergodox_ez/keymaps/vial/rules.mk rename to keyboards/ergodox_ez/base/keymaps/vial/rules.mk diff --git a/keyboards/ergodox_ez/keymaps/vial/vial.json b/keyboards/ergodox_ez/base/keymaps/vial/vial.json similarity index 100% rename from keyboards/ergodox_ez/keymaps/vial/vial.json rename to keyboards/ergodox_ez/base/keymaps/vial/vial.json diff --git a/keyboards/helix/rev2/keymaps/vial/config.h b/keyboards/helix/rev2/keymaps/vial/config.h index 199e052ce2..d801fd4488 100644 --- a/keyboards/helix/rev2/keymaps/vial/config.h +++ b/keyboards/helix/rev2/keymaps/vial/config.h @@ -20,23 +20,24 @@ along with this program. If not, see . #pragma once -// place overrides here - #define VIAL_KEYBOARD_UID {0xE4, 0x99, 0x35, 0x98, 0xBC, 0xC5, 0xA0, 0x11} #define VIAL_UNLOCK_COMBO_ROWS {4, 9} #define VIAL_UNLOCK_COMBO_COLS {4, 4} -// If you need more program area, try select and reduce rgblight modes to use. - -// Selection of RGBLIGHT MODE to use. #if defined(LED_ANIMATIONS) #define RGBLIGHT_EFFECT_BREATHING - #define RGBLIGHT_EFFECT_RAINBOW_MOOD - #define RGBLIGHT_EFFECT_RAINBOW_SWIRL - #define RGBLIGHT_EFFECT_SNAKE - #define RGBLIGHT_EFFECT_KNIGHT - #define RGBLIGHT_EFFECT_CHRISTMAS #define RGBLIGHT_EFFECT_STATIC_GRADIENT - //#define RGBLIGHT_EFFECT_RGB_TEST - //#define RGBLIGHT_EFFECT_ALTERNATING + + #undef RGBLIGHT_EFFECT_RGB_TEST + #undef RGBLIGHT_EFFECT_ALTERNATING + #undef RGBLIGHT_EFFECT_TWINKLE +#endif + +// none of the other builds have enough room for anything else +#if !defined(KEYBOARD_helix_rev2) + #undef RGBLIGHT_EFFECT_RAINBOW_MOOD + #undef RGBLIGHT_EFFECT_RAINBOW_SWIRL + #undef RGBLIGHT_EFFECT_SNAKE + #undef RGBLIGHT_EFFECT_KNIGHT + #undef RGBLIGHT_EFFECT_CHRISTMAS #endif diff --git a/keyboards/helix/rev2/keymaps/vial/rules.mk b/keyboards/helix/rev2/keymaps/vial/rules.mk index d94a4b5a96..5410836a0a 100644 --- a/keyboards/helix/rev2/keymaps/vial/rules.mk +++ b/keyboards/helix/rev2/keymaps/vial/rules.mk @@ -1,20 +1,21 @@ VIA_ENABLE = yes VIAL_ENABLE = yes -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 MOUSEKEY_ENABLE = no EXTRAKEY_ENABLE = yes -WPM_ENABLE = yes -TAP_DANCE_ENABLE = yes COMBO_ENABLE = no GRAVE_ESC_ENABLE = no MAGIC_ENABLE = no -BOOTMAGIC_ENABLE = no COMMAND_ENABLE = no CONSOLE_ENABLE = no -QMK_SETTINGS = yes LTO_ENABLE = yes KEY_OVERRIDE_ENABLE = no + +ifneq ($(strip $(KEYBOARD)), helix/rev2) + TAP_DANCE_ENABLE = no +endif +ifeq ($(strip $(KEYBOARD)), helix/rev2/qmk_conf) + QMK_SETTINGS = no +endif diff --git a/keyboards/helix/rev2/keymaps/vial/vial.json b/keyboards/helix/rev2/keymaps/vial/vial.json index e68e687aa6..600abbbcae 100644 --- a/keyboards/helix/rev2/keymaps/vial/vial.json +++ b/keyboards/helix/rev2/keymaps/vial/vial.json @@ -1,7 +1,7 @@ { "name": "Helix rev2 5rows", "vendorId": "0x3265", - "productId": "0x0003", + "productId": "0x0002", "lighting": "qmk_rgblight", "matrix": { "rows": 10, @@ -113,4 +113,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/keyboards/keebio/iris/keymaps/vial/config.h b/keyboards/keebio/iris/keymaps/vial/config.h index bfe41b40bb..99884940e5 100644 --- a/keyboards/keebio/iris/keymaps/vial/config.h +++ b/keyboards/keebio/iris/keymaps/vial/config.h @@ -24,6 +24,3 @@ along with this program. If not, see . #define VIAL_KEYBOARD_UID {0xBC, 0x99, 0xF2, 0x61, 0x45, 0x7C, 0xC8, 0xB9} #define VIAL_UNLOCK_COMBO_ROWS {0,9} #define VIAL_UNLOCK_COMBO_COLS {0,5} - -#define NO_PRINT - diff --git a/keyboards/keebio/iris/keymaps/vial/rules.mk b/keyboards/keebio/iris/keymaps/vial/rules.mk index 22443617d8..742a04e284 100644 --- a/keyboards/keebio/iris/keymaps/vial/rules.mk +++ b/keyboards/keebio/iris/keymaps/vial/rules.mk @@ -6,3 +6,6 @@ TAP_DANCE_ENABLE = no COMBO_ENABLE = no KEY_OVERRIDE_ENABLE = no DYNAMIC_MACRO_ENABLE = yes + +CONSOLE_ENABLE = no +COMMAND_ENABLE = no diff --git a/keyboards/keebio/iris/keymaps/vial/vial.json b/keyboards/keebio/iris/keymaps/vial/vial.json index 69e6fbcd7a..5aa14c9cf6 100644 --- a/keyboards/keebio/iris/keymaps/vial/vial.json +++ b/keyboards/keebio/iris/keymaps/vial/vial.json @@ -1,12 +1,11 @@ { - "name": "Iris", + "name": "Iris Rev. X", "matrix": { "rows": 10, "cols": 6 }, "lighting":"qmk_backlight_rgblight", - "vendorId":"0x494b", - "productId":"0x0001", + "vendorId":"0xCB10", "layouts": { "keymap": [ [{"y":0.375},"0,0","0,1",{"y":-0.25},"0,2",{"y":-0.125},"0,3",{"y":0.125},"0,4",{"y":0.125},"0,5",{"x":4},"5,5",{"y":-0.125},"5,4",{"y":-0.125},"5,3",{"y":0.125},"5,2",{"y":0.25},"5,1","5,0"], diff --git a/keyboards/keebio/iris/keymaps/vial_rev2/config.h b/keyboards/keebio/iris/rev2/keymaps/vial/config.h similarity index 91% rename from keyboards/keebio/iris/keymaps/vial_rev2/config.h rename to keyboards/keebio/iris/rev2/keymaps/vial/config.h index bfe41b40bb..05c9f9b4cf 100644 --- a/keyboards/keebio/iris/keymaps/vial_rev2/config.h +++ b/keyboards/keebio/iris/rev2/keymaps/vial/config.h @@ -20,8 +20,8 @@ along with this program. If not, see . // #define USE_I2C #define EE_HANDS +#define VIAL_KEYBOARD_UID {0xA1, 0x64, 0x55, 0x7E, 0x15, 0xFB, 0x6F, 0x0A} // Added by Brian C. Arnold to support Vial. -#define VIAL_KEYBOARD_UID {0xBC, 0x99, 0xF2, 0x61, 0x45, 0x7C, 0xC8, 0xB9} #define VIAL_UNLOCK_COMBO_ROWS {0,9} #define VIAL_UNLOCK_COMBO_COLS {0,5} diff --git a/keyboards/keebio/iris/keymaps/vial_rev2/keymap.c b/keyboards/keebio/iris/rev2/keymaps/vial/keymap.c similarity index 100% rename from keyboards/keebio/iris/keymaps/vial_rev2/keymap.c rename to keyboards/keebio/iris/rev2/keymaps/vial/keymap.c diff --git a/keyboards/keebio/iris/keymaps/vial_rev2/rules.mk b/keyboards/keebio/iris/rev2/keymaps/vial/rules.mk similarity index 100% rename from keyboards/keebio/iris/keymaps/vial_rev2/rules.mk rename to keyboards/keebio/iris/rev2/keymaps/vial/rules.mk diff --git a/keyboards/keebio/iris/keymaps/vial_rev2/vial.json b/keyboards/keebio/iris/rev2/keymaps/vial/vial.json similarity index 93% rename from keyboards/keebio/iris/keymaps/vial_rev2/vial.json rename to keyboards/keebio/iris/rev2/keymaps/vial/vial.json index 48da836fec..a4bb7e846d 100644 --- a/keyboards/keebio/iris/keymaps/vial_rev2/vial.json +++ b/keyboards/keebio/iris/rev2/keymaps/vial/vial.json @@ -1,12 +1,12 @@ { - "name": "Iris", + "name": "Iris Rev. 2", "matrix": { "rows": 10, "cols": 6 }, "lighting":"qmk_backlight_rgblight", - "vendorId":"0x494b", - "productId":"0x0001", + "vendorId":"0xCB10", + "productId":"0x2256", "layouts": { "keymap": [ [{"y":0.375},"0,0","0,1",{"y":-0.25},"0,2",{"y":-0.125},"0,3",{"y":0.125},"0,4",{"y":0.125},"0,5",{"x":4},"5,5",{"y":-0.125},"5,4",{"y":-0.125},"5,3",{"y":0.125},"5,2",{"y":0.25},"5,1","5,0"], diff --git a/keyboards/keycapsss/plaid_pad/keymaps/vial/rules.mk b/keyboards/keycapsss/plaid_pad/keymaps/vial/rules.mk index 5b7c05adb0..377adb4c2c 100644 --- a/keyboards/keycapsss/plaid_pad/keymaps/vial/rules.mk +++ b/keyboards/keycapsss/plaid_pad/keymaps/vial/rules.mk @@ -2,3 +2,8 @@ VIA_ENABLE = yes VIAL_ENABLE = yes LTO_ENABLE = yes ENCODER_MAP_ENABLE = yes + +ifeq ($(strip $(KEYBOARD)), keycapsss/plaid_pad/rev3) + KEY_OVERRIDE_ENABLE = no + MAGIC_ENABLE = no +endif diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/vial/config.h b/keyboards/lazydesigners/dimple/staggered/keymaps/vial/config.h index a3b07be304..92fc400b9d 100644 --- a/keyboards/lazydesigners/dimple/staggered/keymaps/vial/config.h +++ b/keyboards/lazydesigners/dimple/staggered/keymaps/vial/config.h @@ -5,3 +5,7 @@ #define VIAL_KEYBOARD_UID {0x26, 0x13, 0xCE, 0x01, 0xC6, 0x8A, 0x8E, 0x6C} #define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } #define VIAL_UNLOCK_COMBO_COLS { 0, 10 } + +#if defined(KEYBOARD_lazydesigners_dimple_staggered_rev3) +# define LAYOUT LAYOUT_all +#endif diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/vial/rules.mk b/keyboards/lazydesigners/dimple/staggered/keymaps/vial/rules.mk index b1f3ec8e4d..cd535c742f 100644 --- a/keyboards/lazydesigners/dimple/staggered/keymaps/vial/rules.mk +++ b/keyboards/lazydesigners/dimple/staggered/keymaps/vial/rules.mk @@ -2,3 +2,7 @@ VIA_ENABLE = yes VIAL_ENABLE = yes LTO_ENABLE = yes KEY_OVERRIDE_ENABLE = no + +ifeq ($(strip $(KEYBOARD)), lazydesigners/dimple/staggered/rev1) + QMK_SETTINGS = no +endif diff --git a/keyboards/libra_mini/config.h b/keyboards/libra_mini/config.h index 01070228f7..971cab5c75 100644 --- a/keyboards/libra_mini/config.h +++ b/keyboards/libra_mini/config.h @@ -15,7 +15,4 @@ // Max 32 #define JOYSTICK_BUTTON_COUNT 0 // Max 6: X, Y, Z, Rx, Ry, Rz -#define JOYSTICK_AXES_COUNT 2 - -/* Use 1000hz polling */ -#define USB_POLLING_INTERVAL_MS 1 +#define JOYSTICK_AXIS_COUNT 2 diff --git a/keyboards/libra_mini/keymaps/vial/keymap.c b/keyboards/libra_mini/keymaps/vial/keymap.c index 307e198500..b4e3d58219 100644 --- a/keyboards/libra_mini/keymaps/vial/keymap.c +++ b/keyboards/libra_mini/keymaps/vial/keymap.c @@ -86,7 +86,7 @@ void matrix_scan_user(void) { } // Joystick config -joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = { +joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = { [0] = JOYSTICK_AXIS_VIRTUAL, [1] = JOYSTICK_AXIS_VIRTUAL }; diff --git a/keyboards/lily58/keymaps/vial/config.h b/keyboards/lily58/rev1/keymaps/vial/config.h similarity index 100% rename from keyboards/lily58/keymaps/vial/config.h rename to keyboards/lily58/rev1/keymaps/vial/config.h diff --git a/keyboards/lily58/keymaps/vial/keymap.c b/keyboards/lily58/rev1/keymaps/vial/keymap.c similarity index 100% rename from keyboards/lily58/keymaps/vial/keymap.c rename to keyboards/lily58/rev1/keymaps/vial/keymap.c diff --git a/keyboards/lily58/keymaps/vial/rules.mk b/keyboards/lily58/rev1/keymaps/vial/rules.mk similarity index 100% rename from keyboards/lily58/keymaps/vial/rules.mk rename to keyboards/lily58/rev1/keymaps/vial/rules.mk diff --git a/keyboards/lily58/keymaps/vial/vial.json b/keyboards/lily58/rev1/keymaps/vial/vial.json similarity index 100% rename from keyboards/lily58/keymaps/vial/vial.json rename to keyboards/lily58/rev1/keymaps/vial/vial.json diff --git a/keyboards/ll3macorn/bongopad/keymaps/vial/config.h b/keyboards/ll3macorn/bongopad/keymaps/vial/config.h new file mode 100644 index 0000000000..eb1da9fdd2 --- /dev/null +++ b/keyboards/ll3macorn/bongopad/keymaps/vial/config.h @@ -0,0 +1,12 @@ +// Copyright 2021 Ll3macorn (@ll3macorn) +// SPDX-License-Identifier: GPL-2.0-or-later + +#define VIAL_KEYBOARD_UID {0x08, 0xDB, 0x6F, 0x28, 0x40, 0xFD, 0x6F, 0x58} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 2 } + +#define VIAL_TAP_DANCE_ENTRIES 4 + +#ifndef LAYOUT +#define LAYOUT LAYOUT_default +#endif diff --git a/keyboards/ll3macorn/bongopad/keymaps/vial/keymap.c b/keyboards/ll3macorn/bongopad/keymaps/vial/keymap.c new file mode 100644 index 0000000000..1d2d8c4b4b --- /dev/null +++ b/keyboards/ll3macorn/bongopad/keymaps/vial/keymap.c @@ -0,0 +1,46 @@ +// Copyright 2021 Ll3macorn (@ll3macorn) +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H +#include + +enum layers { + Layer1, + Layer2, + Layer3, + Layer4 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [Layer1] = LAYOUT( + KC_MUTE, + KC_7, KC_8, KC_9, + KC_4, KC_5, KC_6, + KC_1, KC_2, KC_3), + + [Layer2] = LAYOUT( + KC_SPC, + KC_SPC, KC_SPC, KC_SPC, + KC_SPC, KC_SPC, KC_SPC, + KC_SPC, KC_SPC, KC_SPC), + + [Layer3] = LAYOUT( + KC_SPC, + KC_SPC, KC_SPC, KC_SPC, + KC_SPC, KC_SPC, KC_SPC, + KC_SPC, KC_SPC, KC_SPC), + + [Layer4] = LAYOUT( + KC_SPC, + KC_SPC, KC_SPC, KC_SPC, + KC_SPC, KC_SPC, KC_SPC, + KC_SPC, KC_SPC, KC_SPC) + +}; + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; diff --git a/keyboards/bongopad/keymaps/vial/rules.mk b/keyboards/ll3macorn/bongopad/keymaps/vial/rules.mk similarity index 100% rename from keyboards/bongopad/keymaps/vial/rules.mk rename to keyboards/ll3macorn/bongopad/keymaps/vial/rules.mk diff --git a/keyboards/bongopad/keymaps/vial/vial.json b/keyboards/ll3macorn/bongopad/keymaps/vial/vial.json similarity index 100% rename from keyboards/bongopad/keymaps/vial/vial.json rename to keyboards/ll3macorn/bongopad/keymaps/vial/vial.json diff --git a/keyboards/sofle/keymaps/vial/config.h b/keyboards/sofle/rev1/keymaps/vial/config.h similarity index 100% rename from keyboards/sofle/keymaps/vial/config.h rename to keyboards/sofle/rev1/keymaps/vial/config.h diff --git a/keyboards/sofle/keymaps/vial/keymap.c b/keyboards/sofle/rev1/keymaps/vial/keymap.c similarity index 100% rename from keyboards/sofle/keymaps/vial/keymap.c rename to keyboards/sofle/rev1/keymaps/vial/keymap.c diff --git a/keyboards/sofle/keymaps/vial/oled.c b/keyboards/sofle/rev1/keymaps/vial/oled.c similarity index 100% rename from keyboards/sofle/keymaps/vial/oled.c rename to keyboards/sofle/rev1/keymaps/vial/oled.c diff --git a/keyboards/sofle/keymaps/vial/readme.md b/keyboards/sofle/rev1/keymaps/vial/readme.md similarity index 100% rename from keyboards/sofle/keymaps/vial/readme.md rename to keyboards/sofle/rev1/keymaps/vial/readme.md diff --git a/keyboards/sofle/keymaps/vial/rules.mk b/keyboards/sofle/rev1/keymaps/vial/rules.mk similarity index 100% rename from keyboards/sofle/keymaps/vial/rules.mk rename to keyboards/sofle/rev1/keymaps/vial/rules.mk diff --git a/keyboards/sofle/keymaps/vial/vial.json b/keyboards/sofle/rev1/keymaps/vial/vial.json similarity index 100% rename from keyboards/sofle/keymaps/vial/vial.json rename to keyboards/sofle/rev1/keymaps/vial/vial.json diff --git a/keyboards/velocifire/sun20pro/config.h b/keyboards/velocifire/sun20pro/config.h index df56760dd1..3781accbcc 100644 --- a/keyboards/velocifire/sun20pro/config.h +++ b/keyboards/velocifire/sun20pro/config.h @@ -2,8 +2,6 @@ #pragma once -#include "config_common.h" - #define VIAL_KEYBOARD_UID {0x97, 0x61, 0x7D, 0x2F, 0xA7, 0x5E, 0x42, 0x40} #define VIAL_UNLOCK_COMBO_ROWS { 0, 4 } @@ -34,8 +32,6 @@ # define BACKLIGHT_LEVELS 3 #endif -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #undef LOCKING_SUPPORT_ENABLE @@ -43,27 +39,13 @@ /* Locking resynchronize hack */ #undef LOCKING_RESYNC_ENABLE -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN -# define RGBLED_NUM 25 -# define RGBLIGHT_HUE_STEP 8 -# define RGBLIGHT_SAT_STEP 8 -# define RGBLIGHT_VAL_STEP 8 -# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -/*== all animations enable ==*/ -# define RGBLIGHT_ANIMATIONS // RGB Matrix # ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT RGBLED_NUM +# define RGB_MATRIX_LED_COUNT 25 // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: @@ -113,5 +95,4 @@ // # define ENABLE_RGB_MATRIX_MULTISPLASH // # define ENABLE_RGB_MATRIX_SOLID_SPLASH // # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -# endif #endif diff --git a/keyboards/velocifire/sun20pro/keymaps/default/keymap.c b/keyboards/velocifire/sun20pro/keymaps/default/keymap.c index 050d743b00..6a49280b8d 100644 --- a/keyboards/velocifire/sun20pro/keymaps/default/keymap.c +++ b/keyboards/velocifire/sun20pro/keymaps/default/keymap.c @@ -2,89 +2,41 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - LAYOUT( - KC_MUTE, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_P1, KC_P2, KC_P3, - KC_INS, KC_PDOT, KC_PENT), + LAYOUT( + TG(1), KC_PSLS, KC_PAST, KC_PMNS, KC_MUTE, + KC_7, KC_8, KC_9, + KC_4, KC_5, KC_6, KC_PPLS, + KC_1, KC_2, KC_3, + KC_0, KC_DOT, KC_PENT), - LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS), + LAYOUT( + _______, _______, _______, _______, _______, + KC_HOME, KC_UP, KC_PGUP, + KC_LEFT, KC_NO, KC_RGHT, _______, + KC_END, KC_DOWN, KC_PGDN, + KC_INS, KC_DEL, _______), - LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS), + LAYOUT( + _______, _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______), - LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS), + LAYOUT( + _______, _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______), }; -void matrix_init_user(void) { -} - -void matrix_scan_user(void) { -} - -void encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } else if (index == 1) { /* Second encoder */ - if (clockwise) { - tap_code(KC_DOWN); - } else { - tap_code(KC_UP); - } - } -} - - -void led_set_user(uint8_t usb_led) { - - if (usb_led & (1 << USB_LED_NUM_LOCK)) { - - } else { - - } - - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { - - } else { - - } - - if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { - - } else { - - } - - if (usb_led & (1 << USB_LED_COMPOSE)) { - - } else { - - } - - if (usb_led & (1 << USB_LED_KANA)) { - - } else { - - } - -} +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(_______, _______) }, + [2] = { ENCODER_CCW_CW(_______, _______) }, + [3] = { ENCODER_CCW_CW(_______, _______) }, +}; +#endif diff --git a/keyboards/velocifire/sun20pro/keymaps/default/rules.mk b/keyboards/velocifire/sun20pro/keymaps/default/rules.mk new file mode 100644 index 0000000000..ee32568148 --- /dev/null +++ b/keyboards/velocifire/sun20pro/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/velocifire/sun20pro/keymaps/vial/rules.mk b/keyboards/velocifire/sun20pro/keymaps/vial/rules.mk index 063771041c..a89d064d20 100644 --- a/keyboards/velocifire/sun20pro/keymaps/vial/rules.mk +++ b/keyboards/velocifire/sun20pro/keymaps/vial/rules.mk @@ -1,24 +1,11 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - VIA_ENABLE = yes VIAL_ENABLE = yes -ENCODER_ENABLE = yes ENCODER_MAP_ENABLE = yes LTO_ENABLE = yes -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 VIALRGB_ENABLE = yes COMBO_ENABLE = no -COMMAND_ENABLE = no # Commands for debug and configuration -CONSOLE_ENABLE = no # Console for debug -EXTRAKEY_ENABLE = yes # Audio control and System control -MUSIC_ENABLE = no QMK_SETTINGS = no TAP_DANCE_ENABLE = yes diff --git a/keyboards/velocifire/sun20pro/rules.mk b/keyboards/velocifire/sun20pro/rules.mk index e19674593e..52e646505a 100644 --- a/keyboards/velocifire/sun20pro/rules.mk +++ b/keyboards/velocifire/sun20pro/rules.mk @@ -1 +1,10 @@ -DEFAULT_FOLDER = velocifire/sun20pro +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +ENCODER_ENABLE = yes +EXTRAKEY_ENABLE = yes +RGB_MATRIX_ENABLE = yes +RGB_MATRIX_DRIVER = WS2812