summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-05-09Merge branch 'user_led_configuration' of ↵jpetermans0-0/+0
https://github.com/jpetermans/qmk_firmware into user_led_configuration Conflicts: keyboards/infinity60/led_controller.c keyboards/infinity60/led_controller.h
2017-05-09Merge remote-tracking branch 'upstream/master' into user_led_configurationjpetermans233-1958/+7085
2017-05-09updated keymap for new led functionsjpetermans4-199/+240
2017-05-08minor change on lock ledsjpetermans1-6/+4
2017-05-08CLeaned out debug codejpetermans3-266/+14
2017-05-08small code cleanupjpetermans3-576/+210
2017-05-08Merge pull request #1279 from awpr/masterErez Zukerman2-26/+38
Change to per-key eager debouncing for ErgoDox EZ.
2017-05-08Merge pull request #1275 from Vifon/dynamic_macro/trailing_keypressesJack Humbert1-5/+52
dynamic macros: Trim the trailing modifiers; further cleanup
2017-05-08Merge pull request #1278 from shieldsd/masterJack Humbert3-0/+132
Add new keymap for dshields.
2017-05-08Merge pull request #1280 from tobsn/patch-1Jack Humbert1-1/+1
lowercase .jpg
2017-05-08Merge pull request #1282 from coderkun/coderkun_neo2Jack Humbert2-38/+137
Merge changes for coderkun’s Neo2 layout
2017-05-08Merge pull request #1284 from bigtunaIO/masterJack Humbert11-19/+450
[Bigtuna.IO] Updating Miuni32 Layouts
2017-05-07Merge branch 'dev'Adam Lee9-12/+408
2017-05-07[Miuni32] Rm accidentally committed fileAdam Lee1-42/+0
2017-05-07Merge remote-tracking branch 'bigtunaio/layouts/adam-lee' into devAdam Lee5-0/+191
2017-05-07Merge remote-tracking branch 'upstream/master'Adam Lee164-521/+3829
2017-05-07Merge remote-tracking branch 'upstream/master' into devAdam Lee123-459/+3724
2017-05-06Update README for keymap “coderkun_neo2”coderkun1-9/+2
2017-05-06Merge tag '0.5.43' into coderkun_neo2coderkun266-2009/+8608
2017-05-06Fix F-keys on right hand to start on first keycoderkun1-1/+1
2017-05-05lowercase .jpg I thinkTobias O1-1/+1
i guess that fixes the image link - currently its broken
2017-05-05Add new keymap for dshields.Daniel Shields3-0/+132
2017-05-05dynamic_macro.h: Do not use backlight_toggle if backlight is disabledWojciech Siewierski1-0/+2
Fixes #1199.
2017-05-04dynamic_macro.h: Add debug logsWojciech Siewierski1-0/+30
2017-05-04dynamic_macro.h: Make the documentation more clearWojciech Siewierski1-2/+5
2017-05-04Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefixJack Humbert2-8/+26
[ps2avrGB] Add KEYMAP without KC-prefix
2017-05-04Merge pull request #1273 from Vifon/pr_1267_fixJack Humbert6-12/+270
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)tengg1-1/+1
2017-05-04dynamic_macro.h: Do not save the keys being held when stopping the recordingWojciech Siewierski1-3/+15
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 Siewierski1-3/+3
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 Siewierski1-3/+1
Apparently sometimes the backlight was toggled only once and it was left on.
2017-05-04dynamic_macro.h: Ignore all the initial key releasesWojciech Siewierski1-2/+9
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-keymapThor771-8/+8
and remove obsolete explicit line-separator "\"
2017-05-03Add KEYMAP without KC_##-prefixThor771-0/+18
and rename old variant to KEYMAP_KC
2017-05-01Merge pull request #1269 from ryanmaclean/patch-6Jack Humbert1-6/+3
Cleaning Up Dockerfile Layers Per Official Docs
2017-05-01Testing initial blink supportjpetermans2-81/+180
2017-05-01Cleaning Up Dockerfile Layers Per Official DocsRyan MacLean1-6/+3
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 Humbert2-0/+76
Adding AMJ60 ANSI Maximized Layout
2017-04-30Merge pull request #1268 from priyadi/promethiumJack Humbert9-85/+215
Promethium keymap update
2017-04-30Merge pull request #1264 from fredizzimo/wsl_supportJack Humbert2-20/+26
Add possibility to override the command to execute when flashing
2017-04-30fixes s60_x keyboardJack Humbert53-31/+44
2017-04-30Merge pull request #1263 from Dbroqua/masterJack Humbert5-62/+26
Fixed bugs for S60-X RGB version
2017-04-30Simple RGB backlight themingPriyadi Iman Nurcahyo5-72/+161
2017-04-30Syntax fixPriyadi Iman Nurcahyo1-2/+2
2017-04-30Update vifon keymap to use `DYN_REC_STOP`Weiyi Lou1-1/+2
2017-04-30Add cinaeco hhkb keymapWeiyi Lou4-0/+252
2017-04-30Add `DYN_REC_STOP` to dynamic macrosWeiyi Lou1-3/+3
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-30Addind Sample Maxed Out KeymapRyan MacLean1-0/+61
Keeping hold space for fn1, adding three other user-mappable keys.
2017-04-30Adding Maximized LayoutRyan MacLean1-0/+15
Both split shifts and HHKB split backspace.
2017-04-29Add possibility to override the command to execute when flashingFred Sundvik2-20/+26
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-06-28 20:44:51 +0200