summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Nix Studio Oxalys80 Configurator Layout Data Correction (#13326)James Young2021-06-251-1344/+276
| | | | | | | | | | | | | | * apply human-friendly formatting to info.json * correct LAYOUT_all data Corrects the layout data for the LAYOUT_all macro.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-263-4/+7
|\|
| * Draytronics Daisy Configurator Refactor (#13325)James Young2021-06-253-4/+7
| | | | | | | | | | | | | | | | | | * correct layout data * use LAYOUT as layout macro name The defined LAYOUT_daisy is functional, but Configurator expects LAYOUT through the info.json file. As the board only supports one layout according to the open-source PCB files, use LAYOUT as the defined macro per QMK guidelines. * add layout macro alias
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-265-80/+440
|\|
| * GON Nerd60 Refactor (#13343)James Young2021-06-265-80/+440
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2649-357/+357
|\|
| * Cleanup junk chars, part 3 (#13332)Ryan2021-06-2649-357/+357
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2519-232/+232
|\|
| * Cleanup junk chars, part 2 (#13284)Ryan2021-06-2519-232/+232
| |
* | Optimize our jsonschema by using refs (#13271)Zach White2021-06-249-310/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | * fix some broken info.json files * optimize our jsonschema using refs * fix formatting after vscode broke it * make flake8 happy * cleanup * make our schema validation more compact and flexible
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-251-1/+2
|\|
| * add doctor to safe_commands (#13324)Zach White2021-06-241-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-243-1/+85
|\|
| * Bop added via & unicode support (#13122)Nathan_Blais2021-06-253-1/+85
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-241-17/+20
|\|
| * Update Japanese document (#10673)shela2021-06-241-17/+20
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-244-199/+209
|\|
| * [Docs] Update Japanese faq documents (#12842)shela2021-06-244-199/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update Japanese faq documents. * Update Japanese summary. * Update docs/ja/faq_debug.md Co-authored-by: s-show <s1shimz@gmail.com> * Update docs/ja/faq_misc.md Co-authored-by: s-show <s1shimz@gmail.com> * Apply suggestions from code review Co-authored-by: s-show <s1shimz@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-242-58/+114
|\|
| * Update Japanese newbs_getting_started.md (#12841)shela2021-06-242-58/+114
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-244-115/+109
|\|
| * SAM SG81M Layout Macro Rework (#13291)James Young2021-06-234-115/+109
| | | | | | | | | | | | | | | | | | | | | | * grid-align layout macro and keymaps * physically align layout macro and keycodes Arrange the layout macro and keycodes to resemble the assembled keyboard. * update info.json data Updates the info.json data to be correct to the new layout macro.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-241-1/+1
|\|
| * expand the size of the textpad to allow for taller keyboards (#13319)Zach White2021-06-231-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-244-0/+279
|\|
| * [Keymap] gmmk/pro: willwm (#12952)Will Wolff-Myren2021-06-244-0/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create willwm keymap: Modified GMMK Pro Default + VIA + Space-Cadet Unicode * Temporarily remove unicode map calls; try using UNICODE_ENABLE instead * RGBLIGHT_ENABLE = yes * ...on second thought, don't enable RGBLIGHT =P * Move Del to PrtSc, add Home, move PrtSc to Fn+Home * willwm: Add keymap.json and readme.md * willwm: Add layer0/layer1 images * willwm: Update readme.md with info from PR #12952 * willwm: Update to better match template (https://docs.qmk.fm/#/documentation_templates)
* | kint36: set correct EEPROM size (#12946)Michael Stapelberg2021-06-241-0/+2
| | | | | | | | | | | | The Teensy 3.6 comes with 4096 bytes of EEPROM. This is commit 1 of 2 to make the EEPROM work. The next commit changes the core code to wire up the EEPROM.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2431-0/+1799
|\|
| * Add the SquishyTKL and SquishyFRL (#12764)Ramon Imbao2021-06-2431-0/+1799
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add SquishyTKL * Add SquishyTKL-FRL * Adjust readme.md and info.json * Add JIS support for SquishyTKL * Fix JIS layout macro * Fix via layout and keymap * Migrate SquishyTKL to STM32duino bootloader * Make chibios conf files generic * Change TKL via keymap to match number of layers * Apply chibios changes to FRL as well * Adjust README regarding flashing with dfu-util * Add license and header guard
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-248-0/+349
|\|
| * Add "steal this keyboard" keybaord (#12898)obosob2021-06-248-0/+349
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2420-0/+1131
|\|
| * Added Skeletn87 PCBs (#12922)kb-elmo2021-06-2420-0/+1131
| | | | | | | | | | | | | | | | | | | | | | * add Skeletn87 * update skeletn87 files * update skeletn87 soldered * update readme image * update readme (again)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-249-0/+305
|\|
| * Latin6rgb use IS31FL3731 IC (#11819)184388802021-06-249-0/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create config.h * Add files via upload * Create keymap.c * Create keymap.c * Create rules.mk * Update readme.md * Update keyboards/latin6rgb/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/latin6rgb/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keymap.c * Update keymap.c * Update config.h * Update config.h Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-241-1/+1
|\|
| * Add ID to "## Advanced Macros". (#12830)s-show2021-06-241-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-242-0/+2
|\|
| * enable mouse keys in handwired/dactyl keymaps that use them (#12586)James Larkby-Lahet2021-06-242-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-244-55/+153
|\|
| * Monstargear XO87 Solderable Configurator Refactor (#13317)James Young2021-06-244-55/+153
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-241-1/+10
|\|
| * bug if macro definition and not integer is used to identify layers (#12648)sendmmsg2021-06-241-1/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-249-1/+206
|\|
| * Studio Kestra Nue: fix info.json layout macro reference (#13318)James Young2021-06-241-1/+1
| | | | | | Corrected the info.json file to reference LAYOUT_all instead of LAYOUT.
| * [Keymap]Add Keymap reviung34rgb (#12656)gtips2021-06-248-0/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Add keyboard Reviung41 * Modified files * deleted keyboards/reviung41/keymaps/default/config.h * modified keyboards/rebiung41/keymaps/default/keymap.c * modified keyboards/reviung41/readme.md * modified keyboards/reviung41/readme.md * modified keyboards/reviung41/readme.md * Update readme.md Change the image photo of readme.md. * [Keyboard] Add reviung61 * Update readme.md * fix keyboards/reviung61/ and add keymap default_rgb * fix keyboards/reviung61/info.json * fix keyboards/reviung61/info.json * remove keyboards/reviung61/keymaps/default/config.h * [keyboard] Fixed readme.md for reviung39 and 61. * add keymap keyboards/reviung34/keymaps/default_rgb/ ,default_rgb2u
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-242-0/+45
|\|
| * Added a custom keymap for XD60 (#12736)Suryan Isaac2021-06-242-0/+45
| | | | | | | | | | | | | | | | | | | | | | * Added custom Keymap * Added Images to README * Added Layer 1 Keys for RGB control * Added GPL2+ License to keymap.c * Removed extra json files and added a few lines to README
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-248-2/+573
|\|
| * keymap/ardumont: Fix substitute keycode reset step (#12675)Antoine R. Dumont2021-06-241-2/+7
| | | | | | | | | | | | | | | | It so happens that when releasing the control key prior to the main key (C-h, C-i, C-n, ...), the substituted keycode was continuously sent in a loop after that (even when releasing said key). The workaround so far was to type any other key to stop the loop. This commit fixes such behavior by resetting the substitution keycode sent when the ctrl released situation conditional is detected (and that the substitution keycode was on).