Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 6 | -4/+157 | |
|\| | ||||||
| * | [Keyboard] CU65 layout update (#13589) | Daegara | 2021-07-19 | 5 | -1/+154 | |
| | | ||||||
| * | [Keyboard] Repaired melgeek/mj63/ RGB lamp driver problem (#13579) | bomb | 2021-07-19 | 1 | -3/+3 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 3 | -0/+109 | |
|\| | ||||||
| * | [Keymap] Orthon keymap for idobo (#13584) | Giorgi Chavchanidze | 2021-07-19 | 3 | -0/+109 | |
| | | | | | | Co-authored-by: Giorgi Chavchanidze <giorgi@vivaldi.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 39 | -19/+335 | |
|\| | ||||||
| * | Six Pack and ortho_ layout updates (#13587) | Suschman | 2021-07-19 | 39 | -19/+335 | |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Suschman <suschman@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 2 | -0/+0 | |
|\| | ||||||
| * | Knobgoblin: rename ortho keymap to default (#13592) | James Young | 2021-07-19 | 2 | -0/+0 | |
| | | | | | | Keyboard did not previously have a `default` keymap. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 1 | -0/+118 | |
|\| | ||||||
| * | converter/periboard_512: add Configurator layout data (#13600) | James Young | 2021-07-19 | 1 | -0/+118 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 5 | -26/+187 | |
|\| | ||||||
| * | fluxlab zplit: keymap restructuring (#13599) | James Young | 2021-07-19 | 5 | -26/+187 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-20 | 1 | -1/+1 | |
|\| | ||||||
| * | [Keyboard][Bug] Constellation Rev2 (#13595) | Xelus22 | 2021-07-19 | 1 | -1/+1 | |
| | | ||||||
* | | [Bug] Develop - Change uint32_t to layer_state_t (#13596) | Xelus22 | 2021-07-19 | 122 | -469/+469 | |
| | | | | | | | | | | * fix sat75 * update uint32_t to layer_state | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-18 | 2 | -0/+0 | |
|\| | ||||||
| * | LazyDesigners Bolt: move via keymap to keymaps directory (#13581) | James Young | 2021-07-17 | 2 | -0/+0 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-17 | 2 | -18/+608 | |
|\| | ||||||
| * | Discipline layout macro/Configurator fixes (#13574) | James Young | 2021-07-17 | 2 | -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 develop | QMK Bot | 2021-07-17 | 6 | -208/+620 | |
|\| | ||||||
| * | ACR60 Refactor (#13575) | James Young | 2021-07-17 | 6 | -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 develop | QMK Bot | 2021-07-17 | 1 | -0/+432 | |
|\| | ||||||
| * | Cutie Club Giant Macro Pad: add info.json (#13576) | James Young | 2021-07-17 | 1 | -0/+432 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-17 | 4 | -8/+12 | |
|\| | ||||||
| * | Xelus Akis Configurator Fixes (#13577) | James Young | 2021-07-17 | 4 | -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) | Ryan | 2021-07-17 | 2 | -4/+0 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-17 | 1 | -100/+96 | |
|\| | ||||||
| * | remove `RGBLIGHT_H_DUMMY_DEFINE` macro from rgblight.h (#13569) | Takeshi ISHII | 2021-07-17 | 1 | -100/+96 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-16 | 1 | -0/+12 | |
|\| | ||||||
| * | Limit RGB brightness for crkbd when not defined (#13568) | Dasky | 2021-07-16 | 1 | -0/+12 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-16 | 1 | -4/+24 | |
|\| | ||||||
| * | Improve driver installation docs (#13562) | Ryan | 2021-07-17 | 1 | -4/+24 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-16 | 2 | -0/+49 | |
|\| | ||||||
| * | adding tw40 via support (#13032) | lukeski14 | 2021-07-17 | 2 | -0/+49 | |
| | | ||||||
* | | Move `SENDSTRING_BELL` code to `send_string.h` (#13566) | Ryan | 2021-07-16 | 2 | -3/+8 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-16 | 25 | -22/+1134 | |
|\| | ||||||
| * | [Keyboard] Neito + my DZ60 keymap tweaks (#11773) | Oliver Granlund | 2021-07-16 | 25 | -22/+1134 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-16 | 1 | -5/+3 | |
|\| | ||||||
| * | Remove unwanted notes (#13563) | shela | 2021-07-16 | 1 | -5/+3 | |
| | | ||||||
* | | Fix LED Hit Counter for LED/RGB Matrix (#12674) | Johannes Choo | 2021-07-16 | 2 | -2/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-16 | 5 | -114/+54 | |
|\| | ||||||
| * | Migrate arm_atsam print logic to use common framework (#13554) | Joel Challis | 2021-07-16 | 5 | -114/+54 | |
| | | ||||||
* | | Use string literals for `SERIAL_NUMBER` (#13403) | Ryan | 2021-07-16 | 3 | -4/+8 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-16 | 1 | -4/+0 | |
|\| | ||||||
| * | remove `#include "rgblight.h"` when `defined(RGB_MATRIX_ENABLE)` from ↵ | Takeshi ISHII | 2021-07-16 | 1 | -4/+0 | |
| | | | | | | | | quantum.h (#13555) | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | Nick Brassel | 2021-07-16 | 1 | -0/+8 | |
|\| | ||||||
| * | Set some default configurations for GMMK Pro (#13219) | Andre Brait | 2021-07-16 | 1 | -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 Cullin | 2021-07-15 | 3 | -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 develop | QMK Bot | 2021-07-15 | 2 | -56/+59 | |
|\| |