b64fd093ad
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 05:32:12 +00:00
6b1170cb97
Onekey keymap: quine ( #10732 )
2021-02-28 16:31:40 +11:00
bd4b7f8b25
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 05:30:56 +00:00
ec06ffe294
Add keyboard: 7c8/Framework ( #11593 )
...
* 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>
2021-02-28 16:30:28 +11:00
93d3cf52ab
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 05:04:17 +00:00
03ea478f20
Hub16 QMK configurator support + various bugfixes ( #11496 )
...
* 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>
2021-02-28 16:03:49 +11:00
33c7d6eb93
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 05:00:12 +00:00
e4d3ff2374
Add support for using podman to util/docker_build.sh ( #10819 )
...
* 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
2021-02-28 15:59:42 +11:00
9525d5b5ae
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 04:54:08 +00:00
bcbcb3d107
Add suggestion for indirect unicode input on Linux ( #10854 )
...
* 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.
2021-02-28 15:53:40 +11:00
00cb9029f5
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 04:48:45 +00:00
765d8a33dd
Fixes #4072 , #6214 . Revision of #156 to clear before AS/TD. ( #9941 )
2021-02-28 15:48:19 +11:00
72abf86870
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 00:17:42 +00:00
58e733b5a0
remove keyboard_folder from info.json
2021-02-27 16:17:12 -08:00
605fd0eda8
Merge remote-tracking branch 'origin/master' into develop
2021-02-27 23:26:10 +00:00
0828d0f5c7
Fix compile errors ( #12048 )
...
* fix compile errors
* fix broken json files
2021-02-27 23:25:41 +00:00
4db695f932
Merge remote-tracking branch 'origin/master' into develop
2021-02-27 22:36:14 +00:00
deaabff752
Format code according to conventions ( #12046 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-02-27 22:35:41 +00:00
89936c66b0
Merge remote-tracking branch 'origin/master' into develop
2021-02-27 22:34:01 +00:00
6623744172
Fix build for attiny85-based boards. ( #12044 )
2021-02-28 09:33:33 +11:00
37690f2651
Merge remote-tracking branch 'origin/master' into develop
2021-02-27 22:21:12 +00:00
e2d3cefc95
Fix up build failures for melgeek boards after Feb27 develop merge. ( #12043 )
2021-02-28 09:20:36 +11:00
6ae72f3980
Merge remote-tracking branch 'origin/master' into develop
2021-02-27 22:08:25 +00:00
dd61f7795f
Fix build for linworks/whale75. ( #12042 )
2021-02-27 22:07:55 +00:00
06071dc76d
Merge remote-tracking branch 'origin/master' into develop
2021-02-27 22:02:34 +00:00
aa038994b2
Force update the version tag
2021-02-27 14:01:16 -08:00
c7a7982e23
Branch point for 2021 May 29 Breaking Change
2021-02-27 12:54:23 -08:00
1a5f6b54af
2021 February 27 Breaking Changes Update ( #12040 )
2021-02-28 07:22:21 +11:00
624359b725
2021 February 27 Breaking Changes Changelog ( #11975 )
...
* 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>
2021-02-27 12:10:23 -08:00
1581ea48dc
Fix develop ( #12039 )
...
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
2021-02-27 12:00:50 -08:00
23ed6c4ec0
Merge remote-tracking branch 'origin/master' into develop
2021-02-27 04:25:27 +00:00
804d5c1c5d
[Keyboard] Evk v1.3 add a key ( #11880 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-26 20:24:55 -08:00
2485bbe784
Merge remote-tracking branch 'origin/master' into develop
2021-02-27 01:29:58 +00:00
6a94e25f6d
[Keyboard] Add VIA support to SX60 and update default keymap ( #11908 )
2021-02-26 17:29:23 -08:00
d99e330548
Format code according to conventions ( #12024 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-02-26 17:47:22 +11:00
abe189377c
[BUG] Massdrop develop rgb fix ( #12022 )
...
* Allow for disabling RGB_MATRIX on Massdrop boards.
* Fixup init sequence.
* Make some functions static as they've got very generic names.
2021-02-26 17:07:05 +11:00
4dc8a2dd6f
Merge remote-tracking branch 'origin/master' into develop
2021-02-25 10:57:31 +00:00
d4be96e9dd
[Keyboard] Fixup issues with Titan65 ( #12002 )
...
* [Keyboard] Titan64 - Fix RGB Matrix config
* Fix up keymaps
2021-02-25 10:56:59 +00:00
23fd1aee00
Merge remote-tracking branch 'upstream/master' into develop
2021-02-25 16:04:53 +11:00
39694d5eb0
V-USB suspend refactor ( #11891 )
2021-02-25 15:54:25 +11:00
23ef327e11
make LAYOUT parsing more robust
2021-02-24 16:47:38 -08:00
ba0b965c42
ChibiOS conf upgrade for daji/seis_cinco ( #12001 )
...
daji/seis_cinco - f9ce55c07a61f20308dab7eb5f4f2b7a91686625
2021-02-25 07:23:29 +11:00
285d0c3d7d
Merge remote-tracking branch 'origin/master' into develop
2021-02-24 18:53:45 +00:00
46f4422a87
[Keyboard] Atlas alps/mx PCB addition ( #11884 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-24 10:53:09 -08:00
bee1b553cd
Merge remote-tracking branch 'origin/master' into develop
2021-02-24 18:49:10 +00:00
215caad320
[Keyboard] CapsUnlocked CU80 v2 ( #11736 )
...
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Rys Sommefeldt <rys@pixeltards.com>
2021-02-24 10:48:35 -08:00
146b042514
Merge remote-tracking branch 'origin/master' into develop
2021-02-23 13:57:26 -08:00
0b69e4df81
[Keymap] Drashna Updates - Split+OLED edition ( #11968 )
2021-02-23 10:57:24 -08:00
2abfa624c9
Merge remote-tracking branch 'origin/master' into develop
2021-02-23 01:55:01 +00:00
11146ecd08
pill60 fix info.json to be used in configurator ( #11979 )
2021-02-23 01:54:29 +00:00
QMK Bot
ridingqwerty
Steven Nguyen
Josh Johnson
Max Audron
MRAAGH
Isaac Elenbaas
Zach White
github-actions[bot]
Nick Brassel
James Young
YangPiCui
Danny
Drashna Jaelre
fauxpark
npspears
Rys Sommefeldt
Ikta