summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'master' into coderkun_neo2coderkun2017-04-01586-5506/+32053
| |\ \ \ \ \ \ \
| * | | | | | | | Fix return value of hex_to_keycode() function in keymap “coderkun_neo2”coderkun2016-12-281-4/+5
| | | | | | | | |
* | | | | | | | | Merge pull request #1284 from bigtunaIO/masterJack Humbert2017-05-0711-19/+450
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | [Bigtuna.IO] Updating Miuni32 Layouts
| * | | | | | | | Merge branch 'dev'Adam Lee2017-05-079-12/+408
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [Miuni32] Rm accidentally committed fileAdam Lee2017-05-071-42/+0
| | | | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'bigtunaio/layouts/adam-lee' into devAdam Lee2017-05-075-0/+191
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' into layouts/adam-leeAdam YH Lee2017-04-1642-72/+115
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Add a personal layout for adamAdam YH Lee2017-04-165-0/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collectively we should keep on working on the "default" layout. I am adding my own layout to freely explore adjustments and new features.
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into devAdam Lee2017-05-07123-459/+3724
| | |\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| | * | | | | | | | | | Modified ht_156 keymaphtang1562017-04-271-9/+13
| | | | | | | | | | | |
| | * | | | | | | | | | Added simple macros to test.htang1562017-04-161-9/+62
| | | | | | | | | | | |
| | * | | | | | | | | | Added media layer for ht_156htang1562017-04-161-3/+18
| | | | | | | | | | | |
| | * | | | | | | | | | Added ht_156 keymap fileshtang1562017-04-164-0/+139
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into devAdam YH Lee2017-04-1642-72/+115
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| / / / / / / / / | | | |/ / / / / / / /
| | * | | | | | | | | Replace RALT with RSFTAdam YH Lee2017-04-161-2/+2
| | | | | | | | | | |
| | * | | | | | | | | Added END and other keymap file formatting.htang1562017-04-161-13/+13
| | | | | | | | | | |
| | * | | | | | | | | Added DEL and F1 to F12 keyshtang1562017-04-161-6/+6
| | | | | | | | | | |
| | * | | | | | | | | Added keymap commets to default layout.htang1562017-04-161-0/+36
| | | | | | | | | | |
| | * | | | | | | | | Add TAB, N, LSFT on Layer 2Adam YH Lee2017-04-141-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Add KC_T on Layer 2Adam YH Lee2017-04-131-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Add LCTL + L on Layer 2Adam YH Lee2017-04-131-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master'Adam Lee2017-05-07164-521/+3829
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefixJack Humbert2017-05-042-8/+26
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ps2avrGB] Add KEYMAP without KC-prefix
| * | | | | | | | | | Use KC_KEYMAP for default-keymapThor772017-05-031-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and remove obsolete explicit line-separator "\"
| * | | | | | | | | | Add KEYMAP without KC_##-prefixThor772017-05-031-0/+18
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | and rename old variant to KEYMAP_KC
* | | | | | | | | | Merge pull request #1273 from Vifon/pr_1267_fixJack Humbert2017-05-046-12/+270
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | Add DYN_REC_STOP to the dynamic macros, cleanup PR #1267
| * | | | | | | | | 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; }
* | | | | | | | | | revise HHKB bootloader_size to 4096 such that sw reset works (#1274)tengg2017-05-041-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1269 from ryanmaclean/patch-6Jack Humbert2017-05-011-6/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Cleaning Up Dockerfile Layers Per Official Docs
| * | | | | | | | | Cleaning Up Dockerfile Layers Per Official DocsRyan MacLean2017-04-301-6/+3
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |