summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-05-08Merge remote-tracking branch 'upstream/master' into user_led_configurationjpetermans
2017-05-08updated keymap for new led functionsjpetermans
2017-05-08CLeaned out debug codejpetermans
2017-05-08small code cleanupjpetermans
2017-05-07Merge pull request #1279 from awpr/masterErez Zukerman
Change to per-key eager debouncing for ErgoDox EZ.
2017-05-07Merge pull request #1275 from Vifon/dynamic_macro/trailing_keypressesJack Humbert
dynamic macros: Trim the trailing modifiers; further cleanup
2017-05-07Merge pull request #1278 from shieldsd/masterJack Humbert
Add new keymap for dshields.
2017-05-07Merge pull request #1280 from tobsn/patch-1Jack Humbert
lowercase .jpg
2017-05-07Merge pull request #1282 from coderkun/coderkun_neo2Jack Humbert
Merge changes for coderkun’s Neo2 layout
2017-05-07Merge pull request #1284 from bigtunaIO/masterJack Humbert
[Bigtuna.IO] Updating Miuni32 Layouts
2017-05-07Merge branch 'dev'Adam Lee
2017-05-07[Miuni32] Rm accidentally committed fileAdam Lee
2017-05-07Merge remote-tracking branch 'bigtunaio/layouts/adam-lee' into devAdam Lee
2017-05-07Merge remote-tracking branch 'upstream/master'Adam Lee
2017-05-07Merge remote-tracking branch 'upstream/master' into devAdam Lee
2017-05-06Update README for keymap “coderkun_neo2”coderkun
2017-05-06Merge tag '0.5.43' into coderkun_neo2coderkun
2017-05-06Fix F-keys on right hand to start on first keycoderkun
2017-05-05lowercase .jpg I thinkTobias O
i guess that fixes the image link - currently its broken
2017-05-05Add new keymap for dshields.Daniel Shields
2017-05-05dynamic_macro.h: Do not use backlight_toggle if backlight is disabledWojciech Siewierski
Fixes #1199.
2017-05-04dynamic_macro.h: Add debug logsWojciech Siewierski
2017-05-04dynamic_macro.h: Make the documentation more clearWojciech Siewierski
2017-05-04Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefixJack Humbert
[ps2avrGB] Add KEYMAP without KC-prefix
2017-05-04Merge pull request #1273 from Vifon/pr_1267_fixJack Humbert
Add DYN_REC_STOP to the dynamic macros, cleanup PR #1267
2017-05-04revise HHKB bootloader_size to 4096 such that sw reset works (#1274)tengg
2017-05-04dynamic_macro.h: Do not save the keys being held when stopping the recordingWojciech Siewierski
More specifically, we save them and then place the `macro_end` pointer before them so they are essentially ignored and the other macro may freely overwrite them.
2017-05-04dynamic_macro.h: Fix an off-by-two errorWojciech Siewierski
We need to check whether we just passed the after-the-end point of the other macro. Instead we were checking whether we are going to reach it now.
2017-05-04dynamic_macro.h: Always toggle the backlight twice as a notificationWojciech Siewierski
Apparently sometimes the backlight was toggled only once and it was left on.
2017-05-04dynamic_macro.h: Ignore all the initial key releasesWojciech Siewierski
Right after the user initiates the macro recording, they usually need to release some keys used to access the DYN_REC_START layers. It makes sense to ignore them. Note: The keys used to access the DYN_REC_STOP key are *not* ignored.
2017-05-03Use KC_KEYMAP for default-keymapThor77
and remove obsolete explicit line-separator "\"
2017-05-03Add KEYMAP without KC_##-prefixThor77
and rename old variant to KEYMAP_KC
2017-05-01Merge pull request #1269 from ryanmaclean/patch-6Jack Humbert
Cleaning Up Dockerfile Layers Per Official Docs
2017-04-30Testing initial blink supportjpetermans
2017-04-30Cleaning Up Dockerfile Layers Per Official DocsRyan MacLean
From the official docs: ``` Note: The official Debian and Ubuntu images automatically run apt-get clean, so explicit invocation is not required. ``` Also added ` && rm -rf /var/lib/apt/lists/*` as part of the install line which probably does what was intended (no need to make a new layer). Added apt-get update to the RUN payload, as it should be part of the same layer. Both are documented here: https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
2017-04-30Merge pull request #1266 from ryanmaclean/patch-5Jack Humbert
Adding AMJ60 ANSI Maximized Layout
2017-04-30Merge pull request #1268 from priyadi/promethiumJack Humbert
Promethium keymap update
2017-04-30Merge pull request #1264 from fredizzimo/wsl_supportJack Humbert
Add possibility to override the command to execute when flashing
2017-04-30fixes s60_x keyboardJack Humbert
2017-04-30Merge pull request #1263 from Dbroqua/masterJack Humbert
Fixed bugs for S60-X RGB version
2017-04-30Simple RGB backlight themingPriyadi Iman Nurcahyo
2017-04-30Syntax fixPriyadi Iman Nurcahyo
2017-04-30Update vifon keymap to use `DYN_REC_STOP`Weiyi Lou
2017-04-30Add cinaeco hhkb keymapWeiyi Lou
2017-04-30Add `DYN_REC_STOP` to dynamic macrosWeiyi Lou
Dynamic macro functionality is modified to check for `DYN_REC_STOP`, so that macro recording can be stopped with a designated key combination (e.g. `qs` or anything) instead of mandating the use of a `_DYN` layer. `_DYN` layer stopping can still be done by passing `DYN_REC_STOP` within `process_record_user()`: bool process_record_user(uint16_t keycode, keyrecord_t *record) { uint16_t macro_kc = (keycode == MO(_DYN) ? DYN_REC_STOP : keycode); if (!process_record_dynamic_macro(macro_kc, record)) { return false; } return true; }
2017-04-29Addind Sample Maxed Out KeymapRyan MacLean
Keeping hold space for fn1, adding three other user-mappable keys.
2017-04-29Adding Maximized LayoutRyan MacLean
Both split shifts and HHKB split backspace.
2017-04-29Add possibility to override the command to execute when flashingFred Sundvik
2017-04-29Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua
2017-04-29Merge pull request #21 from qmk/masterDamien
Merge from QMK