summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-0320-45/+57
|\|
| * Fix up splittest/bluepill (#17897)Joel Challis2022-08-0320-45/+57
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-0339-0/+3046
|\|
| * Userspace: muppetjones (#1) (#13461)Stephen J Bush2022-08-0339-0/+3046
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-0322-82/+69
|\|
| * Move keyboard USB IDs and strings to data driven: Q (#17883)Ryan2022-08-0322-82/+69
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-039-0/+626
|\|
| * added neson design's 700e keyboard (#17768)yulei2022-08-039-0/+626
| | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-031-29/+60
|\|
| * jotix's community ortho_4x12 layout change (#17891)jotix2022-08-031-29/+60
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-0321-1/+248
|\|
| * add bluepill mcu to splittest (#16959)dvermd2022-08-0321-1/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-03184-680/+581
|\|
| * Move keyboard USB IDs and strings to data driven: P (#17875)Ryan2022-08-03184-680/+581
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-03327-1214/+1042
|\|
| * Move keyboard USB IDs and strings to data driven: M (#17859)Ryan2022-08-03327-1214/+1042
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-03374-1404/+1227
|\|
| * Move keyboard USB IDs and strings to data driven: K (#17846)Ryan2022-08-03374-1404/+1227
| | | | | | Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-034-0/+164
|\|
| * [keymap] Add kkokdae keymap for keyboardio/atreus (#17843)kkokdae2022-08-034-0/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-034-0/+576
|\|
| * [Keymap] Add TravisHi keymap for SplitKB Kyria (#17858)Travis2022-08-034-0/+576
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-031-3/+3
|\|
| * Update json file to support Configurator correctly. (#17692)AnthonyNguyen1682022-08-031-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-0288-313/+274
|\|
| * Move keyboard USB IDs and strings to data driven: O (#17874)Ryan2022-08-0288-313/+274
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-025-120/+239
|\|
| * SKergo Refactor (#17877)James Young2022-08-025-120/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-022-0/+0
|\|
| * [Keymap] Move the ut472 keymap from gardego5 to keyhive folder (#17598)Niko Wenselowski2022-08-012-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-02114-434/+367
|\|
| * Move keyboard USB IDs and strings to data driven: N (#17865)Ryan2022-08-02114-434/+367
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-02104-370/+346
|\|
| * Move keyboard USB IDs and strings to data driven: L (#17849)Ryan2022-08-02104-370/+346
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-012-7/+105
|\|
| * MS Sculpt Touch-Up (#17871)James Young2022-08-012-7/+105
| | | | | | | | | | | | | | | | | | * 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
* | [Keyboard] Overhaul uzu42 (#17868)Drashna Jaelre2022-08-0111-296/+165
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-011-4/+26
|\|
| * ryanbaekr rb18 Configurator Data Fixes (#17872)James Young2022-08-011-4/+26
| | | | | | | | | | | | | | | | | | * info.json: apply friendly formatting * info.json: correct key sequence * info.json: remove dead space from layout * info.json: correct maintainer value
* | Format code according to conventions (#17869)QMK Bot2022-07-311-22/+22
| |
* | Add ST7735 driver to Quantum Painter (#17848)David Hoelscher2022-07-316-2/+264
| |
* | [Keyboard] Fix uzu42 compilation issue (#17867)jack2022-07-311-4/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-313-0/+720
|\|
| * [Keymap] Add axtloss keymap for sofle (#17835)axtloss2022-07-313-0/+720
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Remove legacy AVR ssd1306 driver (#17864)Joel Challis2022-07-318-1123/+0
| |
* | Migrate crkbd keymaps to oled driver (#17863)Joel Challis2022-07-3140-524/+97
| |
* | Remove OLED driver Split Common warning (#17862)Joel Challis2022-07-311-2/+0
| |
* | Convert yosino58 to use split common (#17861)Joel Challis2022-07-3127-2118/+96
| |
* | Fix POINTING_DEVICE_GESTURES_SCROLL_ENABLE typo (#17850)Daniel Kao2022-07-312-3/+3
| | | | | | | | | | | | | | | | * Fix typo for POINTING_DEVICE_GESTURES_SCROLL_ENABLE Follow the name written in documentation which follows POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE * Reword the blurb about POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE in docs
* | Refactor satt/comet46 to use core OLED driver (#17856)Joel Challis2022-07-3112-946/+54
| |