Commit Graph

15143 Commits

Author SHA1 Message Date
dd61f7795f Fix build for linworks/whale75. (#12042) 2021-02-27 22:07:55 +00:00
aa038994b2 Force update the version tag 2021-02-27 14:01:16 -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
76e67a97f4 Bugfix for Jacky Studio keyboards (#11981)
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.
2021-02-22 17:04:14 -05:00
6bbec56d09 Merge remote-tracking branch 'origin/master' into develop 2021-02-22 04:47:01 +00:00
c868f93755 [Keyboard] Disarray (#11583)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com>
2021-02-21 20:46:34 -08:00
eb7edaf4dc Merge remote-tracking branch 'origin/master' into develop 2021-02-22 04:45:41 +00:00
150ab564a3 [Keyboard] Add Manibus keyboard and layout from Blank Tehnologii (#11832)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-21 20:45:02 -08:00
eb0fffbd78 Merge remote-tracking branch 'origin/master' into develop 2021-02-22 03:46:41 +00:00
37e14fd02b [Keyboard] Tokyo Keyboard alix40 initial commit (#11918)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: QuadCube <quadcube@QuadCube-Mac-mini.local>
2021-02-21 19:46:08 -08:00
a9fbefcd87 Merge remote-tracking branch 'origin/master' into develop 2021-02-22 03:43:27 +00:00
36999494d6 [Keyboard] Add Daji Seis Cinco (#11955)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-21 19:42:55 -08:00
00d70925df Merge remote-tracking branch 'origin/master' into develop 2021-02-22 03:42:41 +00:00
998c4c93a2 Merge remote-tracking branch 'origin/master' into develop 2021-02-22 03:42:10 +00:00
d1a92aa52a [Keyboard] Graystudio COD67 VIA support (#11961)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-21 19:42:09 -08:00
5660d80bb0 [Keyboard] reduce confusion for kbdfans/kbd75 rounds/revisions (#11972) 2021-02-21 19:41:31 -08:00
316dcf4960 Clean up some user keymaps specifying MCU (#11966) 2021-02-22 00:49:13 +00:00
c1e6febef7 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 16:19:19 +00:00
e1e66c78bf [Keymap] Add via support to Durgod K320 (#11960)
Co-authored-by: Maxime Coirault <maxime.coirault@zerokeyboard.com>
2021-02-21 08:18:48 -08:00
329d5583e0 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 16:18:33 +00:00
b69614b98b [Keyboard] Rebound: change vendor and product ID for VIA (#11965) 2021-02-21 08:17:48 -08:00
29c19b6f40 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 06:19:36 +00:00
311bff3d56 [Keyboard] Pill60: fix default keymap shift key, fix info.json to default keymap (#11919) 2021-02-20 22:19:06 -08:00
14f0f8ce65 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 06:13:32 +00:00
a3934664dd [Keymap] Adding my v60 Type R keymap (#11911) 2021-02-20 22:12:50 -08:00
3b4b3c827c Merge remote-tracking branch 'origin/master' into develop 2021-02-21 05:52:48 +00:00
46a22c9e70 [Keymap] My Prime_E Keymap (#11899) 2021-02-20 21:52:40 -08:00
1216e807c0 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 05:52:26 +00:00