summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2813-0/+631
|\
| * Add keyboard: 7c8/Framework (#11593)Steven Nguyen2021-02-2813-0/+631
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add 7c8/framework keyboard * Update VIA framework.json definition * Code cleanup and styling to conform to QMK style guide * Code cleanup and moving some keymap definitions to a 'steven' keymap in order to create a cleaner default keymap for other users * Update keyboards/7c8/framework/config.h Remove #define DESCRIPTION Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/7c8/framework/config.h remove #define UNUSED_PINS Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/7c8/framework/framework.h Change layout name to existing layout name. Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/7c8/framework/framework.h Change layout name to existing layout name. Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/7c8/framework/framework.h Change layout name to existing layout name. Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/7c8/framework/keymaps/via/keymap.c change biton32 to get_highest_layer Co-authored-by: Drashna Jaelre <drashna@live.com> * change vendor ID from 0x07c8 to 0x77c8, which is unused * delete VIA .json definition from via keymap folder * Change framework_grid to LAYOUT_ortho_5x12 in default keymap.c * remove framework.json from 'steven' keymap folder * cleanup * Update keyboards/7c8/framework/config.h 0x77c8 -> 0x77C8 Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2814-298/+126
|\|
| * Hub16 QMK configurator support + various bugfixes (#11496)Josh Johnson2021-02-2814-298/+126
| | | | | | | | | | | | | | | | | | | | * qmk configurator support + various bugfixes * Update keyboards/hub16/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-282-10/+39
|\|
| * Add support for using podman to util/docker_build.sh (#10819)Max Audron2021-02-282-10/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | * add podman support to docker_build.sh script * break out runtime into the RUNTIME variable * allows RUNTIME to be set by the user * decides on docker or podman if docker isn't avaible * rewrote check for docker-machine to account only for docker runtime * put --user arg into a variable only to be used with docker this is not needed with podman as podman maps the containers root id to the users id. * add podman to getting_started_docker documentation
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-281-0/+21
|\|
| * Add suggestion for indirect unicode input on Linux (#10854)MRAAGH2021-02-281-0/+21
| | | | | | | | | | | | | | | | | | * Add suggestion for indirect unicode input on Linux I have used this approach myself with great success, and it seems to be the only good solution that doesn't involve IBus. * Elaborate on keyboard layout on Linux This should be enough to allow people to figure out how to add custom characters to a Linux keyboard layout.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-281-5/+5
|\|
| * Fixes #4072, #6214. Revision of #156 to clear before AS/TD. (#9941)Isaac Elenbaas2021-02-281-5/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2851-52/+1
|\|
| * remove keyboard_folder from info.jsonZach White2021-02-2751-52/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-274-27/+26
|\|
| * Fix compile errors (#12048)Zach White2021-02-274-27/+26
| | | | | | | | | | * fix compile errors * fix broken json files
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-271-2/+2
|\|
| * Format code according to conventions (#12046)github-actions[bot]2021-02-271-2/+2
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-271-0/+2
|\|
| * Fix build for attiny85-based boards. (#12044)Nick Brassel2021-02-281-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-273-0/+3
|\|
| * Fix up build failures for melgeek boards after Feb27 develop merge. (#12043)Nick Brassel2021-02-283-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-271-0/+1
|\|
| * Fix build for linworks/whale75. (#12042)Nick Brassel2021-02-271-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-270-0/+0
|\|
| * Force update the version tagJames Young2021-02-270-0/+0
| |
* | Branch point for 2021 May 29 Breaking ChangeJames Young2021-02-271-0/+6
|/
* 2021 February 27 Breaking Changes Update (#12040)Nick Brassel2021-02-281833-181174/+28422
|\
| * 2021 February 27 Breaking Changes Changelog (#11975)James Young2021-02-275-18/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * restore main readme.md * add ChangeLog entry for 2021-02-27 develop branch - initial version * update Docs; consolidate sidebar entries to new Breaking Changes History doc * Changelog update - concatenate similar changes as one list item - unify change formatting (remove [bracketed] headings and trailing periods) - item sorting improvement * update Changes Requiring User Action section Detail the changes regarding keyboard relocations/additions/deletions. * add entry for fauxpark's user keymap cleanup for config.h/rules.mk * add link to Jacky Studio bugfix PR * add link for "ChibiOS conf migrations... take 15" * add links for "Make LAYOUT parsing more robust" and "Massdrop develop rgb fix" * remove sort sequence numbers * rename Breaking Changes History page Renames the Breaking Changes History page to "Past Breaking Changes". * update schedule in Breaking Changes Overview * suggestions/changes per tzarc * skully's changes * add entry for "Fix develop" (PR 12039) Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Zach White <skullydazed@gmail.com>
| * Fix develop (#12039)Zach White2021-02-2710-32/+66
| | | | | | | | | | | | | | | | | | Fixes file encoding errors on Windows, and layouts not correctly merging into info.json. * force utf8 encoding * correctly merge layouts and layout aliases * show what aliases point to
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-275-34/+37
| |\ | |/ |/|
* | [Keyboard] Evk v1.3 add a key (#11880)YangPiCui2021-02-265-34/+37
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-276-41/+115
| |\ | |/ |/|
* | [Keyboard] Add VIA support to SX60 and update default keymap (#11908)Danny2021-02-266-41/+115
| |
| * Format code according to conventions (#12024)github-actions[bot]2021-02-262-42/+42
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
| * [BUG] Massdrop develop rgb fix (#12022)Nick Brassel2021-02-265-9/+13
| | | | | | | | | | | | | | * Allow for disabling RGB_MATRIX on Massdrop boards. * Fixup init sequence. * Make some functions static as they've got very generic names.
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-253-13/+12
| |\ | |/ |/|
* | [Keyboard] Fixup issues with Titan65 (#12002)Drashna Jaelre2021-02-253-13/+12
| | | | | | | | | | * [Keyboard] Titan64 - Fix RGB Matrix config * Fix up keymaps
| * Merge remote-tracking branch 'upstream/master' into developfauxpark2021-02-256-83/+106
| |\ | |/ |/|
* | V-USB suspend refactor (#11891)Ryan2021-02-256-85/+107
| |
| * make LAYOUT parsing more robustZach White2021-02-241-2/+4
| |
| * ChibiOS conf upgrade for daji/seis_cinco (#12001)Nick Brassel2021-02-254-1388/+43
| | | | | | daji/seis_cinco - f9ce55c07a61f20308dab7eb5f4f2b7a91686625
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2411-0/+394
| |\ | |/ |/|
* | [Keyboard] Atlas alps/mx PCB addition (#11884)npspears2021-02-2411-0/+394
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2420-0/+713
| |\ | |/ |/|
* | [Keyboard] CapsUnlocked CU80 v2 (#11736)Rys Sommefeldt2021-02-2420-0/+713
| | | | | | | | | | Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Rys Sommefeldt <rys@pixeltards.com>
| * Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-02-2344-752/+2513
| |\ | |/ |/|
* | [Keymap] Drashna Updates - Split+OLED edition (#11968)Drashna Jaelre2021-02-2344-753/+2513
| |
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-231-1/+1
| |\ | |/ |/|
* | pill60 fix info.json to be used in configurator (#11979)Ikta2021-02-231-1/+1
| |
| * Bugfix for Jacky Studio keyboards (#11981)James Young2021-02-2235-4304/+0
| | | | | | | | | | PR 10528 was intended to move the source for the Bear 65 and S7 Elephant to the new `jacky_studio` vendor directory. Instead of moving the source files, that PR added the source as if they were newly-supported. The result is that the Bear 65 and both revisions of the S7 Elephant have working, identical firmware in two different directories. This commit removes the source from the old directories.
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2218-0/+629
| |\ | |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 12:09:30 +0000