diff options
author | jack <[email protected]> | 2023-06-03 01:08:15 -0600 |
---|---|---|
committer | jack <[email protected]> | 2023-06-03 01:08:15 -0600 |
commit | 3a489338559d2ab4f39763d9a191f0bde5eee736 (patch) | |
tree | baeab3a29e119e5c1fef888d5f2e232ab047a6e5 | |
parent | 1c2ebbe1a4d4924a94cbce10126af8626a3a9645 (diff) | |
download | qmk_me-3a489338559d2ab4f39763d9a191f0bde5eee736.tar.gz qmk_me-3a489338559d2ab4f39763d9a191f0bde5eee736.zip |
add locus & other misc changes
-rw-r--r-- | keyboards/leftover30/info.json | 15 | ||||
-rw-r--r-- | keyboards/leftover30/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/locus/info.json | 63 | ||||
-rw-r--r-- | keyboards/locus/keymaps/waffle/keymap.c | 24 | ||||
-rw-r--r-- | keyboards/locus/rules.mk | 0 | ||||
-rw-r--r-- | keyboards/relic/info.json | 8 | ||||
-rw-r--r-- | keyboards/relic/keymaps/waffle/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/vault35/info.json | 4 | ||||
-rw-r--r-- | keyboards/xyz60/info.json | 4 | ||||
-rw-r--r-- | keymaps/kyria/config.h | 3 | ||||
-rw-r--r-- | keymaps/kyria/mcuconf.h | 8 | ||||
-rw-r--r-- | keymaps/kyria/readme.md | 15 | ||||
-rw-r--r-- | waffle/raw.py | 2 | ||||
-rw-r--r-- | waffle/rules.mk | 1 | ||||
-rw-r--r-- | waffle/tapping.c | 2 |
15 files changed, 111 insertions, 41 deletions
diff --git a/keyboards/leftover30/info.json b/keyboards/leftover30/info.json index 1ece731..e2e2b46 100644 --- a/keyboards/leftover30/info.json +++ b/keyboards/leftover30/info.json @@ -6,26 +6,29 @@ "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", "encoder": { - "enabled": true, "rotary": [ {"pin_a": "B12", "pin_b": "B14"} ] }, "features": { - "rgblight": true + "rgblight": true, + "encoder": true }, "matrix_pins": { "cols": ["A15", "B9", "B8", "B7", "B6", "B5", "C14", "C15", "F1", "F0", "A1"], "rows": ["B3", "B4", "C13", "A5"] }, "rgblight": { - "led_count": 7, - "pin": "B15" + "led_count": 7 + }, + "ws2812": { + "pin": "B15", + "driver": "spi" }, "usb": { - "device_version": "1.0.0", "pid": "0x6C6F", - "vid": "0x6A73" + "vid": "0x6A73", + "device_version": "1.0.0" }, "layouts": { "LAYOUT": { diff --git a/keyboards/leftover30/rules.mk b/keyboards/leftover30/rules.mk index 38f8df2..d72d8f8 100644 --- a/keyboards/leftover30/rules.mk +++ b/keyboards/leftover30/rules.mk @@ -1,2 +1 @@ -WS2812_DRIVER = spi OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/locus/info.json b/keyboards/locus/info.json new file mode 100644 index 0000000..d590c5b --- /dev/null +++ b/keyboards/locus/info.json @@ -0,0 +1,63 @@ +{ + "keyboard_me": "locus", + "manufacturer": "waffles", + "maintainer": "waffle87", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["F0", "F1", "B3", "B2", "B1", "B0", "C7", "C6", "B6", "B5", "B4", "D7"], + "rows": ["D5", "F5", "F6", "D6"] + }, + "usb": { + "vid": "0x6A73", + "pid": "0x6C0A", + "device_version": "1.0.0" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "", "matrix": [0, 0], "x": 0, "y": 0 }, + {"label": "q", "matrix": [0, 1], "x": 1, "y": 0 }, + {"label": "w", "matrix": [0, 2], "x": 2, "y": 0 }, + {"label": "e", "matrix": [0, 3], "x": 3, "y": 0 }, + {"label": "r", "matrix": [0, 4], "x": 4, "y": 0 }, + {"label": "t", "matrix": [0, 5], "x": 5, "y": 0 }, + {"label": "y", "matrix": [0, 6], "x": 7, "y": 0 }, + {"label": "u", "matrix": [0, 7], "x": 8, "y": 0 }, + {"label": "i", "matrix": [0, 8], "x": 9, "y": 0 }, + {"label": "o", "matrix": [0, 9], "x": 10, "y": 0 }, + {"label": "p", "matrix": [0, 10], "x": 11, "y": 0 }, + {"label": "", "matrix": [0, 11], "x": 12, "y": 0 }, + {"label": "", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25 }, + {"label": "a", "matrix": [1, 1], "x": 1.25, "y": 1 }, + {"label": "s", "matrix": [1, 2], "x": 2.25, "y": 1 }, + {"label": "d", "matrix": [1, 3], "x": 3.25, "y": 1 }, + {"label": "f", "matrix": [1, 4], "x": 4.25, "y": 1 }, + {"label": "g", "matrix": [1, 5], "x": 5.25, "y": 1 }, + {"label": "h", "matrix": [1, 6], "x": 7.25, "y": 1 }, + {"label": "j", "matrix": [1, 7], "x": 8.25, "y": 1 }, + {"label": "k", "matrix": [1, 8], "x": 9.25, "y": 1 }, + {"label": "l", "matrix": [1, 9], "x": 10.25, "y": 1 }, + {"label": ";", "matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75 }, + {"label": "", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 }, + {"label": "z", "matrix": [2, 1], "x": 1.75, "y": 2 }, + {"label": "x", "matrix": [2, 2], "x": 2.75, "y": 2 }, + {"label": "c", "matrix": [2, 3], "x": 3.75, "y": 2 }, + {"label": "v", "matrix": [2, 4], "x": 4.75, "y": 2 }, + {"label": "b", "matrix": [2, 5], "x": 5.75, "y": 2 }, + {"label": "n", "matrix": [2, 7], "x": 8.75, "y": 2 }, + {"label": "m", "matrix": [2, 8], "x": 9.75, "y": 2 }, + {"label": ",", "matrix": [2, 9], "x": 10.75, "y": 2 }, + {"label": ".", "matrix": [2, 10], "x": 11.75, "y": 2 }, + {"label": "/", "matrix": [2, 11], "x": 12.75, "y": 2, "w": 1.25}, + {"label": "../", "matrix": [3, 0], "x": 0.5, "y": 3, "w": 1.5 }, + {"label": "esc", "matrix": [3, 2], "x": 3, "y": 3 }, + {"label": "spc", "matrix": [3, 4], "x": 4, "y": 3, "w": 2.25 }, + {"label": "bspc", "matrix": [3, 7], "x": 7.5, "y": 3, "w": 2.75 }, + {"label": "", "matrix": [3, 9], "x": 10.25, "y": 3 }, + {"label": "", "matrix": [3, 11], "x": 12, "y": 3, "w": 1.5 } + ] + } + } +} diff --git a/keyboards/locus/keymaps/waffle/keymap.c b/keyboards/locus/keymaps/waffle/keymap.c new file mode 100644 index 0000000..15c419a --- /dev/null +++ b/keyboards/locus/keymaps/waffle/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2022 jack (@waffle87) +// SPDX-License-Identifier: GPL-3.0-or-later +#include "waffle.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_waffle( + _______, ___BASE1___, _______, + _______, ___BASE2___, + _______, ___BASE3___, + UPDIR, KC_ESC, LWRSPC, RSEBSP, C(S(KC_V)), PNP + ), + [_LOWER] = LAYOUT_waffle( + _______, ___LOWER1___, _______, + _______, ___LOWER2___, + _______, ___LOWER3___, + _______, _______, _______, _______, _______, _______ + ), + [_RAISE] = LAYOUT_waffle( + _______, ___RAISE1___, _______, + _______, ___RAISE2___, + _______, ___RAISE3___, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/locus/rules.mk b/keyboards/locus/rules.mk new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/keyboards/locus/rules.mk diff --git a/keyboards/relic/info.json b/keyboards/relic/info.json index 461c88a..583eed7 100644 --- a/keyboards/relic/info.json +++ b/keyboards/relic/info.json @@ -27,7 +27,7 @@ {"label": "i", "matrix": [0, 7], "x": 8, "y": 0}, {"label": "o", "matrix": [0, 8], "x": 9, "y": 0}, {"label": "p", "matrix": [0, 9], "x": 10, "y": 0}, - {"label": "", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "", "matrix": [0, 10], "x": 11, "y": 0}, {"label": "a", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, {"label": "s", "matrix": [1, 1], "x": 1.25, "y": 1}, {"label": "d", "matrix": [1, 2], "x": 2.25, "y": 1}, @@ -48,12 +48,12 @@ {"label": ",", "matrix": [2, 7], "x": 8.75, "y": 2}, {"label": ".", "matrix": [2, 8], "x": 9.75, "y": 2}, {"label": "/", "matrix": [2, 9], "x": 10.75, "y": 2, "w": 1.25}, - {"label": "", "matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25}, + {"label": "", "matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25}, {"label": "esc", "matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25}, {"label": "spc", "matrix": [3, 4], "x": 2.75, "y": 3, "w": 3}, {"label": "bspc", "matrix": [3, 6], "x": 5.75, "y": 3, "w": 3}, - {"label": "", "matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.25}, - {"label": "", "matrix": [3, 9], "x": 10, "y": 3, "w": 1.25} + {"label": "", "matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.25}, + {"label": "", "matrix": [3, 9], "x": 10, "y": 3, "w": 1.25} ] } } diff --git a/keyboards/relic/keymaps/waffle/keymap.c b/keyboards/relic/keymaps/waffle/keymap.c index a1aff3c..ce9cdde 100644 --- a/keyboards/relic/keymaps/waffle/keymap.c +++ b/keyboards/relic/keymaps/waffle/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_VOLD, KC_ESC, LWRSPC, RSEBSP, C(S(KC_V)), KC_VOLU ), [_LOWER] = LAYOUT_waffle( - ___LOWER1___, QK_MAKE, + ___LOWER1___, _______, ___LOWER2___, ___LOWER3___, _______, TABLE1, _______, _______, TABLE2, _______ diff --git a/keyboards/vault35/info.json b/keyboards/vault35/info.json index acfc63a..0005617 100644 --- a/keyboards/vault35/info.json +++ b/keyboards/vault35/info.json @@ -9,15 +9,15 @@ "cols": ["B1", "D3", "F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5"], "rows": ["B4", "D4", "B0", "C7"] }, - "features": { "rgblight": true }, "usb": { "vid": "0x6A73", "pid": "0x3335", "device_version": "1.0.0" }, + "features": { "rgblight": true }, + "ws2812": { "pin": "D5" }, "rgblight": { "led_count": 12, - "pin": "D5", "sleep": true }, "layouts": { diff --git a/keyboards/xyz60/info.json b/keyboards/xyz60/info.json index 6d0ebdd..18c7e8e 100644 --- a/keyboards/xyz60/info.json +++ b/keyboards/xyz60/info.json @@ -10,9 +10,9 @@ "rows": ["B7", "B9", "B12", "B14", "B15"] }, "usb": { - "device_version": "0.0.1", "pid": "0x7879", - "vid": "0x6A73" + "vid": "0x6A73", + "device_version": "0.0.1" }, "layouts": { "LAYOUT_60_ansi_tsangan": { diff --git a/keymaps/kyria/config.h b/keymaps/kyria/config.h index 64c6132..8e95a60 100644 --- a/keymaps/kyria/config.h +++ b/keymaps/kyria/config.h @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #define WPM_GRAPH -#define I2C_DRIVER I2CD0 #define SPLIT_POINTING_ENABLE #define POINTING_DEVICE_RIGHT #define CIRQUE_PINNACLE_CURVED_OVERLAY @@ -14,3 +13,5 @@ #define CRC8_OPTIMIZE_SPEED #define ENABLE_RGB_MATRIX_BAND_SAT #define ENABLE_RGB_MATRIX_RAINDROPS +#define I2C1_CLOCK_SPEED 1000000 +#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR diff --git a/keymaps/kyria/mcuconf.h b/keymaps/kyria/mcuconf.h deleted file mode 100644 index 4984ee0..0000000 --- a/keymaps/kyria/mcuconf.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2022 jack (@waffle87) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include_next <mcuconf.h> - -#undef RP_I2C_USE_I2C0 -#define RP_I2C_USE_I2C0 TRUE diff --git a/keymaps/kyria/readme.md b/keymaps/kyria/readme.md index cc9bab8..517429a 100644 --- a/keymaps/kyria/readme.md +++ b/keymaps/kyria/readme.md @@ -1,22 +1,9 @@ ### rp2040 kyria rev2 -![photo](https://i.imgur.com/P0urp7n.jpeg) +![photo](https://i.imgur.com/P0urp7nh.jpeg) #### parts & notes * microcontrollers: [boardsource blok](https://boardsource.xyz/store/628b95b494dfa308a6581622) -blok uses GPIO16/17 for "standard" I2C pins, differing from what's found in [`/platforms/chibios/boards/QMK_PM2040/configs`](https://github.com/qmk/qmk_firmware/tree/develop/platforms/chibios/boards/QMK_PM2040/configs). -this means the following changes are required if using blok: - -`config.h` -```c -#define I2C_DRIVER I2CD1 -``` -`mcuconf.h` -```c -#undef RP_I2C_USE_I2C0 -#define RP_I2C_USE_I2C0 TRUE -``` - * [35mm cirque trackpad](https://www.mouser.com/ProductDetail/Cirque/TM035035-2024-003?qs=sGAEpiMZZMu3sxpa5v1qrmePy6bg6o9msS9wwvLw9t0%3D) and [holder](https://www.thingiverse.com/thing:5385829) to use I2C, R1 resistor must be removed. diff --git a/waffle/raw.py b/waffle/raw.py index dbb94fa..81533f6 100644 --- a/waffle/raw.py +++ b/waffle/raw.py @@ -27,7 +27,7 @@ def send_packet(data): if interface is None: print("no device found") sys.exit(1) - request_data = [0x00] * 33 #hidapi does not send first byte to host + request_data = [0x00] * 32 request_data[1:len(data) + 1] = data request_packet = bytes(request_data) try: diff --git a/waffle/rules.mk b/waffle/rules.mk index def6c12..caa8e8e 100644 --- a/waffle/rules.mk +++ b/waffle/rules.mk @@ -12,6 +12,7 @@ MOUSEKEY_ENABLE = yes MAGIC_ENABLE = no CONSOLE_ENABLE = no DEBOUNCE_TYPE = asym_eager_defer_pk +INTROSPECTION_KEYMAP_C = waffle.c SRC += waffle.c tapping.c diff --git a/waffle/tapping.c b/waffle/tapping.c index 95373a0..2c7e93e 100644 --- a/waffle/tapping.c +++ b/waffle/tapping.c @@ -19,7 +19,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case LWRSPC: case ESCLWR: - return TAPPING_TERM - 20; + return TAPPING_TERM - 40; case LINKS: case PNP: case TD(QUOT_DQUO): |