summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-182-0/+0
|\
| * LazyDesigners Bolt: move via keymap to keymaps directory (#13581)James Young2021-07-172-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-172-18/+608
|\|
| * Discipline layout macro/Configurator fixes (#13574)James Young2021-07-172-18/+608
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * use human-friendly formatting in info.json * move layout macro aliases to info.json * correct and complete layout data Corrects the layout data for a few layouts, adds the missing data, and renames some of the layout macros. - rename LAYOUT_wkl_ansi_2_right_mods to LAYOUT_65_ansi_wkl - rename LAYOUT_wkl_ansi_3_right_mods to LAYOUT_65_ansi_lwkl - rename LAYOUT_wkl_iso_2_right_mods to LAYOUT_65_iso_wkl - rename LAYOUT_wkl_iso_3_right_mods to LAYOUT_65_iso_lwkl
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-176-208/+620
|\|
| * ACR60 Refactor (#13575)James Young2021-07-176-208/+620
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * modernize acr60.h - use #pragma once include guard - add license header - use four-space indent - use QMK three-character notation for layout macro arguments * human-friendly format info.json * remove `key_count` keys from info.json * rename LAYOUT_2_shifts to LAYOUT_all * move LAYOUT_all to top * use QMK three-character notation in info.json * refactor default keymap - add license header - remove third layer (does nothing) - replace Shift-Escape keycode with KC_GESC - use LAYOUT_all macro instead of LAYOUT * modernize readme.md - update header - convert metadata section to list - add flashing and bootloader jump instructions - update Docs links * use #pragma once include guard in config.h * update LED Indicator API * add license headers
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-171-0/+432
|\|
| * Cutie Club Giant Macro Pad: add info.json (#13576)James Young2021-07-171-0/+432
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-174-8/+12
|\|
| * Xelus Akis Configurator Fixes (#13577)James Young2021-07-174-8/+12
| | | | | | | | | | | | | | | | | | * correct layout macro references The keyboard's header file and info.json referenced different layout macro names. * correct layout data Insert an object for the Non-US Backslash key, which was previously missing.
* | Revert "Add rgblight to RGB Matrix VPATH" (#13559)Ryan2021-07-172-4/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-171-100/+96
|\|
| * remove `RGBLIGHT_H_DUMMY_DEFINE` macro from rgblight.h (#13569)Takeshi ISHII2021-07-171-100/+96
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-161-0/+12
|\|
| * Limit RGB brightness for crkbd when not defined (#13568)Dasky2021-07-161-0/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-161-4/+24
|\|
| * Improve driver installation docs (#13562)Ryan2021-07-171-4/+24
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-162-0/+49
|\|
| * adding tw40 via support (#13032)lukeski142021-07-172-0/+49
| |
* | Move `SENDSTRING_BELL` code to `send_string.h` (#13566)Ryan2021-07-162-3/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1625-22/+1134
|\|
| * [Keyboard] Neito + my DZ60 keymap tweaks (#11773)Oliver Granlund2021-07-1625-22/+1134
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-161-5/+3
|\|
| * Remove unwanted notes (#13563)shela2021-07-161-5/+3
| |
* | Fix LED Hit Counter for LED/RGB Matrix (#12674)Johannes Choo2021-07-162-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-165-114/+54
|\|
| * Migrate arm_atsam print logic to use common framework (#13554)Joel Challis2021-07-165-114/+54
| |
* | Use string literals for `SERIAL_NUMBER` (#13403)Ryan2021-07-163-4/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-161-4/+0
|\|
| * remove `#include "rgblight.h"` when `defined(RGB_MATRIX_ENABLE)` from ↵Takeshi ISHII2021-07-161-4/+0
| | | | | | | | quantum.h (#13555)
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-07-161-0/+8
|\|
| * Set some default configurations for GMMK Pro (#13219)Andre Brait2021-07-161-0/+9
| | | | | | | | | | * Set some default configurations for GMMK Pro * Remove FORCE_NKRO to avoid issues with KVMs
* | Dual RGB Matrix IS31FL3737 driver support to address #13442 (#13457)Chris Cullin2021-07-153-29/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial commit * removed changes to write_pwm_buffer * backward compatbility added * fixed issue with backward compatibility * documentation update * removed unneccessary comment. branched from master * updated per comments #13457 * removed blank line * cformat on diff files
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-152-56/+59
|\|
| * [Keyboard] correct the info.json for qmk configurator and add two empty ↵bomb2021-07-152-56/+59
| | | | | | | | layers for via (#13552)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1518-0/+1440
|\|
| * [keyboard] Clueboard 2x1800 2021 Support (#13220)Zach White2021-07-1418-0/+1440
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2x1800 2021 * add support for writing a whole frame at a time * improvements * wip * fix scrolling * small tweak * add a buffer that's larger than the display * add the start of a font * working upper and lower case letters * add qmk animation * integrate the message sign into the qmk task system * add encoder defaults * add MAX7219_LED_CUSTOM to config.h * tweaks * remove unneeded keymaps * add a keymap showing how to control the signboard * cleanup * cleanup * add a way to disable the startup test * make it easier to define options at the keymap level * Fix define names Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com> * Apply suggestions from gcochard Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com> * feedback from noroads * format info.json Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1413-1/+764
|\|
| * [Keyboard] Add Serratus PCB (#13281)mechlovin2021-07-1413-1/+764
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-149-0/+370
|\|
| * [Keyboard] Tidying up my projects and subprojects (#13289)Koobaczech2021-07-149-0/+370
| | | | | | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ethan Madden <maddene@madden.ninja>
* | Migrate more `fn_actions` stuff (#13502)Ryan2021-07-1517-791/+497
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-142-3/+3
|\|
| * Fix some RGB Matrix-enabled keymaps referring to RGBLight mode (#13509)Ryan2021-07-152-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developZach White2021-07-14168-1453/+10346
|\| | | | | | | | | Resolved Conflicts: keyboards/checkerboards/nop60/info.json
| * switch to qmk-dotty-dict (#13460)Zach White2021-07-142-1/+2
| |
| * correct data info.json (#13544)mechlovin2021-07-142-2/+2
| | | | | | rouge87 and rogue87
| * [Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… ↵bomb2021-07-1459-0/+6118
| | | | | | | | | | (#13494) Co-authored-by: Ryan <fauxpark@gmail.com>
| * Traveller handwired layout macro refactor (#13539)James Young2021-07-133-126/+129
| |
| * Lucid Phantom soldered: layout macro touch-up (#13540)James Young2021-07-133-31/+30
| |