masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,977 Commits 2 Branches 0 Tags 274 MiB
Commit Graph

14977 Commits

Author SHA1 Message Date
QMK Bot 8401b0a6e5 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 18:46:42 +00:00
Joel Challis 4e8166750b
Small tweaks to docs to make them more user friendly (#11518) 
* first pass

* firmware firmware?

* Split out debug + testing docs

* tidy up duplicate css

* Add extra info to debug example

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-01-20 18:46:01 +00:00
QMK Bot 34b88a2fd4 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 07:33:12 +00:00
datafx 1328ab7c7d
Correct LED physical mapping on monstargear xo87 rgb pcb (#11629) 
* corrected LED physical mapping

* Corrected issue that made VIA display layer 1 incorrectly

Co-authored-by: datafx <digitalfx@phreak.tech>
 2021-01-19 23:32:39 -08:00
QMK Bot b1e6f1b7e0 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 07:27:33 +00:00
James Young 9a070475ef
Handwired ASkeyboard Sono1: Configurator fixes (#11625) 
* info.json: human-friendly formatting

* info.json: correct key order
 2021-01-19 23:27:04 -08:00
QMK Bot ef3bd54a17 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 05:07:32 +00:00
LSChyi eacb596d8b
[Keyboard] Add indicator LED support to playkbtw/helen80 (#11560) 
* add indicator led support

* use LED config instead
 2021-01-19 21:06:35 -08:00
QMK Bot 87d9534d81 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 03:15:12 +00:00
X-Bows Tech 1bb9f155a6
[Keyboard] Update X-Bows Nature Keyboard (#11538) 
* Update config.h

* Update nature.c

* Update rules.mk

* Update keymap.c
 2021-01-19 19:14:39 -08:00
Raphael Megzari 6db22011a5
[Keymap] add happysalada (#11535) 
* add keymap: happysalada

* use enum instead of define

* remove uneeded config file
 2021-01-19 19:14:16 -08:00
QMK Bot 1ab1ba3c3e Merge remote-tracking branch 'origin/master' into develop 2021-01-20 03:05:53 +00:00
Aaron Ireland 45bec2d281
[Keymap] Mac-friendly KBD 75% layouts (#11507) 
* Add Aaron's KBD75 v2 for Macbook

* Add Colemak & Dvorak layers

* Update keymap to adhere to style guide and add license

* Rename README.md to readme.md
 2021-01-19 19:05:23 -08:00
QMK Bot a9df4263bb Merge remote-tracking branch 'origin/master' into develop 2021-01-20 03:05:04 +00:00
Ryan eba512596a
Add stm32-dfu and apm32-dfu to bootloader.mk (#11019) 
* Add stm32-dfu and apm32-dfu to bootloader.mk

* Update flashing docs

* Update comment

* Further wordsmithing
 2021-01-20 14:04:21 +11:00
QMK Bot a9dee31362 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 02:52:01 +00:00
Craig Gardner d28d474dc0
[Keyboard] Leafcutterlabs (#11464) 
* add support for bigknob

Add support for bigknob macropad

* corrected files

* Apply suggestions from code review

Co-authored-by: Joel Challis <git@zvecr.com>

* corrected tap dance

* Update config.h

* correct image link

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

* added GPL headers

* Update readme.md

* update rules to disable tap dance

* remove tap dance

* Update rules.mk

trying to get to pass travis test

* Update rules.mk

remove tap dance

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-01-19 18:51:33 -08:00
QMK Bot cfde37eec1 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 02:49:41 +00:00
Joshua Diamond c0728bd189
Improve the Lighting Layers example in RGB Lighting docs (#11454) 
* Improve the keymap layer state -> lighting layers example

* A few more improvements
 2021-01-19 18:49:02 -08:00
QMK Bot 6328c25573 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 02:09:03 +00:00
Takeshi Nishio 71f067a60e
Fix wrong key when "Music Map" is used with MAJOR_MODE. (#11234) 
With MAJOR_MODE (= major scale), keys in one octave is not 12 but 7.
To solve this problem, change divisor number from 12 to 7 at %(Modulo) and /(Division).

NOTE:
The last 12 represents half step keys in one octave for pitch calculation.
 2021-01-19 18:08:06 -08:00
QMK Bot 0857321317 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 02:05:38 +00:00
MesaKeyboards 974d3f1ffd
[Keyboard] Add Mesa TKL (#11294) 
* Add keyboard: Mesa TKL

* Fix image link in readme

* Update keyboards/mesa/mesa_tkl/mesa_tkl.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/mesa/mesa_tkl/rules.mk

White space changes

Co-authored-by: Ryan <fauxpark@gmail.com>

* Replace tabs with spaces per C coding conventions.

* Update keyboards/mesa/mesa_tkl/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-01-19 18:05:08 -08:00
QMK Bot 1bc8e785bf Merge remote-tracking branch 'origin/master' into develop 2021-01-20 01:47:32 +00:00
melonbred e6a90c8b04
Update info.json - Program Yoink (#11558) 
* Update info.json

Fix ortho_split
 2021-01-19 17:47:02 -08:00
QMK Bot b9ddccf035 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 01:42:07 +00:00
Ryan 2cdc3699e1
Remove `DESCRIPTION`, W-Z (#11633) 2021-01-20 12:41:34 +11:00
QMK Bot 36784a99a9 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 01:41:10 +00:00
Ryan e0ed2c950d
Remove `DESCRIPTION`, R-V (#11632) 2021-01-20 12:40:35 +11:00
QMK Bot d5ab40aa60 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 00:58:19 +00:00
Ryan 4ed67d666e
Remove `DESCRIPTION`, N-Q (#11631) 2021-01-20 11:57:45 +11:00
Joel Challis 14c2f671cb
Switch to nano specs on ChibiOS builds - Round 2 (#11607) 2021-01-20 10:27:21 +11:00
Nick Brassel 9e18f41fcf Merge remote-tracking branch 'upstream/master' into develop 2021-01-20 10:00:28 +11:00
Ryan 1e1b469fa2
Remove `DESCRIPTION`, K-M (#11619) 2021-01-20 09:56:41 +11:00
Nick Brassel 78fe155b72
Fix up comments showing how to execute config migration. (#11621) 2021-01-20 02:19:36 +11:00
Nick Brassel 3b1ffd2ede
ChibiOS enable memory allocations (#11620) 2021-01-19 14:50:51 +00:00
Nick Brassel 49dcc824db
Fixup declaration for _kill, add other missing syscalls, populate errno. (#11608) 2021-01-19 14:23:03 +00:00
Nick Brassel a7c45daeb8
ChibiOS 20.3.2 (#11495) 
* Update ChibiOS submodule

* Update ChibiOS-Contrib submodule

* Update ChibiOS config files
 2021-01-20 00:59:12 +11:00
Ryan 62f304a225
Remove `DESCRIPTION`, H-J (#11616) 2021-01-20 00:38:12 +11:00
Nick Brassel 19c180ef88
ChibiOS conf migrations... take 10 (#11617) 
* ChibiOS conf upgrade for akegata_denki/device_one

 akegata_denki/device_one - 0d9f891416decbbb533c6c1147632ef7c55a2d9f

* ChibiOS conf upgrade for chavdai40

 chavdai40/rev1 - 06bca6ec34948c8005e73254299488cdba3429f8
 chavdai40/rev2 - f55650a8d7aa755eb72564e95a144910dd902a73

* ChibiOS conf upgrade for ergodox_stm32

 ergodox_stm32 - 04433b80e4cd231c15163ace77428db72b5483ad

* ChibiOS conf upgrade for jm60

 jm60 - a127e6cfccad74ed1a9e47e9213dc41cf0d26f1d

* ChibiOS conf upgrade for matrix/m20add

 matrix/m20add - e2e556dad666ed9b1eea09e46d0eb14e19bda8b8

* ChibiOS conf upgrade for matrix/noah

 matrix/noah - c6fd3caf0b7d444085283d4f0a9204ab283d5202
 2021-01-20 00:35:24 +11:00
Nick Brassel d85b27bbbc
Leftover early initialisation conversions (#11615) 
* jm60

* ergodox_stm32

* F042 bootloader jumps.

* xiaomi/mk02 custom bootloader, no early-init bootloader jump for F072.

* matrix/m20add, matrix/noah
 2021-01-20 00:23:07 +11:00
Nick Brassel d668fd3977 Merge remote-tracking branch 'upstream/master' into develop 2021-01-20 00:18:11 +11:00
Glen D'souza d24fe4f1ca
GCC 10 compatibility for Ploopy optical encoder (#11586) 2021-01-19 13:23:54 +11:00
CMMS-Freather 677789df77
change to cmm.studio saka68 folder. split to solder and hotswap, add hotswap fimware (#11443) 
* new repo: create cmm.studio folder, add saka qmk firmware

new folder for cmm.studio line up keyboard
added saka68 keyboard qmk and via firmware support

* Update keyboards/cmm.studio/saka68/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/cmm.studio/saka68/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/cmm.studio/saka68/keymaps/via/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/cmm.studio/saka68/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* fix on keymap, readme

fix on keymap, readme

* Update keyboards/cmm.studio/saka68/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/cmm.studio/saka68/keymaps/default/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* update vendor name with _ instead of .

update vendor name with _ instead of .

* Update readme.md

change the make format

* Update keyboards/cmm_studio/saka68/keymaps/default/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* deleted some files from cmm.studio, changes to cmm_studio

deleted some files from cmm.studio, changes to cmm_studio

* Update readme.md

make command changed

* Update keyboards/cmm_studio/saka68/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update readme.md

added pic for pcb

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update keyboards/cmm_studio/saka68/config.h

tested and does work now. deleting these lines

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update keyboards/cmm_studio/saka68/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update readme.md

added use physical reset button instruction

* change to the cmm saka folder

making the changes to cmm saka firmware

seperated solder version firmware and hotswap version firmware

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* change to the cmm saka hotswap folder

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-01-19 13:23:13 +11:00
QMK Bot 6b0ed6a29b Merge remote-tracking branch 'origin/master' into develop 2021-01-19 02:12:14 +00:00
Benjamin Garcia 1dc466d22b
New keymaps with KC_LGUI on another key and scroll with encoder (#11479) 
* feat(kyria): new keymaps with KC_LGUI on another key

add also possibility to scroll with encoder and finally play with olded
screen to replace default kyria logo by Magic the Gathering mana color
icon.

* Update keyboards/kyria/keymaps/benji/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* add magic logo

* add mouse button

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-01-19 13:11:45 +11:00
QMK Bot bfdedbe5b2 Merge remote-tracking branch 'origin/master' into develop 2021-01-19 02:10:55 +00:00
Paul James 993982a985
[Keymap] Add peej userspace and keymaps (#11332) 2021-01-19 13:10:28 +11:00
QMK Bot 732e80e3fe Merge remote-tracking branch 'origin/master' into develop 2021-01-19 02:09:28 +00:00
James Young 01bc8e3b52
Cannonkeys Onyx: Configurator/QMK CLI improvements (#11603) 
* info.json: human-friendly formatting

* info.json: correct key object order

* info.json: replace Unicode characters

They don't play nice with `qmk info -l`.

* info.json: correct keyboard dimensions
 2021-01-19 13:08:57 +11:00