Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | dynamic_macro.h: Make the documentation more clear | Wojciech Siewierski | 2017-05-04 | 1 | -2/+5 |
| | |||||
* | dynamic_macro.h: Do not save the keys being held when stopping the recording | Wojciech Siewierski | 2017-05-04 | 1 | -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. | ||||
* | 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; } | ||||
* | 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 | ||||
| * | | - Moved S60-X RGB in sub project for S60-X | dbroqua | 2017-04-19 | 19 | -345/+170 |
| | | | |||||
| * | | - Fixed bug in keymap for s60-X RGB | dbroqua | 2017-04-18 | 1 | -1/+1 |
| | | | |||||
| * | | - Added S-60-X RGB directory (based on qmk.sized.io work) | dbroqua | 2017-04-15 | 8 | -0/+424 |
| | | | |||||
| * | | Merge pull request #20 from qmk/master | Damien | 2017-04-13 | 114 | -1679/+5047 |
| |\ \ | | | | | | | | | Merge from QMK | ||||
* | \ \ | 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 |
| | | | | | |||||
| * | | | | Create temp | reversebias | 2017-04-19 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1245 from fredizzimo/fix_lcd_pin_configuration | Jack Humbert | 2017-04-19 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix LCD SS pin configuration | ||||
| * | | | | | Fix LCD SS pin configuration | Fred Sundvik | 2017-04-19 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | There was a typo, so the attempted configuration proably didn't do what it should have done. I think it left the pin floating, and could cause the LCD problems issue-1230. | ||||
* | | | | | Merge pull request #1244 from ryanmaclean/patch-3 | Jack Humbert | 2017-04-19 | 2 | -1/+118 |
|\ \ \ \ \ | | | | | | | | | | | | | Adding Maximized Keymap | ||||
| * | | | | | Adding Sample Max Layout | Ryan MacLean | 2017-04-18 | 1 | -0/+102 |
| | | | | | | |||||
| * | | | | | Adding Maximized Keymap | Ryan MacLean | 2017-04-18 | 1 | -1/+16 |
| |/ / / / | | | | | | | | | | | For use with grid layout pads. | ||||
* | | | | | Merge pull request #1243 from Xyverz/master | Jack Humbert | 2017-04-19 | 1 | -25/+20 |
|\ \ \ \ \ | |/ / / / |/| | | | | Removed LT macros | ||||
| * | | | | LT doesn't work with tri_layer. Removed it from this keymap. | Xyverz | 2017-04-18 | 1 | -25/+20 |
| | | | | | |||||
| * | | | | swapped RAISE with LOWER in layer-tapping macros. | Xyverz | 2017-04-18 | 1 | -6/+6 |
| | | | | | |||||
* | | | | | Merge pull request #1239 from priyadi/promethium | Jack Humbert | 2017-04-18 | 8 | -54/+501 |
|\ \ \ \ \ | | | | | | | | | | | | | Keymap updates | ||||
| * | | | | | Fix Planck compatibility | Priyadi Iman Nurcahyo | 2017-04-19 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Keymap updates and some adjustment for latest version of QMK | Priyadi Iman Nurcahyo | 2017-04-19 | 4 | -24/+125 |
| | | | | | | |||||
| * | | | | | Promethium rev2 | Priyadi Iman Nurcahyo | 2017-04-19 | 7 | -30/+374 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 10 more indicator LEDs * Piezo buzzer * Uses HC138 decoder to free up 5 pins * Trackpoint buttons are now part of matrix | ||||
* | | | | | Merge pull request #1238 from priyadi/fauxclicky_fix | Jack Humbert | 2017-04-18 | 2 | -16/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Faux clicky bug fixes | ||||
| * | | | | | Faux clicky bug fixes | Priyadi Iman Nurcahyo | 2017-04-19 | 2 | -16/+9 |
| |/ / / / | |||||
* | | | | | Merge pull request #1236 from Xyverz/master | Jack Humbert | 2017-04-18 | 1 | -55/+89 |
|\ \ \ \ \ | | |/ / / | |/| | | | Revamp TV44 keymap. | ||||
| * | | | | Fixed a weird diff mishap. | Xyverz | 2017-04-17 | 1 | -10/+0 |
| | | | | | |||||
| * | | | | Merge branch 'tv44_revamp' | Xyverz | 2017-04-17 | 1 | -48/+89 |
| |\ \ \ \ |