From f2b29ca976a636a58edc18478794c26e2ae49333 Mon Sep 17 00:00:00 2001 From: freznel10 Date: Thu, 2 Feb 2023 15:32:34 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 49c912f9b4148dea4499db30438fe8465bce401a Author: jpe230 Date: Wed Feb 1 21:31:54 2023 -0600 QP: Correct rotation and offset when using LVGL (#19713) Co-authored-by: Nick Brassel Co-authored-by: Joel Challis commit 771763039076af2481b65a2823bbb57670beb995 Merge: 1c772eb618 8dc66867e2 Author: QMK Bot Date: Wed Feb 1 18:55:53 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 8dc66867e25493c8bffc1bea2c4de1334f4ca475 Author: adiabatic Date: Wed Feb 1 10:55:12 2023 -0800 zweihander-macos: Update keys, add capslock (#19730) * Update to current Scroll Lock/Power names * Replace `'` with `⇪` commit 1c772eb618018e09e28340e5ca31a63ff2eac815 Merge: 0ee48d287a ca8b4b8e30 Author: QMK Bot Date: Wed Feb 1 17:27:17 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit ca8b4b8e305444039a10755e280be7f0e19aaf85 Author: a_marmot <90110685+a-marmot@users.noreply.github.com> Date: Wed Feb 1 09:26:37 2023 -0800 [Keyboard] Add modded Razer Orbweaver with RP2040 (#19711) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Sergey Vlasov commit 0ee48d287a504da2c20219e71b48c26d95de4e2a Merge: 944b6107e2 252b041b97 Author: QMK Bot Date: Wed Feb 1 14:14:10 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 252b041b97c03374e8f10570a54992f7f91f5f26 Author: Patryk <61631089+patrykf03@users.noreply.github.com> Date: Wed Feb 1 14:13:18 2023 +0000 add Mecx Labs mp1 macropad (#19064) * add mecxlabs mp1 macropad Co-authored-by: Joel Challis commit 944b6107e2b23cb6c4699901154e4bbd7ff53231 Author: Joel Challis Date: Tue Jan 31 01:02:17 2023 +0000 Fix midi after recent refactoring (#19723) commit b867522f8cf90aef6f4531e669e35aba5ec0bf1c Author: Ryan Date: Tue Jan 31 07:45:41 2023 +1100 Clean up Force NKRO in config.h (#19718) commit d84a7351ea965010ea51a2c9410add0f4e0306de Author: Joel Challis Date: Mon Jan 30 20:40:12 2023 +0000 Strip out more of config_common (#19722) commit f6dd8dea2e493dc549a60fee99de871c4088d09a Author: Nick Brassel Date: Tue Jan 31 06:03:30 2023 +1100 Remove usages of config_common.h from config.h files. (#19714) commit 2d843088a26ee639287d16fbd9ca4c35e18f7b8b Author: Ryan Date: Tue Jan 31 05:37:19 2023 +1100 Normalise Swap Hands keycodes (#19720) commit cc9520b7a02ccdc97f79a800de04ff4ea15f2656 Merge: ef6505ad75 e296d67146 Author: QMK Bot Date: Mon Jan 30 08:48:34 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit e296d671463f38a78c75ee0727016939634ef985 Author: Nick Brassel Date: Mon Jan 30 19:47:46 2023 +1100 Accumulate version.h generator flags. (#19716) commit ef6505ad7547f9651bddc309bd323d029d1fac64 Merge: 242b80c63f 2c878b1b16 Author: fauxpark Date: Mon Jan 30 18:55:36 2023 +1100 Merge remote-tracking branch 'upstream/master' into develop commit 242b80c63ffff022172755da35fb4767d5f837c2 Author: Ryan Date: Mon Jan 30 18:47:50 2023 +1100 Move MIDI code out of tmk_core (#19704) commit 968cc1fe7b5c99f85d2888071fed8511125ebe9b Author: Joel Challis Date: Mon Jan 30 04:10:40 2023 +0000 Relocate diode direction definitions (#19715) commit 2c878b1b161ae10332fdc4d69f3d1f86d2726c5c Author: Ryan Date: Mon Jan 30 14:37:02 2023 +1100 Clean up `qmk generate-autocorrect-data` (#19710) commit 328279ac592bcb61fcc12097287a75bfaa5e7a3d Author: Wolf Van Herreweghe Date: Sun Jan 29 23:58:07 2023 +0100 Add base firmware for the Frog Numpad (#19698) Co-authored-by: Wolf Van Herreweghe Co-authored-by: Drashna Jaelre Co-authored-by: jack <0x6a73@protonmail.com> commit d322b4c041d4b600fee00ba7f94966ac9a9e2dfa Author: yiancar Date: Sun Jan 29 16:59:13 2023 +0000 [Keyboard] Baion 808 (#19690) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis Co-authored-by: yiancar commit 043d8e1140e09327b72ed3bd55f369e1faf1a334 Author: Ryan Date: Mon Jan 30 03:44:16 2023 +1100 Remove deprecated Quantum keycodes (#19712) commit 80cc6ad1877addf065e4ee46d595cfc2c7c56b71 Author: Joel Challis Date: Sat Jan 28 21:16:59 2023 +0000 Fix 19701 merge commit 8cc2e0e906dd8caadd8198839f57c19deea6c87e Author: Joel Challis Date: Sat Jan 28 21:07:51 2023 +0000 Fix quantum ring_buffer for ChibiOS (#19683) commit 832479c7fbc544a3e8b305af7df9996fa3c5ba00 Author: Joel Challis Date: Sat Jan 28 20:40:47 2023 +0000 Split out mcu_selection to platform (#19701) commit 981f3c316cb1619aef554fbb2913c8d1b03b0d08 Author: Albert Y <76888457+filterpaper@users.noreply.github.com> Date: Sun Jan 29 00:41:50 2023 +0800 Additional handedness by EEPROM examples (#19686) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> commit b7274343913eb3e019f0dc08fa8f7774165e787d Author: Ryan Date: Sun Jan 29 02:42:44 2023 +1100 Remove commented out backlight config & stray "backlight levels" (#19703) commit ce7bb639998f97536c562c2cde5afbd3e3a0950e Author: azhizhinov Date: Sat Jan 28 01:52:05 2023 +0300 VIA keymap for Reviung 34. (#19694) VIA keymap for Reviung 34. commit acea06b4f5d7dbbe3a65ea512a367b8fb202b5e2 Author: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Fri Jan 27 13:39:38 2023 -0800 [Keyboard] Update effects for Keychron Q2 (#19685) commit 9aaf1c26f028d22bae8fdf9d63e21d1b9951a3bd Author: Patrick Muldoon Date: Fri Jan 27 08:35:26 2023 -0800 Swap LED_PIN_ON_STATE to 0. (#19692) User reported that CAPS lock Led state was inverted after soldering a LED to their board. LED_PIN_ON_STATE defaults to 1, so just swap to low. Flashed board and now CAPS LED reflects the actual state commit b3dca4bb36d0c08e8145f6f25649aaf61b513fdd Author: Jay Greco Date: Fri Jan 27 00:03:57 2023 -0800 Add RP2040 SCRAMBLE v2 (#19489) commit f1b5659ba8227624a3f31fc551212cb64d8c763f Author: wangfuco <46733695+wangfuco@users.noreply.github.com> Date: Thu Jan 26 22:11:29 2023 -0800 fix pegasushoof caps light, add via keymap (#19649) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan Co-authored-by: Fucong Wang commit 6e42b5854902963469a4016abeca48a9df5c1c46 Author: AnotherStranger Date: Thu Jan 26 22:14:34 2023 +0100 VIA keymap for the dactyl manuform 4x6 (#19668) Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> Co-authored-by: Drashna Jaelre commit 19ecd697570784bff8803edc2f18a8ee75d3d4ce Author: Charly Delay <0xcharly@users.noreply.github.com> Date: Fri Jan 27 03:43:08 2023 +0900 Rename `LAYOUT` macros identifier that contained the keyboard name (#19657) commit ad817a71a3b6bdb21c2e628d853e6312d7aa0100 Merge: 81ca83296f 3823046712 Author: QMK Bot Date: Thu Jan 26 16:35:07 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 3823046712c3c28c14a219b78d7d3bc30f76493f Author: schwarzer-geiger Date: Thu Jan 26 11:34:27 2023 -0500 new keyboard: edinburgh41 (#19569) * added edinburgh41 Co-authored-by: Joel Challis Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan Co-authored-by: Drashna Jaelre commit 81ca83296f3a9d9101ea9d88830cfcf427e8d944 Author: Sergey Vlasov Date: Wed Jan 25 04:47:55 2023 +0300 analog.c: Fix `pinToMux()` for STM32F0xx (#19658) The `adc_read()` code for STM32F0xx expects to get the 0-based channel number in `mux.input`, but the `pinToMux()` code for STM32F0xx was attempting to pass the CHSELR bit mask in that field, which resulted in selecting a wrong channel, therefore `analogReadPin()` did not work properly for the STM32F0xx chips. Fix `pinToMux()` to put the channel number in that field (this matches the behavior for other supported chips and also allows selection of channels 16...18, which can be used to access the builtin temperature, reference voltage and VBAT sensors). commit 0edf478a5335b5c8fac29a0b77428f0dcbf43316 Merge: 019c3217a6 fa132baa43 Author: QMK Bot Date: Wed Jan 25 00:20:11 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit fa132baa43a69ce7245e977916280eac5f8a0485 Author: Darkhan Date: Wed Jan 25 00:19:32 2023 +0000 Decrease LED animation frequency to improve performance (#19677) commit 019c3217a6f0e794a231084529675ec32da18b73 Merge: 7ff55e67e1 8af872056a Author: QMK Bot Date: Tue Jan 24 20:03:41 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 8af872056afd3b448c5203f4cd773d8c5cee15eb Author: Christian Brauner Date: Tue Jan 24 21:03:05 2023 +0100 [Keymap] Update brauner preonic layout (#19665) commit 7ff55e67e11f127f29c6e71e382bfce2ad89bc64 Merge: d14863c00b 419a7944a4 Author: QMK Bot Date: Tue Jan 24 15:18:09 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 419a7944a461c78e985cf975a5a4e6bacbbeebd2 Author: arrowj <172841+arrowj@users.noreply.github.com> Date: Tue Jan 24 09:17:24 2023 -0600 Update understanding_qmk.md (#19664) Changed "...4 row by 5 column numpad" to "...5 row by 4 column numpad" on line 46. commit d14863c00b1f0885453a20d480faca2681f330a0 Merge: 8767e74c82 b24fa2f9db Author: QMK Bot Date: Tue Jan 24 14:20:10 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit b24fa2f9db91bb5425f2346adda53cfbdc741710 Author: Natan-P Date: Tue Jan 24 15:19:34 2023 +0100 escaped stray backslash in bux.py (#19667) commit 8767e74c82bcbde48e31c8dc7ba37c5ea8ee499f Merge: fca6d16b55 1c69682605 Author: QMK Bot Date: Tue Jan 24 09:20:21 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 1c6968260568e5efba9e4d01cd656e3a15b870b8 Author: MJM <89230047+MATTMCCA@users.noreply.github.com> Date: Tue Jan 24 04:19:42 2023 -0500 [Keyboard] Add the Black Hellebore (#19655) commit fca6d16b5509c677a33d0023e580243e125391ae Merge: 025e530f46 695c4c6030 Author: QMK Bot Date: Tue Jan 24 08:52:36 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 695c4c603005469704cd678a1d3ffb093d7e1231 Author: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Tue Jan 24 00:51:45 2023 -0800 [Keyboard] Add missing `dip_switch_update_kb` for Keychron V2 (#19674) commit 025e530f46277bd1e7f6196ffe017a94caa807fd Merge: dd7b244872 4d180c935a Author: QMK Bot Date: Tue Jan 24 08:05:37 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 4d180c935adc2a5335e03b1f9936a32f6c1d2d06 Author: jack <0x6A73@pm.me> Date: Tue Jan 24 01:04:56 2023 -0700 fixup splitkb/kyria VIA keymap (#19676) commit dd7b24487219b6fbdaa1b3d567364437dd08ff04 Author: jack <0x6A73@pm.me> Date: Mon Jan 23 23:24:56 2023 -0700 Fixup handwired/jscotto/scotto40 (#19675) commit 79d5f2feb3cab5a05c5ef8af671fcbfd90a92873 Merge: 8ca3f0fb7c 4c6415d768 Author: QMK Bot Date: Tue Jan 24 05:43:18 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 4c6415d7682700327af262bfab04dbe61049bd6f Author: cole smith <38364556+daysgobye@users.noreply.github.com> Date: Mon Jan 23 21:42:38 2023 -0800 [Keyboard] Fix boardsource/lulu/avr encoder pins (#19672) commit 8ca3f0fb7c856e5b767d36bc56db883309e29fbf Author: Stefan Kerkmann Date: Mon Jan 23 22:24:21 2023 +0100 [Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver (#19652) Co-authored-by: Sergey Vlasov commit ea05045923630add09551345359d2238176aa7b2 Author: Nick Brassel Date: Tue Jan 24 07:10:03 2023 +1100 Allow overriding of keymap/encodermap layer count. (#19325) commit aea1194ea33fe85a8bdc380bd2cb27d3c3d6078a Author: David Hoelscher Date: Mon Jan 23 14:05:47 2023 -0600 Corrections to uart driver for Chibios platform (#19075) commit dfb28334e4c14f07e9cc9dee323117fcb39facae Merge: 0a51ea28fa 4e658d47f8 Author: QMK Bot Date: Mon Jan 23 10:23:39 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 4e658d47f8dfbb303e574bbd07c0d6568152175d Author: youturn45 Date: Mon Jan 23 05:23:00 2023 -0500 [Keymap] Add youturn/yt keymap for think65 (#19300) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre Co-authored-by: Jue Liu commit 0a51ea28fa6f512a32655c6a23d26c83cee46fd0 Merge: 603c86b6a2 9c7490d7cb Author: QMK Bot Date: Mon Jan 23 09:39:16 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 9c7490d7cb1bdb2232687153e542d813bfa53db3 Author: Joe Scotto Date: Mon Jan 23 04:38:22 2023 -0500 [Keyboard] Add Scotto40 Keyboard (#18453) Co-authored-by: Drashna Jaelre Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- .../dactyl_manuform/4x6/keymaps/via/config.h | 29 +++-- .../jscotto/scotto40/keymaps/default/config.h | 4 +- keyboards/handwired/orbweaver/config.h | 24 ++++ keyboards/handwired/orbweaver/info.json | 59 ++++++++++ .../orbweaver/keymaps/default/keymap.c | 110 ++++++++++++++++++ keyboards/handwired/orbweaver/orbweaver.c | 84 +++++++++++++ keyboards/handwired/orbweaver/readme.md | 39 +++++++ keyboards/handwired/orbweaver/rules.mk | 3 + keyboards/mecxlabs/mp1/info.json | 46 ++++++++ .../mecxlabs/mp1/keymaps/default/keymap.c | 22 ++++ keyboards/mecxlabs/mp1/readme.md | 23 ++++ keyboards/mecxlabs/mp1/rules.mk | 4 + keyboards/ryanbaekr/rb18/config.h | 4 - keyboards/ryanbaekr/rb69/config.h | 4 - keyboards/ryanbaekr/rb86/config.h | 4 - keyboards/zerf9/space_control1/post_config.h | 16 +++ keyboards/zerf9/spacetrack/post_config.h | 14 ++- .../ergodox/zweihander-macos/keymap.c | 36 +++--- .../ergodox/zweihander-macos/readme.markdown | 8 ++ quantum/painter/lvgl/qp_lvgl.c | 20 ++-- 20 files changed, 504 insertions(+), 49 deletions(-) create mode 100644 keyboards/handwired/orbweaver/config.h create mode 100644 keyboards/handwired/orbweaver/info.json create mode 100644 keyboards/handwired/orbweaver/keymaps/default/keymap.c create mode 100644 keyboards/handwired/orbweaver/orbweaver.c create mode 100644 keyboards/handwired/orbweaver/readme.md create mode 100644 keyboards/handwired/orbweaver/rules.mk create mode 100644 keyboards/mecxlabs/mp1/info.json create mode 100644 keyboards/mecxlabs/mp1/keymaps/default/keymap.c create mode 100644 keyboards/mecxlabs/mp1/readme.md create mode 100644 keyboards/mecxlabs/mp1/rules.mk diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h index 9b5c00e9e4bd..6ae21db39277 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h +++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h @@ -1,6 +1,7 @@ /* -<<<<<<<< HEAD:keyboards/handwired/jscotto/scotto40/keymaps/default/config.h -Copyright 2022 Joe Scotto +<<<<<<<< HEAD:keyboards/zerf9/space_control1/post_config.h +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert ======== This is the c configuration file for the keymap @@ -16,7 +17,7 @@ the Free Software Foundation, either version 2 of the License, or 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 +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 @@ -25,12 +26,22 @@ along with this program. If not, see . #pragma once -<<<<<<<< HEAD:keyboards/handwired/jscotto/scotto40/keymaps/default/config.h -// Define options -#define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_TERM 135 -#define PERMISSIVE_HOLD -#define TAPPING_TERM_PER_KEY +<<<<<<<< HEAD:keyboards/zerf9/space_control1/post_config.h +#ifndef RGBLIGHT_LIMIT_VAL +# if defined(OLED_ENABLE) +# define RGBLIGHT_LIMIT_VAL 100 +# else +# define RGBLIGHT_LIMIT_VAL 150 +# endif +#endif + +#ifndef OLED_BRIGHTNESS +# ifdef RGBLIGHT_ENABLE +# define OLED_BRIGHTNESS 80 +# else +# define OLED_BRIGHTNESS 150 +# endif +#endif ======== /* Select hand configuration */ // #define MASTER_LEFT diff --git a/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h b/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h index 496bf865fd82..981a63774fd9 100644 --- a/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h +++ b/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h @@ -1,5 +1,5 @@ /* -<<<<<<<< HEAD:keyboards/zerf9/chunky2040/post_config.h +<<<<<<<< HEAD:keyboards/zerf9/spacetrack/post_config.h Copyright 2012 Jun Wako Copyright 2015 Jack Humbert ======== @@ -22,7 +22,7 @@ along with this program. If not, see . #pragma once -<<<<<<<< HEAD:keyboards/zerf9/chunky2040/post_config.h +<<<<<<<< HEAD:keyboards/zerf9/spacetrack/post_config.h #ifndef RGBLIGHT_LIMIT_VAL # if defined(OLED_ENABLE) # define RGBLIGHT_LIMIT_VAL 100 diff --git a/keyboards/handwired/orbweaver/config.h b/keyboards/handwired/orbweaver/config.h new file mode 100644 index 000000000000..ab7cb9d9d5e9 --- /dev/null +++ b/keyboards/handwired/orbweaver/config.h @@ -0,0 +1,24 @@ +// Copyright 2023 a_marmot +// +// 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 <http://www.gnu.org/licenses/>. +// +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define DRIVER_COUNT 1 +#define DRIVER_ADDR_1 0b1110100 +#define RGB_MATRIX_LED_COUNT 20 +#define I2C1_CLOCK_SPEED 100000 +#define RGB_MATRIX_CENTER { 40, 30 } diff --git a/keyboards/handwired/orbweaver/info.json b/keyboards/handwired/orbweaver/info.json new file mode 100644 index 000000000000..e9b37e1c81cb --- /dev/null +++ b/keyboards/handwired/orbweaver/info.json @@ -0,0 +1,59 @@ +{ + "manufacturer": "a_marmot", + "keyboard_name": "orbweaver", + "maintainer": "a_marmot", + "bootloader": "rp2040", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "rows": ["GP4", "GP5", "GP6", "GP7", "GP8", "GP9"], + "cols": ["GP12", "GP13", "GP14", "GP15", "GP16"] + }, + "processor": "RP2040", + "url": "https://geekhack.org/index.php?topic=119396.0", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "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": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [1, 4], "x": 4, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [2, 4], "x": 4, "y": 2 }, + { "matrix": [3, 0], "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 1, "y": 3 }, + { "matrix": [3, 2], "x": 2, "y": 3 }, + { "matrix": [3, 3], "x": 3, "y": 3 }, + { "matrix": [3, 4], "x": 4, "y": 3 }, + { "matrix": [4, 0], "x": 0, "y": 4 }, + { "matrix": [4, 1], "x": 1, "y": 4 }, + { "matrix": [4, 2], "x": 2, "y": 4 }, + { "matrix": [4, 3], "x": 3, "y": 4 }, + { "matrix": [4, 4], "x": 4, "y": 4 }, + { "matrix": [5, 0], "x": 0, "y": 5 }, + { "matrix": [5, 1], "w": 4, "x": 1, "y": 5 } + ] + } + } +} diff --git a/keyboards/handwired/orbweaver/keymaps/default/keymap.c b/keyboards/handwired/orbweaver/keymaps/default/keymap.c new file mode 100644 index 000000000000..fb168264306a --- /dev/null +++ b/keyboards/handwired/orbweaver/keymaps/default/keymap.c @@ -0,0 +1,110 @@ +/* Copyright 2023 a_marmot +* +* 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 <http://www.gnu.org/licenses/>. +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +//generic default keymap with Razor defaults (+ mode toggle) + + /* + * ┌───┬───┬───┬───┬───┐ + * │Esc│ 1 │ 2 │ 3 │ 4 │ + * ├───┼───┼───┼───┼───┤ + * │Tab│ q │ w │ e │ r │ + * ├───┼───┼───┼───┼───┤ + * │Cap│ a │ s │ d │ f │ + * ├───┼───┼───┼───┼───┤ + * │Shi│ z │ x │ c │ v │ + * ├───┼───┼───┼───┼───┤ + * │Alt│ ↑ │ ↓ │ → │ ← │ + * ├───────┴┬──┴───┴───┤ + * │Spacebar│change map│ + * └────────┴──────────┘ + */ + + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, + KC_LALT, KC_UP, KC_DOWN, KC_RIGHT, KC_LEFT, + KC_SPACE, TO(1) + ), + +//Second example keymap with all modifier keys replaced with numbers or letters + + /* + * ┌───┬───┬───┬───┬───┐ + * │ 0 │ 1 │ 2 │ 3 │ 4 │ + * ├───┼───┼───┼───┼───┤ + * │ i │ q │ w │ e │ r │ + * ├───┼───┼───┼───┼───┤ + * │ j │ a │ s │ d │ f │ + * ├───┼───┼───┼───┼───┤ + * │ k │ z │ x │ c │ v │ + * ├───┼───┼───┼───┼───┤ + * │ l │ ↑ │ ↓ │ → │ ← │ + * ├───────┴┬──┴───┴───┤ + * │Spacebar│change map│ + * └────────┴──────────┘ + */ + + [1] = LAYOUT( + KC_0, KC_1, KC_2, KC_3, KC_4, + KC_I, KC_Q, KC_W, KC_E, KC_R, + KC_J, KC_A, KC_S, KC_D, KC_F, + KC_K, KC_Z, KC_X, KC_C, KC_V, + KC_L, KC_UP, KC_DOWN, KC_RIGHT, KC_LEFT, + KC_SPACE, TO(0) + ) +//, add more keymaps here + +}; + +static const uint8_t colormap[][20][3] = { + +// colors for the default key map in hex RGB values + { + {0x00, 0x00, 0xFF},{0xE7, 0xFF, 0x00},{0xE7, 0xFF, 0x00},{0xE7, 0xFF, 0x00},{0xE7, 0xFF, 0x00}, + {0xFF, 0x70, 0x00},{0x00, 0xFF, 0xFF},{0x80, 0x00, 0xFF},{0x00, 0xFF, 0xFF},{0x00, 0xFF, 0xFF}, + {0xFF, 0x70, 0x00},{0x80, 0x00, 0xFF},{0x80, 0x00, 0xFF},{0x80, 0x00, 0xFF},{0x00, 0xFF, 0xFF}, + {0xFF, 0x70, 0x00},{0x00, 0xFF, 0xFF},{0x00, 0xFF, 0xFF},{0x00, 0xFF, 0xFF},{0x00, 0xFF, 0xFF} + }, + +// colors for the 2nd key map + { + {0xE7, 0xFF, 0x00},{0xE7, 0xFF, 0x00},{0xE7, 0xFF, 0x00},{0xE7, 0xFF, 0x00},{0xE7, 0xFF, 0x00}, + {0x00, 0xFF, 0xFF},{0x00, 0xFF, 0xFF},{0x80, 0x00, 0xFF},{0x00, 0xFF, 0xFF},{0x00, 0xFF, 0xFF}, + {0x00, 0xFF, 0xFF},{0x80, 0x00, 0xFF},{0x80, 0x00, 0xFF},{0x80, 0x00, 0xFF},{0x00, 0xFF, 0xFF}, + {0x00, 0xFF, 0xFF},{0x00, 0xFF, 0xFF},{0x00, 0xFF, 0xFF},{0x00, 0xFF, 0xFF},{0x00, 0xFF, 0xFF} + } +//, add more keymaps here + +}; + + +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + for (uint8_t i = led_min; i < led_max; i++) { + rgb_matrix_set_color(i, + colormap[get_highest_layer(layer_state|default_layer_state)][i][0], + colormap[get_highest_layer(layer_state|default_layer_state)][i][1], + colormap[get_highest_layer(layer_state|default_layer_state)][i][2]); + } + + return false; +} + diff --git a/keyboards/handwired/orbweaver/orbweaver.c b/keyboards/handwired/orbweaver/orbweaver.c new file mode 100644 index 000000000000..f6485b6adfa0 --- /dev/null +++ b/keyboards/handwired/orbweaver/orbweaver.c @@ -0,0 +1,84 @@ +// Copyright 2023 a_marmot +// +// 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 <http://www.gnu.org/licenses/>. +// +// SPDX-License-Identifier: GPL-2.0-or-later + +// This IS31FL3731 configuration is for a Razer Orbweaver Chroma. +// It was reverse-engineered by testing all possible Cx_y combinations (144 total), +// and determining which ones addressed individual diodes (60 total). These were then +// placed in order R-G-B, sweeping left to right, and then top to bottom. + +#include "rgb_matrix.h" + +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, C9_1, C8_1, C7_1}, //top left key. + {0, C9_2, C8_2, C7_2}, + {0, C9_3, C8_3, C7_3}, + {0, C9_4, C8_4, C7_4}, + {0, C9_5, C8_5, C7_5}, //top right key. + {0, C9_6, C8_6, C7_6}, + {0, C9_7, C8_7, C6_6}, + {0, C9_8, C7_7, C6_7}, + {0, C1_8, C2_8, C3_8}, + {0, C1_7, C2_7, C3_7}, + {0, C1_6, C2_6, C3_6}, + {0, C1_5, C2_5, C3_5}, + {0, C1_4, C2_4, C3_4}, + {0, C1_3, C2_3, C3_3}, + {0, C1_2, C2_2, C4_3}, + {0, C1_1, C3_2, C4_2}, //lower left key + {0, C9_9, C8_9, C7_9}, + {0, C9_10, C8_10, C7_10}, + {0, C9_11, C8_11, C7_11}, + {0, C9_12, C8_12, C7_12} //lower right key + +}; + +led_config_t g_led_config = { + // Matrix location to LED index + { + { 0, 2, 3, 4, 5 }, + { 6, 7, 8, 9, 10 }, + { 11, 12, 13, 14, 15 }, + { 16, 17, 18, 19, 19 }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED } + }, + + // LED index to physical location + { + {0,0}, {20,0}, {40,0}, {60,0}, {80,0}, + {0,20}, {20,20}, {40,20}, {60,20}, {80,20}, + {0,40}, {20,40}, {40,40}, {60,40}, {80,40}, + {0,60}, {20,60}, {40,60}, {60,60}, {80,60} + }, + + // LED index to flags + { + 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4 + } + }; + + + diff --git a/keyboards/handwired/orbweaver/readme.md b/keyboards/handwired/orbweaver/readme.md new file mode 100644 index 000000000000..7075d8a6a319 --- /dev/null +++ b/keyboards/handwired/orbweaver/readme.md @@ -0,0 +1,39 @@ +# orbweaver + +This firmware is for a Razer Orbweaver Chroma keypad, modded to replace the stock MCU +with an Elite Pi RP2040 microcontroller. Mod instructions can be found on [geekhack](https://geekhack.org/index.php?topic=119396.0). + +The firmware controls a 6x5 key matrix (4x5 keypad + 6 additional keys +on the thumb pad and up to 4 additional keys added by user). It also controls a +IS31FL3731 RGB Matrix controller (on the Chroma model) via I2C interface. This requires +a single I2C Driver with 20 common anode RGB LEDs. I found that the I2C clock speed must +be slowed down to 100 kHz for the IS31 chip to keep up (the default for RP2040 seems to +be 400 kHz unless specified otherwise). + +The default key map (layer 0) is a generic layer based on the original Razer defaults. +You can change or add layers as needed, and change static colors in keymap.c + +Many thanks to bomtarnes, Drashna, Dasky, sigprof, and casuanoob for helpful discussions +and coding suggestions and snippets. + +* Keyboard Maintainer: [a_marmot](https://github.com/a-marmot) +* Hardware Supported: RP2040 + IS31FL3731 +* Hardware Availability: [https://geekhack.org/index.php?topic=119396.0](https://geekhack.org/index.php?topic=119396.0) + +Make example for this keyboard (after setting up your build environment): + + make handwired/orbweaver:default + +Flashing example for this keyboard: + + make handwired/orbweaver: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 2 ways: + +* Press and hold the upper left hand key on the main keyboard while you plug in the USB. +* Press and release both reset buttons on the top of the RP2040 inside the modded unit. diff --git a/keyboards/handwired/orbweaver/rules.mk b/keyboards/handwired/orbweaver/rules.mk new file mode 100644 index 000000000000..07c357daaccb --- /dev/null +++ b/keyboards/handwired/orbweaver/rules.mk @@ -0,0 +1,3 @@ +# Add support for 3731 RGB matrix controller +RGB_MATRIX_ENABLE = yes +RGB_MATRIX_DRIVER = IS31FL3731 diff --git a/keyboards/mecxlabs/mp1/info.json b/keyboards/mecxlabs/mp1/info.json new file mode 100644 index 000000000000..db989e5517f9 --- /dev/null +++ b/keyboards/mecxlabs/mp1/info.json @@ -0,0 +1,46 @@ +{ + "keyboard_name": "mp1", + "manufacturer": "Mecx Labs", + "maintainer": "patrykf03", + "usb": { + "vid": "0xC6C6", + "pid": "0x6C6C", + "device_version": "0.0.1" + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "encoder": true + }, + "encoder": { + "rotary": [ + { "pin_a": "A10", "pin_b": "A9", "resolution": 2 } + ] + }, + "matrix_pins": { + "direct": [ + ["B14", "A14", "A15"], + ["B13", "B12", "A2"], + ["A5", "A4", "A3"] + ] + }, + "layouts": { + "LAYOUT_ortho_3x3": { + "layout": [ + { "matrix": [0, 0], "x": 0.0, "y": 0.0 }, + { "matrix": [0, 1], "x": 1.0, "y": 0.0 }, + { "matrix": [0, 2], "x": 2.0, "y": 0.0 }, + { "matrix": [1, 0], "x": 0.0, "y": 1.0 }, + { "matrix": [1, 1], "x": 1.0, "y": 1.0 }, + { "matrix": [1, 2], "x": 2.0, "y": 1.0 }, + { "matrix": [2, 0], "x": 0.0, "y": 2.0 }, + { "matrix": [2, 1], "x": 1.0, "y": 2.0 }, + { "matrix": [2, 2], "x": 2.0, "y": 2.0 } + ] + } + } +} diff --git a/keyboards/mecxlabs/mp1/keymaps/default/keymap.c b/keyboards/mecxlabs/mp1/keymaps/default/keymap.c new file mode 100644 index 000000000000..a58fefbd2d73 --- /dev/null +++ b/keyboards/mecxlabs/mp1/keymaps/default/keymap.c @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_ortho_3x3( + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6, + KC_7, KC_8, KC_9 + ) + +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; +} diff --git a/keyboards/mecxlabs/mp1/readme.md b/keyboards/mecxlabs/mp1/readme.md new file mode 100644 index 000000000000..de0c6e6255ce --- /dev/null +++ b/keyboards/mecxlabs/mp1/readme.md @@ -0,0 +1,23 @@ +# mecxlabs mp1 + +* Keyboard Maintainer: [Patrykf03](https://github.com/Patrykf03) +* Hardware Supported: Mecx Labs mp1 macropad (STM32/APM32F072) +* Hardware Availability: [mecxlabs.com](https://mecxlabs.com/products/mp1-framework) + +Make example for this keyboard (after setting up your build environment): + + make mecxlabs/mp1:default + +Flashing example for this keyboard: + + make mecxlabs/mp1: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 (encoder in top left) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/mecxlabs/mp1/rules.mk b/keyboards/mecxlabs/mp1/rules.mk new file mode 100644 index 000000000000..ee2a7c0d6a92 --- /dev/null +++ b/keyboards/mecxlabs/mp1/rules.mk @@ -0,0 +1,4 @@ +# Wildcard to allow APM32 MCU +DFU_SUFFIX_ARGS = -v FFFF -p FFFF +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/ryanbaekr/rb18/config.h b/keyboards/ryanbaekr/rb18/config.h index cc813fa08e52..d6d244cee273 100644 --- a/keyboards/ryanbaekr/rb18/config.h +++ b/keyboards/ryanbaekr/rb18/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 4 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h index 6022c32960a0..29ff3cf39e0e 100644 --- a/keyboards/ryanbaekr/rb69/config.h +++ b/keyboards/ryanbaekr/rb69/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/ryanbaekr/rb86/config.h b/keyboards/ryanbaekr/rb86/config.h index 8c51531f273d..321b9db230b7 100644 --- a/keyboards/ryanbaekr/rb86/config.h +++ b/keyboards/ryanbaekr/rb86/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/zerf9/space_control1/post_config.h b/keyboards/zerf9/space_control1/post_config.h index 2aea1373cd71..6ae21db39277 100644 --- a/keyboards/zerf9/space_control1/post_config.h +++ b/keyboards/zerf9/space_control1/post_config.h @@ -1,6 +1,14 @@ /* +<<<<<<<< HEAD:keyboards/zerf9/space_control1/post_config.h Copyright 2012 Jun Wako Copyright 2015 Jack Humbert +======== +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +Copyright 2023 André Büsgen +>>>>>>>> upstream/develop:keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h 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 @@ -18,6 +26,7 @@ along with this program. If not, see . #pragma once +<<<<<<<< HEAD:keyboards/zerf9/space_control1/post_config.h #ifndef RGBLIGHT_LIMIT_VAL # if defined(OLED_ENABLE) # define RGBLIGHT_LIMIT_VAL 100 @@ -33,3 +42,10 @@ along with this program. If not, see . # define OLED_BRIGHTNESS 150 # endif #endif +======== +/* Select hand configuration */ +// #define MASTER_LEFT +// #define MASTER_RIGHT + +#define EE_HANDS +>>>>>>>> upstream/develop:keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h diff --git a/keyboards/zerf9/spacetrack/post_config.h b/keyboards/zerf9/spacetrack/post_config.h index 2aea1373cd71..981a63774fd9 100644 --- a/keyboards/zerf9/spacetrack/post_config.h +++ b/keyboards/zerf9/spacetrack/post_config.h @@ -1,6 +1,10 @@ /* +<<<<<<<< HEAD:keyboards/zerf9/spacetrack/post_config.h Copyright 2012 Jun Wako Copyright 2015 Jack Humbert +======== +Copyright 2022 Joe Scotto +>>>>>>>> upstream/develop:keyboards/handwired/jscotto/scotto40/keymaps/default/config.h 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 @@ -9,7 +13,7 @@ the Free Software Foundation, either version 2 of the License, or 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 +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 @@ -18,6 +22,7 @@ along with this program. If not, see . #pragma once +<<<<<<<< HEAD:keyboards/zerf9/spacetrack/post_config.h #ifndef RGBLIGHT_LIMIT_VAL # if defined(OLED_ENABLE) # define RGBLIGHT_LIMIT_VAL 100 @@ -33,3 +38,10 @@ along with this program. If not, see . # define OLED_BRIGHTNESS 150 # endif #endif +======== +// Define options +#define IGNORE_MOD_TAP_INTERRUPT +#define TAPPING_TERM 135 +#define PERMISSIVE_HOLD +#define TAPPING_TERM_PER_KEY +>>>>>>>> upstream/develop:keyboards/handwired/jscotto/scotto40/keymaps/default/config.h diff --git a/layouts/community/ergodox/zweihander-macos/keymap.c b/layouts/community/ergodox/zweihander-macos/keymap.c index d1c444f48dda..07d076f2d3f2 100644 --- a/layouts/community/ergodox/zweihander-macos/keymap.c +++ b/layouts/community/ergodox/zweihander-macos/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | L⌃ | L⌥ | L⌘ | ← | → | | ↑ | ↓ | [ | ] | ↩︎ | * `----------------------------------' `----------------------------------' * ,-------------. ,---------------. - * | `~ | '" | | ⎋ | ⌫ | + * | `~ | ⇪ | | ⎋ | ⌫ | * ,------|------|------| |------+--------+------. * | | | PgUp | | PgDn | | | * | ↩︎ | ⇥ |------| |------| ⇥ | | @@ -34,14 +34,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Otherwise, it needs KC_* [BASE] = LAYOUT_ergodox( // layer 0 : default // left hand - KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(SYMB), - KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(SYMB), - KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LGUI, - KC_LCTL, KC_LALT, KC_LGUI,KC_LEFT,KC_RGHT, - KC_GRV, KC_QUOT, - KC_PGUP, - KC_ENT ,KC_TAB ,KC_RALT, + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(SYMB), + KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(SYMB), + KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LGUI, + KC_LCTL, KC_LALT, KC_LGUI, KC_LEFT,KC_RGHT, + KC_GRV, KC_CAPS, + KC_LALT, + KC_ENT ,KC_TAB ,KC_LCTL, // right hand TG(SYMB), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, MO(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, @@ -117,16 +117,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ // MEDIA AND MOUSE [MDIA] = LAYOUT_ergodox( - KC_TRNS, KC_F14 , KC_F15 , KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, /* F14 dims screen, F15 brightens */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END , 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_HOME, - KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_F14 , KC_F15 , KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, /* F14 dims screen, F15 brightens */ + KC_TRNS, KC_TRNS, LALT(KC_UP), KC_PGUP, LALT(KC_DOWN), KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END , 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, KC_TRNS, // right hand - KC_TRNS, LGUI(KC_W), LGUI(LSFT(KC_GRV)), LGUI(KC_GRV), KC_TRNS, KC_TRNS, KC_PWR, + KC_TRNS, LGUI(KC_W), LGUI(LSFT(KC_GRV)), LGUI(KC_GRV), KC_TRNS, KC_EJCT, KC_PWR, KC_TRNS, LGUI(KC_RBRC), LGUI(LALT(KC_UP)), KC_UP , LGUI(LALT(KC_DOWN)), KC_TRNS, KC_TRNS, LGUI(KC_LBRC), KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_F16 , KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, diff --git a/layouts/community/ergodox/zweihander-macos/readme.markdown b/layouts/community/ergodox/zweihander-macos/readme.markdown index 8921647bd3a7..443b547625e1 100644 --- a/layouts/community/ergodox/zweihander-macos/readme.markdown +++ b/layouts/community/ergodox/zweihander-macos/readme.markdown @@ -70,4 +70,12 @@ Have you looked at the Page Up, Page Down, Home, and End keys on the EDSF keys a F16, accessed by holding ; and pressing the ' key next to it, is intended for Siri. +## use the fn/🌐︎︎︎ key + +A thumb key is bound to Caps Lock. You are not expected to use this for Caps Lock. You would probably be happier going into System Settings, opening the “Customize modifier keys” part of it, and having Caps Lock work as the fn key. macOS is convinced that Ergodoxen EZ have fn keys, so you might as well have one in a place that lends itself tolerably well to keyboard shortcuts. + +## use it with an iPad + +This layout overrides `USB_MAX_POWER_CONSUMPTION` to turn it down to 100 mA instead of the default of 500 mA. This is not what you want if your Ergodox EZ has the Shine or Glow lights, but good if you want to be able to plug it into your iPad’s lightning port with a USB adapter. The indicator lights that tell you what layer you’re on are _not_ Shine or Glow lights. + \* I pronounce “fn” as “effin’”. Your mileage may vary. diff --git a/quantum/painter/lvgl/qp_lvgl.c b/quantum/painter/lvgl/qp_lvgl.c index 41ca3f98c248..c6dd08ef97ee 100644 --- a/quantum/painter/lvgl/qp_lvgl.c +++ b/quantum/painter/lvgl/qp_lvgl.c @@ -109,14 +109,20 @@ bool qp_lvgl_attach(painter_device_t device) { selected_display = device; + uint16_t panel_width, panel_height, offset_x, offset_y; + qp_get_geometry(selected_display, &panel_width, &panel_height, NULL, &offset_x, &offset_y); + + panel_width -= offset_x; + panel_height -= offset_y; + // Setting up display driver - static lv_disp_drv_t disp_drv; /*Descriptor of a display driver*/ - lv_disp_drv_init(&disp_drv); /*Basic initialization*/ - disp_drv.flush_cb = qp_lvgl_flush; /*Set your driver function*/ - disp_drv.draw_buf = &draw_buf; /*Assign the buffer to the display*/ - disp_drv.hor_res = driver->panel_width; /*Set the horizontal resolution of the display*/ - disp_drv.ver_res = driver->panel_height; /*Set the vertical resolution of the display*/ - lv_disp_drv_register(&disp_drv); /*Finally register the driver*/ + static lv_disp_drv_t disp_drv; /*Descriptor of a display driver*/ + lv_disp_drv_init(&disp_drv); /*Basic initialization*/ + disp_drv.flush_cb = qp_lvgl_flush; /*Set your driver function*/ + disp_drv.draw_buf = &draw_buf; /*Assign the buffer to the display*/ + disp_drv.hor_res = panel_width; /*Set the horizontal resolution of the display*/ + disp_drv.ver_res = panel_height; /*Set the vertical resolution of the display*/ + lv_disp_drv_register(&disp_drv); /*Finally register the driver*/ return true; }