summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-08-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-04Balloondogcaps TR90 and TR90PM: rename LAYOUT to LAYOUT_ortho_3x3 (#17879)James Young
* balloondogcaps/tr90: rename LAYOUT to LAYOUT_ortho_3x3 * balloondogcaps/tr90pm: rename LAYOUT to LAYOUT_ortho_3x3
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03boardsource/the_mark: add QMK Configurator layout data (#17898)James Young
* boardsource/the_mark: add QMK Configurator layout data * add keyboard maintainers to info.json Adds the individual and organization accounts as listed maintainers.
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03Move keyboard USB IDs and strings to data driven: U (#17900)Ryan
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03Move keyboard USB IDs and strings to data driven: V (#17901)Ryan
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-04Move keyboard USB IDs and strings to data driven: S (#17889)Ryan
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-04Move keyboard USB IDs and strings to data driven: R (#17885)Ryan
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03Fix up splittest/bluepill (#17897)Joel Challis
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03Userspace: muppetjones (#1) (#13461)Stephen J Bush
* Userspace: muppetjones (#1) Add and update lily58 to work with userspace Add and update kyria keymap to work with userspace Add and update planck keymap with userspace Add etchamouse code and docs to userpace Add userspace Update mouse encoder for smoother movement. Encoder + mouse Added casemodes by andrewjrae * Rollback lily58 state reader and add missing GPL * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> * fix lily58 keymap * Updates to user and lily for muppetjones. Updated parameters for etchamouse for smoother mouse movement. Updated lily keymap and userspace to actually work together. * Update keyboards/lily58/keymaps/muppetjones/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Updated keymaps and userspace * Little more cleanup. * Update keyboards/lily58/keymaps/muppetjones/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Rollback accidental libchibios update * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Update kyria keymap * Move kyria keymap to splitkb/kyria * Update planck keymap * Remove all changes to keyboards/lily58/lib/layer_state_reader.c * Update lily58 keymap * Recommended change * Update keymap readme * Update kyria keymap and userspace * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Renamed users/muppetjones/README.md to lc * Update keyboards/lily58/keymaps/muppetjones/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03Move keyboard USB IDs and strings to data driven: Q (#17883)Ryan
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03added neson design's 700e keyboard (#17768)yulei
* added neson design's 700e keyboard * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03jotix's community ortho_4x12 layout change (#17891)jotix
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03add bluepill mcu to splittest (#16959)dvermd
* add bluepill mcu to splittest * fix typo * refactoring * mcu config goes to mcuconf.h of keyboard * keymap specific config goes to keymap config.h * keyboard specific depending of keymap goes to post_config.h * Apply suggested change Co-authored-by: Ryan <fauxpark@gmail.com> * Apply suggested change Co-authored-by: Ryan <fauxpark@gmail.com> * Apply suggested change Co-authored-by: Ryan <fauxpark@gmail.com> * Apply suggested change Co-authored-by: Ryan <fauxpark@gmail.com> * Apply suggested change Co-authored-by: Ryan <fauxpark@gmail.com> * splittest/bluepill: improve documentation Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03Move keyboard USB IDs and strings to data driven: P (#17875)Ryan
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03Move keyboard USB IDs and strings to data driven: M (#17859)Ryan
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03Move keyboard USB IDs and strings to data driven: K (#17846)Ryan
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03[keymap] Add kkokdae keymap for keyboardio/atreus (#17843)kkokdae
* [keymap] Add kkokdae keymap for keyboardio/atreus * Update keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Revert "Update keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c" This reverts commit 8e9ccc78c796ea482b5b48d546498c06e3a2af09. Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03[Keymap] Add TravisHi keymap for SplitKB Kyria (#17858)Travis
* Init commit * Prep for MVP * Add F Fixes (thanks F!) * Fix some incorrect layer summons * Create readme (remove comments from code) * Update OLED indicators (test) * Add more OLED updates * Add more layouts * Update readme and small tweaks * Update layers and prep for LED layers * Fix a trapped layer issue * Test animations * Add a happy frog animation to right screen * Add bulk work * Move fren readme image * Can't save images * Update FPS layout * Update Symbols layer * Update readme * Update readme (future comments move to readme) * Remove superfluous comments & add Licence * Add licence update
2022-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-03Update json file to support Configurator correctly. (#17692)AnthonyNguyen168
2022-08-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-02Move keyboard USB IDs and strings to data driven: O (#17874)Ryan
2022-08-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-02SKergo Refactor (#17877)James Young
* skergo.h: use ___ for KC_NO * skergo.h: use 3-character notation * skergo.h: add matrix diagram * add LAYOUT_all macro * update grid alignment of LAYOUT macro and keymaps * refactor keymaps Refactor keymaps to use the `LAYOUT_all` macro. Converts tabs to spaces. This change necessitates the following changes to keymaps: - The keycodes for Page Up, Page Down, and End each move up one row - all as the last keys on their new rows. - The keycode for the secondary B key moves up one row, inserted between the primary (left side) B and the N. * remove LAYOUT macro * rename LAYOUT_all macro to LAYOUT_split_bs * add LAYOUT_2u_bs macro * readme.md: add flashing example * info.json: correct maintainer value Update to reference maintainer's GitHub username.
2022-08-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-01[Keymap] Move the ut472 keymap from gardego5 to keyhive folder (#17598)Niko Wenselowski
2022-08-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-02Move keyboard USB IDs and strings to data driven: N (#17865)Ryan
2022-08-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-02Move keyboard USB IDs and strings to data driven: L (#17849)Ryan
2022-08-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-01MS Sculpt Touch-Up (#17871)James Young
* info.json: fix JSON syntax error * info.json: convert tabs to spaces * info.json: add QMK Configurator layout data * readme.md: switch Bootloader and Docs sections
2022-08-01[Keyboard] Overhaul uzu42 (#17868)Drashna Jaelre
2022-08-01Merge remote-tracking branch 'origin/master' into developQMK Bot