summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-081-2/+21
|\
| * [Docs] update Japanese translation of internals_gpio_control.md (#13401)Takeshi ISHII2021-07-081-2/+21
| | | | | | | | | | | | | | | | | | * Add 'Atomic Operation' section into docs/ja/internals_gpio_control.md * Update docs/ja/internals_gpio_control.md * Update docs/ja/internals_gpio_control.md * Update docs/ja/internals_gpio_control.md
* | Use the new ST7565 driver on Ergodox Infinity (#13165)Joakim Tufvegren2021-07-075-12/+107
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-074-6/+113
|\|
| * Xelus Ninjin: rename LAYOUT_all to LAYOUT_tkl_ansi_tsangan; add info.json ↵James Young2021-07-074-6/+113
| | | | | | | | (#13477)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-074-85/+245
|\|
| * Kopibeng XT65: Layout Macro Refactor (#13476)James Young2021-07-074-85/+245
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0718-0/+732
|\|
| * [Keyboard] Add poker87c and poker87d (#12810)mfkiiyd2021-07-0618-0/+732
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Water <mfkiiyd@163.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-079-0/+562
|\|
| * [Keyboard] Add new Elise, 65% Keyboard ANSI / ISO (#12782)Blake2021-07-069-0/+562
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0715-0/+785
|\|
| * [Keyboard] Add bm65iso (#13400)Simon2021-07-0615-0/+785
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0612-0/+404
|\|
| * [Keyboard] Add keyboard reviung5 (#13375)gtips2021-07-0612-0/+404
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0612-0/+575
|\|
| * [Keyboard] Add kabedon98e (#13314)KDon2021-07-0612-0/+575
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-065-37/+72
|\|
| * [Keyboard] Set reasonable defaults for Corne keyboard (#13440)Drashna Jaelre2021-07-065-37/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Set reasonable defaults for Corne keyboard * Add note about bootmagic * Make bootmagic config super weak * cleanup * Apply suggestions from code review * Update keyboards/crkbd/readme.md
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0619-19/+19
|\|
| * /bin/bash to /usr/bin/env bash (#13422)Kuba Tyszko2021-07-0619-19/+19
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-061-2/+2
|\|
| * Update `MSG_PYTHON_MISSING` (#13427)Ryan2021-07-061-2/+2
| |
* | core: chibios: bootloader: use integer pointers as volatile (#13450)Thomas Weißschuh2021-07-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This prevents gcc from incorrectly trying to validate array bounds. ``` tmk_core/common/chibios/bootloader.c: error: '__builtin_memcpy' offset [0, 21] is out of the bounds [0, 0] [-Werror=array-bounds] 107 | __builtin_memcpy((void *) VBAT, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578#c16 Fixes #12925
* | Migrate SHIFT_ESC and RGB `fn_actions` to Grave Escape and RGB keycodes (#13360)Ryan2021-07-0620-1114/+22
| |
* | `keymap_extras`: Remove deprecated defines (#12949)Ryan2021-07-06145-1589/+649
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-051-1/+2
|\|
| * [Keyboard] fix encoder_update_user for nullbitsco/nibble (#13451)David Luo2021-07-051-1/+2
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-07-0510-512/+354
|\|
| * Traveller cleanup (#13441)Ryan2021-07-058-485/+341
| | | | | | | | | | | | | | | | | | * Traveller cleanup * Update keyboards/handwired/traveller/info.json Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>
| * LatinPadBLE: correct info.json data (#13452)James Young2021-07-052-27/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * correct info.json data Removes an extra key object, and corrects the layout macro reference. * refactor rules.mk file - remove invalid `LAYOUTS` rule - edits the rules.mk file to more closely resemble the file from QMK's AVR template. * additional rules.mk cleanup per fauxpark Apply suggestions from code review
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-052-121/+122
|\|
| * Jabberwocky: adjust key positioning in Configurator (#13447)James Young2021-07-052-121/+122
| | | | | | | | | | | | | | | | | | | | | | * adjust key positioning in Configurator Some of the keys were visually overlapping when rendered. Adjusted the key positioning to remove the overlaps. * update readme.md - fix a broken URL - rewrite the Bootloader access instructions - remove trailing whitespace
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-053-212/+85
|\|
| * Molecule: Layout Macro Refactor (#13453)James Young2021-07-053-212/+85
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-051-0/+151
|\|
| * [Docs] added list of MIDI keycodes (#13159)wxyangf2021-07-041-0/+151
| |
* | Allow invert of SPLIT_HAND_PIN logic (#13433)Jameson Thatcher2021-07-052-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added support for inverting the hand pin for split keyboards * Added docs about SPLIT_HAND_LOW_IS_LEFT * Update docs/feature_split_keyboard.md bring #define for split hand pin low for left half name in line with grid pin define Co-authored-by: Joel Challis <git@zvecr.com> * Update quantum/split_common/split_util.c update split hand pin low is left name to match split hand grid define Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-041-49/+54
|\|
| * correct Configurator layout data (#13448)James Young2021-07-041-49/+54
| | | | | | The object for the rotary encoder was not previously included in the layout data.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-041-0/+35
|\|
| * Yampad: add info.json (#13445)James Young2021-07-041-0/+35
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0415-0/+361
|\|
| * [Keyboard] Add CX60 (#13402)Yon Nor2021-07-0315-0/+361
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-043-35/+131
|\|
| * Specskeys Configurator Bugfix and Refactor (#13439)James Young2021-07-033-35/+131
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-049-0/+343
|\|
| * [Keyboard] IDOBAO ID67 (#13378)AnthonyL2021-07-039-0/+343
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Anthony Lowery <anthony.lowery@unity3d.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0422-0/+770
|\|
| * [Keyboard] ortho boards from the technik gb (#13382)cole smith2021-07-0322-0/+770
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>