summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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' into devAdam Lee123-459/+3724
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: 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-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
2017-04-29Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua92-234/+2831
2017-04-29Merge pull request #21 from qmk/masterDamien92-234/+2831
Merge from QMK
2017-04-29- Fixed bugs in rules.mk for S60-Xdbroqua5-62/+26
- Updated dbroqua layout for S60-X (added backlight)
2017-04-29Promethium update: demo LED, fix PS2 delay, fix LED ordering, change click ↵Priyadi Iman Nurcahyo4-22/+55
frequency
2017-04-28Modified ht_156 keymaphtang1561-9/+13
2017-04-27Merge pull request #1259 from laelath/masterJack Humbert2-11/+121
Added a proper README to the lae3 keymap
2017-04-26Expanded lae3 keymap readmelaelath2-11/+121
2017-04-26Merge pull request #1258 from smt/smt/hhkbJack Humbert1-0/+176
Add smt keymap for HHKB
2017-04-25Merge pull request #1231 from Dbroqua/masterJack Humbert15-209/+458
S60-X RGB support
2017-04-25Merge pull request #1253 from laelath/masterJack Humbert4-0/+294
Added lae3 keymap
2017-04-25Merge pull request #1255 from ryanmaclean/patch-4Jack Humbert2-0/+130
Initial Ortholinear Commit for AMJPad
2017-04-25Merge pull request #1257 from MachineIndustries/keyboards/M10AJack Humbert7-0/+229
Add RAMA x Machine Industries M10A to the keyboards directory
2017-04-25Add RAMA x Machine Industries M10A to the keyboards directoryJosh Black7-0/+229
2017-04-24Add smt keymap for HHKBStephen Tudor1-0/+176
2017-04-24Switched Alt and GUI key placesJustin Frank1-2/+2
2017-04-23Adding Right LayoutRyan MacLean1-0/+65
2017-04-23Update keymap.cRyan MacLean0-0/+0
2017-04-23Initial Ortho Commit (LEFT SIDE)Ryan MacLean1-0/+65
Using only one layer, and activating it with two keys at the moment. As with previous comments, this isn't final, but is a good starting point for a one-handed keyboard, half a Planck-like ortholinear keyboard, or a sample to show a layout with a function layer.
2017-04-23Added lae3 keymapJustin Frank4-0/+294
2017-04-22Added an additional clueboard layout. (#1252)Solomon6-0/+130
* Current building keymap * Working media keys * Added mute key. Fixed volume. Fixed media * Updating readme * Swapped readme order
2017-04-22Tweak the shift_fn keymap so it worksskullY2-19/+22
2017-04-19- Moved S60-X RGB in sub project for S60-Xdbroqua19-345/+170
2017-04-19Merge pull request #1246 from reversebias/masterJack Humbert8-0/+687
Initial support for the Mitosis Keyboard
2017-04-19Update readme.mdreversebias1-158/+6