Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lowercase .jpg I think | Tobias O | 2017-05-05 | 1 | -1/+1 |
| | | | i guess that fixes the image link - currently its broken | ||||
* | Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefix | Jack Humbert | 2017-05-04 | 2 | -8/+26 |
|\ | | | | | [ps2avrGB] Add KEYMAP without KC-prefix | ||||
| * | Use KC_KEYMAP for default-keymap | Thor77 | 2017-05-03 | 1 | -8/+8 |
| | | | | | | | | and remove obsolete explicit line-separator "\" | ||||
| * | Add KEYMAP without KC_##-prefix | Thor77 | 2017-05-03 | 1 | -0/+18 |
| | | | | | | | | and rename old variant to KEYMAP_KC | ||||
* | | Merge pull request #1273 from Vifon/pr_1267_fix | Jack Humbert | 2017-05-04 | 6 | -12/+270 |
|\ \ | | | | | | | Add DYN_REC_STOP to the dynamic macros, cleanup PR #1267 | ||||
| * | | dynamic_macro.h: Fix an off-by-two error | Wojciech Siewierski | 2017-05-04 | 1 | -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. | ||||
| * | | dynamic_macro.h: Always toggle the backlight twice as a notification | Wojciech Siewierski | 2017-05-04 | 1 | -3/+1 |
| | | | | | | | | | | | | Apparently sometimes the backlight was toggled only once and it was left on. | ||||
| * | | dynamic_macro.h: Ignore all the initial key releases | Wojciech Siewierski | 2017-05-04 | 1 | -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. | ||||
| * | | Update vifon keymap to use `DYN_REC_STOP` | Weiyi Lou | 2017-04-30 | 1 | -1/+2 |
| | | | |||||
| * | | Add cinaeco hhkb keymap | Weiyi Lou | 2017-04-30 | 4 | -0/+252 |
| | | | |||||
| * | | Add `DYN_REC_STOP` to dynamic macros | Weiyi Lou | 2017-04-30 | 1 | -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; } | ||||
* | | | revise HHKB bootloader_size to 4096 such that sw reset works (#1274) | tengg | 2017-05-04 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #1269 from ryanmaclean/patch-6 | Jack Humbert | 2017-05-01 | 1 | -6/+3 |
|\ \ | | | | | | | Cleaning Up Dockerfile Layers Per Official Docs | ||||
| * | | Cleaning Up Dockerfile Layers Per Official Docs | Ryan MacLean | 2017-04-30 | 1 | -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/ | ||||
* | | Merge pull request #1266 from ryanmaclean/patch-5 | Jack Humbert | 2017-04-30 | 2 | -0/+76 |
|\ \ | | | | | | | Adding AMJ60 ANSI Maximized Layout | ||||
| * | | Addind Sample Maxed Out Keymap | Ryan MacLean | 2017-04-29 | 1 | -0/+61 |
| | | | | | | | | | Keeping hold space for fn1, adding three other user-mappable keys. | ||||
| * | | Adding Maximized Layout | Ryan MacLean | 2017-04-29 | 1 | -0/+15 |
| |/ | | | | | Both split shifts and HHKB split backspace. | ||||
* | | Merge pull request #1268 from priyadi/promethium | Jack Humbert | 2017-04-30 | 9 | -85/+215 |
|\ \ | | | | | | | Promethium keymap update | ||||
| * | | Simple RGB backlight theming | Priyadi Iman Nurcahyo | 2017-04-30 | 5 | -72/+161 |
| | | | |||||
| * | | Syntax fix | Priyadi Iman Nurcahyo | 2017-04-30 | 1 | -2/+2 |
| | | | |||||
| * | | Promethium update: demo LED, fix PS2 delay, fix LED ordering, change click ↵ | Priyadi Iman Nurcahyo | 2017-04-29 | 4 | -22/+55 |
| | | | | | | | | | | | | frequency | ||||
| * | | tune clicks | Priyadi Iman Nurcahyo | 2017-04-19 | 1 | -3/+3 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into promethium | Priyadi Iman Nurcahyo | 2017-04-19 | 8 | -71/+300 |
| |\ \ | |||||
| * | | | Fix LED sequence; bug fixes | Priyadi Iman Nurcahyo | 2017-04-19 | 2 | -10/+18 |
| | | | | |||||
* | | | | Merge pull request #1264 from fredizzimo/wsl_support | Jack Humbert | 2017-04-30 | 2 | -20/+26 |
|\ \ \ \ | | | | | | | | | | | Add possibility to override the command to execute when flashing | ||||
| * | | | | Add possibility to override the command to execute when flashing | Fred Sundvik | 2017-04-29 | 2 | -20/+26 |
| | |_|/ | |/| | | |||||
* | | | | fixes s60_x keyboard | Jack Humbert | 2017-04-30 | 53 | -31/+44 |
| | | | | |||||
* | | | | Merge pull request #1263 from Dbroqua/master | Jack Humbert | 2017-04-30 | 5 | -62/+26 |
|\ \ \ \ | |/ / / |/| | | | Fixed bugs for S60-X RGB version | ||||
| * | | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware | dbroqua | 2017-04-29 | 92 | -234/+2831 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #21 from qmk/master | Damien | 2017-04-29 | 92 | -234/+2831 |
| | |\ \ \ | |_|/ / / |/| | | | | Merge from QMK | ||||
* | | | | | Merge pull request #1259 from laelath/master | Jack Humbert | 2017-04-26 | 2 | -11/+121 |
|\ \ \ \ \ | | | | | | | | | | | | | Added a proper README to the lae3 keymap | ||||
| * | | | | | Expanded lae3 keymap readme | laelath | 2017-04-26 | 2 | -11/+121 |
| | | | | | | |||||
* | | | | | | Merge pull request #1258 from smt/smt/hhkb | Jack Humbert | 2017-04-26 | 1 | -0/+176 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add smt keymap for HHKB | ||||
| * | | | | | Add smt keymap for HHKB | Stephen Tudor | 2017-04-24 | 1 | -0/+176 |
| | | | | | | |||||
* | | | | | | Merge pull request #1231 from Dbroqua/master | Jack Humbert | 2017-04-25 | 15 | -209/+458 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | S60-X RGB support | ||||
* | | | | | | Merge pull request #1253 from laelath/master | Jack Humbert | 2017-04-25 | 4 | -0/+294 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added lae3 keymap | ||||
| * | | | | | | Switched Alt and GUI key places | Justin Frank | 2017-04-23 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Added lae3 keymap | Justin Frank | 2017-04-22 | 4 | -0/+294 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1255 from ryanmaclean/patch-4 | Jack Humbert | 2017-04-25 | 2 | -0/+130 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Initial Ortholinear Commit for AMJPad | ||||
| * | | | | | | | Adding Right Layout | Ryan MacLean | 2017-04-22 | 1 | -0/+65 |
| | | | | | | | | |||||
| * | | | | | | | Update keymap.c | Ryan MacLean | 2017-04-22 | 0 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | Initial Ortho Commit (LEFT SIDE) | Ryan MacLean | 2017-04-22 | 1 | -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. | ||||
* | | | | | | | Merge pull request #1257 from MachineIndustries/keyboards/M10A | Jack Humbert | 2017-04-25 | 7 | -0/+229 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Add RAMA x Machine Industries M10A to the keyboards directory | ||||
| * | | | | | | Add RAMA x Machine Industries M10A to the keyboards directory | Josh Black | 2017-04-25 | 7 | -0/+229 |
|/ / / / / / | |||||
* | | | | | | Added an additional clueboard layout. (#1252) | Solomon | 2017-04-22 | 6 | -0/+130 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Current building keymap * Working media keys * Added mute key. Fixed volume. Fixed media * Updating readme * Swapped readme order | ||||
* | | | | | | Tweak the shift_fn keymap so it works | skullY | 2017-04-21 | 2 | -19/+22 |
| | | | | | | |||||
* | | | | | | Merge pull request #1246 from reversebias/master | Jack Humbert | 2017-04-19 | 8 | -0/+687 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Initial support for the Mitosis Keyboard | ||||
| * | | | | | | Update readme.md | reversebias | 2017-04-19 | 1 | -158/+6 |
| | | | | | | | |||||
| * | | | | | | First Commit | cam | 2017-04-19 | 8 | -0/+839 |
| | | | | | | | |||||
| * | | | | | | Delete temp | reversebias | 2017-04-19 | 1 | -1/+0 |
| | | | | | | |