summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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).
| * [keymap] Added new `oled_status` keymap to `nullbitsco/nibble` keyboard (#12824)Jose Luis Adelantado Torres2021-06-247-0/+566
| | | | | | | | | | * Added new oled_status keymap to nullbitsco/nibble keyboard * rm: Removed font from src imports
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-245-47/+80
|\|
| * [Keymap] Feature/extend keymap (#12778)Robert Verst2021-06-245-47/+80
| | | | | | | | | | | | | | | | | | * Add F13-F24 * Add nvim macros * Add debug switch * Switch mode every time, add debug print
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-242-26/+130
|\|
| * [Keymap] fix key code. numpad to numkey (#12808)T.Shinohara2021-06-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add keyboard new macro pad "Kuro" * change main readme.md * remove not used code from default/keymap.c * Remove unnecessary code * Supports info.json * removed back slash and not used functions. * update at product link. add japanese messages. * Merge All * [Shiro]Add MacKeymap * Change key code. Numpad→Numkey
| * Update oled_bongocat to match VIA keymap (#12875)Jay Greco2021-06-241-22/+126
| | | | | | | | | | * Update to match VIA keymap * Update with feedback from PR
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2417-1/+1919
|\|
| * Switch default layout to standard TKL; add custom (#12818)Mike Tsao2021-06-242-1/+49
| |
| * snowe keymap/userspace and Ocean Dream animation (#12477)Tyler Thrailkill2021-06-2415-0/+1870
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add snowe keymap/userspace & Ocean Dream animation * Add snowe userspace with keymap wrappers and two animations * Add crkbd keymap * Add Ocean Dream animation, a cool full screen animation with: * * twinkling stars * * meteor showers * * ocean waves * * island with palm tree * * moon with phases * Disable Luna so travis build succeeds. * Add more copyrights * Add pragma once to keycode_aliases.h Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Allow settable SPI divisor for AW20216 driver, set default to 4 (#13309)Gigahawk2021-06-232-1/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-231-11/+16
|\|
| * Optional OLED splash screen and fixed OLED i2c execution time saving (#12294)David Hoelscher2021-06-231-11/+16
| | | | | | | | | | * Made OLED splash screen optional to reduce memory and fixed OLED i2c execution time saving * moved OLED address updates into their respective conditional checks
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-233-4/+4
|\|
| * Fix zero condition of reactive runners that will suspend RGB animation (#12710)Albert Y2021-06-233-4/+4
| | | | | | | | | | | | | | | | | | * Avoid zero or overflow from user's rgb_matrix_config.speed * Avoid zero tick for reactive splash. * Avoid zero time for animation runner. Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-232-148/+126
|\|
| * [Keyboard][Bug] Makrosu VIA compile fix encoder and formatting (#13306)Xelus222021-06-222-148/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix encoder and formatting * remove redundant breaks * Update keyboards/makrosu/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/makrosu/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Fix linker error when rgblight and RGB Matrix are both enabled (#13304)Ryan2021-06-231-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-231-1/+1
|\|
| * [Docs] pr_checklist: fix capitalization of Vial (#13301)xyzz2021-06-221-1/+1
| |
* | Remove rgblight stubs (#13302)Ryan2021-06-232-40/+0
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 18:21:51 +0000