summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-01-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-20Add stm32-dfu and apm32-dfu to bootloader.mk (#11019)Ryan
* Add stm32-dfu and apm32-dfu to bootloader.mk * Update flashing docs * Update comment * Further wordsmithing
2021-01-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-19[Keyboard] Leafcutterlabs (#11464)Craig Gardner
* 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-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-19Improve the Lighting Layers example in RGB Lighting docs (#11454)Joshua Diamond
* Improve the keymap layer state -> lighting layers example * A few more improvements
2021-01-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-19Fix wrong key when "Music Map" is used with MAJOR_MODE. (#11234)Takeshi Nishio
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-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-19[Keyboard] Add Mesa TKL (#11294)MesaKeyboards
* 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-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-19Update info.json - Program Yoink (#11558)melonbred
* Update info.json Fix ortho_split
2021-01-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-20Remove `DESCRIPTION`, W-Z (#11633)Ryan
2021-01-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-20Remove `DESCRIPTION`, R-V (#11632)Ryan
2021-01-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-20Remove `DESCRIPTION`, N-Q (#11631)Ryan
2021-01-20Switch to nano specs on ChibiOS builds - Round 2 (#11607)Joel Challis
2021-01-20Merge remote-tracking branch 'upstream/master' into developNick Brassel
2021-01-20Remove `DESCRIPTION`, K-M (#11619)Ryan
2021-01-20Fix up comments showing how to execute config migration. (#11621)Nick Brassel
2021-01-19ChibiOS enable memory allocations (#11620)Nick Brassel
2021-01-19Fixup declaration for _kill, add other missing syscalls, populate errno. ↵Nick Brassel
(#11608)
2021-01-20ChibiOS 20.3.2 (#11495)Nick Brassel
* Update ChibiOS submodule * Update ChibiOS-Contrib submodule * Update ChibiOS config files
2021-01-20Remove `DESCRIPTION`, H-J (#11616)Ryan
2021-01-20ChibiOS conf migrations... take 10 (#11617)Nick Brassel
* 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-20Leftover early initialisation conversions (#11615)Nick Brassel
* jm60 * ergodox_stm32 * F042 bootloader jumps. * xiaomi/mk02 custom bootloader, no early-init bootloader jump for F072. * matrix/m20add, matrix/noah
2021-01-20Merge remote-tracking branch 'upstream/master' into developNick Brassel
2021-01-19GCC 10 compatibility for Ploopy optical encoder (#11586)Glen D'souza
2021-01-19change to cmm.studio saka68 folder. split to solder and hotswap, add hotswap ↵CMMS-Freather
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-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-19New keymaps with KC_LGUI on another key and scroll with encoder (#11479)Benjamin Garcia
* 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-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-19[Keymap] Add peej userspace and keymaps (#11332)Paul James
2021-01-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-19Cannonkeys Onyx: Configurator/QMK CLI improvements (#11603)James Young
* 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-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-19Caps Unlocked CU65 layout macro fixes (#11606)James Young
2021-01-19Fixup builds on develop branch. (#11600)Nick Brassel
2021-01-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-18[Keyboard] Monstargear XO87 RGB Hot-Swap PCB (#11555)datafx
* Support for Monstargear XO87 Hot-Swap PCB * Remove manufacturer from product line * Removed alternate bootloaders * Updated info.json * Missed RGB_DISABLE_WHEN_USB_SUSPENDED in config.h * Delete kb.h * Update rgb.h * Update rules.mk * Add files via upload * Delete kb.h * Update keymap.c * Update config.h * Update rgb.c * Add via RGB support * Update info.json * Update readme.md * Update readme.md * Update config.h * Update rgb.h * Update config.h * Mirror factory layout * Mirror factory layout * Update rgb.h * Update keyboards/xo87/rgb/rgb.c * Update rgb.c * Update keyboards/xo87/rgb/config.h * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/keymaps/via/keymap.c * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/keymaps/via/keymap.c * Update config.h * Update keyboards/xo87/rgb/readme.md * Update keyboards/xo87/rgb/readme.md * Update keyboards/xo87/rgb/readme.md * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * Update keyboards/xo87/rgb/rules.mk * remove deprecated action_get_macro() * rearrange layout per request * rearrange layout per request * Update keyboards/xo87/rgb/rgb.h * Update keyboards/xo87/rgb/keymaps/default/readme.md * Update keyboards/xo87/rgb/readme.md * Bugfix for RGB Matrix * Bugfix for RGB Matrix * Moved to new subdirectory and updated build commands to reflect changes * Remove old files
2021-01-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-18Naked64 Configurator update and rework (#11568)James Young
2021-01-18ChibiOS conf migrations... take 9 (#11598)Nick Brassel
* ChibiOS conf upgrade for akegata_denki/device_one akegata_denki/device_one - 0d9f891416decbbb533c6c1147632ef7c55a2d9f * ChibiOS conf upgrade for ergodox_stm32 ergodox_stm32 - 72aeab1612ef73555a73dd60d005e671a90d7e2f * ChibiOS conf upgrade for jm60 jm60 - cc75e97727fadd939be4bdf7fa3714320465d3ef * ChibiOS conf upgrade for matrix/m20add matrix/m20add - b0dee0b4e8c0a94d55fea51c8699972f15483209 * ChibiOS conf upgrade for matrix/noah matrix/noah - 57a1c09cd24716863ce862e0b9cbca2a9c6fcebf * ChibiOS conf upgrade for nibiria/stream15 nibiria/stream15 - 610b151b02f5cac681c65fbd3f94a12312f99b82 * ChibiOS conf upgrade for xiaomi/mk02 xiaomi/mk02 - f92fcee777acc159c0af268e88b751fd1e33f74f
2021-01-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-18Remove `DESCRIPTION`, E-G (#11574)Ryan
2021-01-17`qmk cformat`Nick Brassel
2021-01-18Keep track of last matrix activity. (#11552)Nick Brassel
Co-authored-by: Dasky <daskygit@users.noreply.github.com> Co-authored-by: Dasky <daskygit@users.noreply.github.com>
2021-01-17Merge remote-tracking branch 'origin/master' into developQMK Bot
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 23:10:17 +0000