summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-201-1/+1
|\
| * Fix QMK_BUILDDATE (#11641)Zach White2021-01-201-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2012-275/+269
|\|
| * Small tweaks to docs to make them more user friendly (#11518)Joel Challis2021-01-2012-275/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-202-30/+31
|\|
| * Correct LED physical mapping on monstargear xo87 rgb pcb (#11629)datafx2021-01-192-30/+31
| | | | | | | | | | | | | | * corrected LED physical mapping * Corrected issue that made VIA display layer 1 incorrectly Co-authored-by: datafx <digitalfx@phreak.tech>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-201-6/+12
|\|
| * Handwired ASkeyboard Sono1: Configurator fixes (#11625)James Young2021-01-191-6/+12
| | | | | | | | | | * info.json: human-friendly formatting * info.json: correct key order
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-202-5/+3
|\|
| * [Keyboard] Add indicator LED support to playkbtw/helen80 (#11560)LSChyi2021-01-192-5/+3
| | | | | | | | | | * add indicator led support * use LED config instead
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-205-10/+178
|\|
| * [Keyboard] Update X-Bows Nature Keyboard (#11538)X-Bows Tech2021-01-194-10/+11
| | | | | | | | | | | | | | | | | | * Update config.h * Update nature.c * Update rules.mk * Update keymap.c
| * [Keymap] add happysalada (#11535)Raphael Megzari2021-01-191-0/+167
| | | | | | | | | | | | | | * add keymap: happysalada * use enum instead of define * remove uneeded config file
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-202-0/+251
|\|
| * [Keymap] Mac-friendly KBD 75% layouts (#11507)Aaron Ireland2021-01-192-0/+251
| | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-202-126/+154
|\|
| * Add stm32-dfu and apm32-dfu to bootloader.mk (#11019)Ryan2021-01-202-126/+154
| | | | | | | | | | | | | | | | | | * Add stm32-dfu and apm32-dfu to bootloader.mk * Update flashing docs * Update comment * Further wordsmithing
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-204-73/+56
|\|
| * [Keyboard] Leafcutterlabs (#11464)Craig Gardner2021-01-194-73/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-201-9/+18
|\|
| * Improve the Lighting Layers example in RGB Lighting docs (#11454)Joshua Diamond2021-01-191-9/+18
| | | | | | | | | | * Improve the keymap layer state -> lighting layers example * A few more improvements
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-201-1/+1
|\|
| * Fix wrong key when "Music Map" is used with MAJOR_MODE. (#11234)Takeshi Nishio2021-01-191-1/+1
| | | | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2011-0/+347
|\|
| * [Keyboard] Add Mesa TKL (#11294)MesaKeyboards2021-01-1911-0/+347
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-201-2/+2
|\|
| * Update info.json - Program Yoink (#11558)melonbred2021-01-191-2/+2
| | | | | | | | | | * Update info.json Fix ortho_split
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2078-82/+0
|\|
| * Remove `DESCRIPTION`, W-Z (#11633)Ryan2021-01-2078-82/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-20120-124/+0
|\|
| * Remove `DESCRIPTION`, R-V (#11632)Ryan2021-01-20120-124/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2078-80/+0
|\|
| * Remove `DESCRIPTION`, N-Q (#11631)Ryan2021-01-2078-80/+0
| |
* | Switch to nano specs on ChibiOS builds - Round 2 (#11607)Joel Challis2021-01-201-0/+1
| |
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-01-20285-330/+50
|\|
| * Remove `DESCRIPTION`, K-M (#11619)Ryan2021-01-20135-141/+0
| |
| * Fixup declaration for _kill, add other missing syscalls, populate errno. ↵Nick Brassel2021-01-191-36/+49
| | | | | | | | (#11608)
| * Remove `DESCRIPTION`, H-J (#11616)Ryan2021-01-20150-154/+1
| |
* | Fix up comments showing how to execute config migration. (#11621)Nick Brassel2021-01-20289-289/+289
| |
* | ChibiOS enable memory allocations (#11620)Nick Brassel2021-01-1916-16/+16
| |
* | ChibiOS 20.3.2 (#11495)Nick Brassel2021-01-206-48/+144
| | | | | | | | | | | | | | * Update ChibiOS submodule * Update ChibiOS-Contrib submodule * Update ChibiOS config files
* | ChibiOS conf migrations... take 10 (#11617)Nick Brassel2021-01-2025-2440/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Leftover early initialisation conversions (#11615)Nick Brassel2021-01-2013-16/+22
| | | | | | | | | | | | | | | | | | | | | | * jm60 * ergodox_stm32 * F042 bootloader jumps. * xiaomi/mk02 custom bootloader, no early-init bootloader jump for F072. * matrix/m20add, matrix/noah
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-01-2021-29/+397
|\|
| * GCC 10 compatibility for Ploopy optical encoder (#11586)Glen D'souza2021-01-192-25/+53
| |
| * change to cmm.studio saka68 folder. split to solder and hotswap, add hotswap ↵CMMS-Freather2021-01-1919-5/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-194-0/+511
|\|
| * New keymaps with KC_LGUI on another key and scroll with encoder (#11479)Benjamin Garcia2021-01-194-0/+511
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-197-0/+512
|\|
| * [Keymap] Add peej userspace and keymaps (#11332)Paul James2021-01-197-0/+512
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 15:24:47 +0000