summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-126-30/+36
|\
| * ID67 codebase touch-up (#13521)James Young2021-07-126-30/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * correct layout data Fix incorrect key sizes/positions. * rename LAYOUT to LAYOUT_65_ansi_blocker * tweak human-friendly formatting for info.json Add new lines for new rows. * adjust keycode alignment in via keymap * clean up extra lines in readme file * enable 65_ansi_blocker Community Layout support * clean up rules.mk Aligns the inline comments.
* | [Keymap] add simple gmmk pro macos keymap with rgb (#13504)Alex Marmon2021-07-122-0/+73
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-123-4/+61
|\|
| * [Keyboard] RGB Matrix support for TBK Mini (#13506)Albert Y2021-07-123-4/+61
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Enable g_is31_leds PROGMEM for RGB Matrix IS31FL3737 driver (#13480)Chris Cullin2021-07-125-24/+30
| |
* | Fix two out of bounds accesses from #13330. (#13525)Joakim Tufvegren2021-07-121-2/+2
| | | | | | | | | | Two occurrences of `MATRIX_ROWS` weren't properly changed to `ROWS_PER_HAND` in #13330, causing a crash during boot on at least my Ergodox Infinity (including #13481).
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1213-0/+422
|\|
| * [Keyboard] Add Bloop65 (#13388)Kwabena Aduse-Poku2021-07-1213-0/+422
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Unify matrix for split common and regular matrix (#13330)Drashna Jaelre2021-07-113-353/+126
| |
* | Matrix consistency check (#13470)Zach White2021-07-111-0/+46
| | | | | | | | | | * Add a check to make sure the matrix sizes match the actual matrix size * make flake8 happy
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-119-10/+225
|\|
| * [Keyboard] Update lazydesigners/the60/rev2/rev2.h (#13505)jackytrabbit2021-07-111-10/+10
| | | | | | Update lazydesigners/the60/rev2/rev2.h
| * [Keyboard] CapsUnlocked CU7 (#13429)Rys Sommefeldt2021-07-118-0/+215
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-111-0/+1
|\|
| * [Keymap] Fix Corne Via Layout properly (#13518)Drashna Jaelre2021-07-111-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1113-292/+297
|\|
| * [Keyboard] Wuque Studio Ikki68 Aurora codebase touch-up (#13510)James Young2021-07-1113-292/+297
| |
* | first pass: matrix consistency improvements (#13471)Zach White2021-07-1122-28/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-111-0/+3
|\|
| * Fixed the Helix keymap 'fraanrosi' compile issues (#13514)Takeshi ISHII2021-07-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to `helix/rev2/keymaps/fraanrosi/readme.md`, this keymap should be compiled with the following command: ``` make helix/rev2/under:fraanrosi ``` Therefore, when compiling all helix keymaps with the following command, an error occurs when compiling `fraanrosi`. ``` make helix:all ``` Therefore, add `LED_UNDERGLOW_ENABLE = yes` to `keymaps/fraanrosi/rules.mk` to suppress the error.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-113-182/+233
|\|
| * [Keymap] plattfot - Keymap updates for Kyria (#13449)Fredrik Salomonsson2021-07-103-182/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Major change in the keymap to work with EurKey. Which relaxes some constraints it had before when it had to take in consideration two layouts. With this the parenthesis can be moved to a better location instead of being in the top right corner. This also allows esc, del and rctrl to be moved to the base layer. Only downside is that ctrl+lalt needed to be removed and instead AltGr takes it's place. Add rctrl on right thumb cluster to compensate for this which need some reorganization on the thumb cluster. - Split the symbol and function keys layer into two layers, one for each hand. Make it easier to press symbols and function keys. - Add some symbols specific for the EurKey layout. - Change from running C-<tab> S-C-<tab> to page up/down for the right rotary. As holding ctrl and using page up/down works the same in firefox. Which allows the rotary to be useful for other things. - Move scroll lock and insert to right rotary. - Introducing close tap (CLO_TAP), which is a combination of the double tap feature and my macros. E.g. pressing CLO_TAP and ( will generate ()←. Which removes the need of the macros and makes it more useful than DBL_TAP as it now saves me some keypresses. CLO_TAP exist on both the left and right hand layers to make it easy to use. - Use text for the secondary oled, firmware is too big after rebasing on upstream master. - Update image in the readme to reflect my new layout.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1129-0/+1292
|\|
| * [Keyboard] add new firewave ikki68_aurora (#13364)GG2021-07-1029-0/+1292
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | CLI: Add git and venv info to doctor's output (#13405)Erovia2021-07-103-8/+111
| | | | | | | | Most of the checks are saved from zvecr's retired 'up/status' subcommand PR.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-102-0/+0
|\|
| * Clawsome Hatchback & SUV: fix improperly named keymap directories (#13508)James Young2021-07-102-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-101-18/+11
|\|
| * Fix VIA compilation issues for RGB Matrix (#13503)Drashna Jaelre2021-07-101-18/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-092-0/+2
|\|
| * enable manual trigger for api data (#13000)Zach White2021-07-092-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-093-54/+98
|\|
| * Mechmini V1 Refactor (#13498)James Young2021-07-093-54/+98
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-081-2/+2
|\|
| * nknl7en: correct key object order (#13482)James Young2021-07-081-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-087-15/+15
|\|
| * Updated docs/ja/feature_ps2_mouse.md. (#13472)Takeshi ISHII2021-07-081-3/+3
| | | | | | Changed following the change in the definition of `PS2_MOUSE_SCROLL_BTN_MASK` in the original document.
| * [Update] Change Original TAGs of Japanese translations (#13473)Takeshi ISHII2021-07-086-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | * Updated docs/ja/proton_c_conversion.md original tag. * Updated docs/ja/other_vscode.md original tag. * Updated docs/ja/feature_swap_hands.md original tag. * Updated docs/ja/faq_general.md original tag. * Updated docs/ja/feature_userspace.md original tag. * Updated git co docs/ja/config_options.md original tag.
* | 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>