summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* dynamic_macro.h: Make the documentation more clearWojciech Siewierski2017-05-041-2/+5
|
* dynamic_macro.h: Do not save the keys being held when stopping the recordingWojciech Siewierski2017-05-041-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 errorWojciech Siewierski2017-05-041-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 notificationWojciech Siewierski2017-05-041-3/+1
| | | | Apparently sometimes the backlight was toggled only once and it was left on.
* dynamic_macro.h: Ignore all the initial key releasesWojciech Siewierski2017-05-041-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 Lou2017-04-301-1/+2
|
* Add cinaeco hhkb keymapWeiyi Lou2017-04-304-0/+252
|
* Add `DYN_REC_STOP` to dynamic macrosWeiyi Lou2017-04-301-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/masterJack Humbert2017-04-262-11/+121
|\ | | | | Added a proper README to the lae3 keymap
| * Expanded lae3 keymap readmelaelath2017-04-262-11/+121
| |
* | Merge pull request #1258 from smt/smt/hhkbJack Humbert2017-04-261-0/+176
|\ \ | |/ |/| Add smt keymap for HHKB
| * Add smt keymap for HHKBStephen Tudor2017-04-241-0/+176
| |
* | Merge pull request #1231 from Dbroqua/masterJack Humbert2017-04-2515-209/+458
|\ \ | | | | | | S60-X RGB support
| * | - Moved S60-X RGB in sub project for S60-Xdbroqua2017-04-1919-345/+170
| | |
| * | - Fixed bug in keymap for s60-X RGBdbroqua2017-04-181-1/+1
| | |
| * | - Added S-60-X RGB directory (based on qmk.sized.io work)dbroqua2017-04-158-0/+424
| | |
| * | Merge pull request #20 from qmk/masterDamien2017-04-13114-1679/+5047
| |\ \ | | | | | | | | Merge from QMK
* | \ \ Merge pull request #1253 from laelath/masterJack Humbert2017-04-254-0/+294
|\ \ \ \ | | | | | | | | | | Added lae3 keymap
| * | | | Switched Alt and GUI key placesJustin Frank2017-04-231-2/+2
| | | | |
| * | | | Added lae3 keymapJustin Frank2017-04-224-0/+294
| | | | |
* | | | | Merge pull request #1255 from ryanmaclean/patch-4Jack Humbert2017-04-252-0/+130
|\ \ \ \ \ | | | | | | | | | | | | Initial Ortholinear Commit for AMJPad
| * | | | | Adding Right LayoutRyan MacLean2017-04-221-0/+65
| | | | | |
| * | | | | Update keymap.cRyan MacLean2017-04-220-0/+0
| | | | | |
| * | | | | Initial Ortho Commit (LEFT SIDE)Ryan MacLean2017-04-221-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/M10AJack Humbert2017-04-257-0/+229
|\ \ \ \ \ | |/ / / / |/| | | | Add RAMA x Machine Industries M10A to the keyboards directory
| * | | | Add RAMA x Machine Industries M10A to the keyboards directoryJosh Black2017-04-257-0/+229
|/ / / /
* | | | Added an additional clueboard layout. (#1252)Solomon2017-04-226-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 worksskullY2017-04-212-19/+22
| | | |
* | | | Merge pull request #1246 from reversebias/masterJack Humbert2017-04-198-0/+687
|\ \ \ \ | | | | | | | | | | Initial support for the Mitosis Keyboard
| * | | | Update readme.mdreversebias2017-04-191-158/+6
| | | | |
| * | | | First Commitcam2017-04-198-0/+839
| | | | |
| * | | | Delete tempreversebias2017-04-191-1/+0
| | | | |
| * | | | Create tempreversebias2017-04-191-0/+1
| | | | |
* | | | | Merge pull request #1245 from fredizzimo/fix_lcd_pin_configurationJack Humbert2017-04-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix LCD SS pin configuration
| * | | | | Fix LCD SS pin configurationFred Sundvik2017-04-191-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-3Jack Humbert2017-04-192-1/+118
|\ \ \ \ \ | | | | | | | | | | | | Adding Maximized Keymap
| * | | | | Adding Sample Max LayoutRyan MacLean2017-04-181-0/+102
| | | | | |
| * | | | | Adding Maximized KeymapRyan MacLean2017-04-181-1/+16
| |/ / / / | | | | | | | | | | For use with grid layout pads.
* | | | | Merge pull request #1243 from Xyverz/masterJack Humbert2017-04-191-25/+20
|\ \ \ \ \ | |/ / / / |/| | | | Removed LT macros
| * | | | LT doesn't work with tri_layer. Removed it from this keymap.Xyverz2017-04-181-25/+20
| | | | |
| * | | | swapped RAISE with LOWER in layer-tapping macros.Xyverz2017-04-181-6/+6
| | | | |
* | | | | Merge pull request #1239 from priyadi/promethiumJack Humbert2017-04-188-54/+501
|\ \ \ \ \ | | | | | | | | | | | | Keymap updates
| * | | | | Fix Planck compatibilityPriyadi Iman Nurcahyo2017-04-191-0/+2
| | | | | |
| * | | | | Keymap updates and some adjustment for latest version of QMKPriyadi Iman Nurcahyo2017-04-194-24/+125
| | | | | |
| * | | | | Promethium rev2Priyadi Iman Nurcahyo2017-04-197-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_fixJack Humbert2017-04-182-16/+9
|\ \ \ \ \ | | | | | | | | | | | | Faux clicky bug fixes
| * | | | | Faux clicky bug fixesPriyadi Iman Nurcahyo2017-04-192-16/+9
| |/ / / /
* | | | | Merge pull request #1236 from Xyverz/masterJack Humbert2017-04-181-55/+89
|\ \ \ \ \ | | |/ / / | |/| | | Revamp TV44 keymap.
| * | | | Fixed a weird diff mishap.Xyverz2017-04-171-10/+0
| | | | |
| * | | | Merge branch 'tv44_revamp'Xyverz2017-04-171-48/+89
| |\ \ \ \