Adam Lee
29df2be2a9
Merge remote-tracking branch 'upstream/master' into dev
2017-05-07 14:35:43 -07:00
Jack Humbert
2704c163da
Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefix
...
[ps2avrGB] Add KEYMAP without KC-prefix
2017-05-04 15:07:57 -04:00
Jack Humbert
3af95509b5
Merge pull request #1273 from Vifon/pr_1267_fix
...
Add DYN_REC_STOP to the dynamic macros, cleanup PR #1267
2017-05-04 15:07:04 -04:00
tengg
425f0a768b
revise HHKB bootloader_size to 4096 such that sw reset works ( #1274 )
2017-05-04 10:27:35 -07:00
Wojciech Siewierski
436d661775
dynamic_macro.h: Fix an off-by-two error
...
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-04 01:26:35 +02:00
Wojciech Siewierski
5e2a999278
dynamic_macro.h: Always toggle the backlight twice as a notification
...
Apparently sometimes the backlight was toggled only once and it was left on.
2017-05-04 00:58:01 +02:00
Wojciech Siewierski
40fe30e4d6
dynamic_macro.h: Ignore all the initial key releases
...
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-04 00:14:38 +02:00
Thor77
7f3b1232c4
Use KC_KEYMAP for default-keymap
...
and remove obsolete explicit line-separator "\"
2017-05-03 22:13:46 +02:00
Thor77
38b076d22d
Add KEYMAP without KC_##-prefix
...
and rename old variant to KEYMAP_KC
2017-05-03 22:01:02 +02:00
Jack Humbert
c5cef025ec
Merge pull request #1269 from ryanmaclean/patch-6
...
Cleaning Up Dockerfile Layers Per Official Docs
2017-05-01 12:15:27 -04:00
Ryan MacLean
7ce94eb468
Cleaning Up Dockerfile Layers Per Official Docs
...
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-30 15:04:00 -07:00
Jack Humbert
26b51383b2
Merge pull request #1266 from ryanmaclean/patch-5
...
Adding AMJ60 ANSI Maximized Layout
2017-04-30 16:57:14 -04:00
Jack Humbert
29026ec023
Merge pull request #1268 from priyadi/promethium
...
Promethium keymap update
2017-04-30 11:18:54 -04:00
Jack Humbert
2d732f484c
Merge pull request #1264 from fredizzimo/wsl_support
...
Add possibility to override the command to execute when flashing
2017-04-30 11:17:47 -04:00
Jack Humbert
d1d2b87f97
fixes s60_x keyboard
2017-04-30 10:48:17 -04:00
Jack Humbert
43aa59c703
Merge pull request #1263 from Dbroqua/master
...
Fixed bugs for S60-X RGB version
2017-04-30 10:27:40 -04:00
Priyadi Iman Nurcahyo
343f8d368e
Simple RGB backlight theming
2017-04-30 18:04:58 +07:00
Priyadi Iman Nurcahyo
2f28652dcc
Syntax fix
2017-04-30 18:03:03 +07:00
Weiyi Lou
c8ac556e63
Update vifon keymap to use DYN_REC_STOP
2017-04-30 19:48:07 +10:00
Weiyi Lou
1201d4910f
Add cinaeco hhkb keymap
2017-04-30 19:30:39 +10:00
Weiyi Lou
4ff40a551a
Add DYN_REC_STOP
to dynamic macros
...
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-30 19:21:44 +10:00
Ryan MacLean
ff512ea5b4
Addind Sample Maxed Out Keymap
...
Keeping hold space for fn1, adding three other user-mappable keys.
2017-04-29 16:18:26 -07:00
Ryan MacLean
9122b34a47
Adding Maximized Layout
...
Both split shifts and HHKB split backspace.
2017-04-29 16:16:21 -07:00
Fred Sundvik
18b4d24cc3
Add possibility to override the command to execute when flashing
2017-04-29 23:45:27 +03:00
dbroqua
7180e195e8
Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware
2017-04-29 15:04:01 +02:00
Damien
584b804ee3
Merge pull request #21 from qmk/master
...
Merge from QMK
2017-04-29 15:03:52 +02:00
dbroqua
838aae1645
- Fixed bugs in rules.mk for S60-X
...
- Updated dbroqua layout for S60-X (added backlight)
2017-04-29 15:02:54 +02:00
Priyadi Iman Nurcahyo
d8f1949029
Promethium update: demo LED, fix PS2 delay, fix LED ordering, change click frequency
2017-04-29 13:21:27 +07:00
htang156
425e7348d8
Modified ht_156 keymap
2017-04-27 23:12:43 -07:00
Jack Humbert
26bbfd7812
Merge pull request #1259 from laelath/master
...
Added a proper README to the lae3 keymap
2017-04-26 19:22:36 -04:00
laelath
196740a0bb
Expanded lae3 keymap readme
2017-04-26 13:56:01 -07:00
Jack Humbert
5a809ac178
Merge pull request #1258 from smt/smt/hhkb
...
Add smt keymap for HHKB
2017-04-26 15:30:36 -04:00
Jack Humbert
7bd4559b4b
Merge pull request #1231 from Dbroqua/master
...
S60-X RGB support
2017-04-25 14:09:41 -04:00
Jack Humbert
9fa7a788d3
Merge pull request #1253 from laelath/master
...
Added lae3 keymap
2017-04-25 14:08:52 -04:00
Jack Humbert
627dd8a73c
Merge pull request #1255 from ryanmaclean/patch-4
...
Initial Ortholinear Commit for AMJPad
2017-04-25 14:08:16 -04:00
Jack Humbert
46826adba8
Merge pull request #1257 from MachineIndustries/keyboards/M10A
...
Add RAMA x Machine Industries M10A to the keyboards directory
2017-04-25 14:07:41 -04:00
Josh Black
d6386b108b
Add RAMA x Machine Industries M10A to the keyboards directory
2017-04-25 19:00:44 +01:00
Stephen Tudor
4cc41de50b
Add smt keymap for HHKB
2017-04-24 11:16:14 -04:00
Justin Frank
e2a5dfdba6
Switched Alt and GUI key places
2017-04-23 19:38:40 -07:00
Ryan MacLean
d27ff5ccf6
Adding Right Layout
2017-04-22 22:34:14 -07:00
Ryan MacLean
24994046d6
Update keymap.c
2017-04-22 21:26:47 -07:00
Ryan MacLean
2e62ff9807
Initial Ortho Commit (LEFT SIDE)
...
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-22 20:49:34 -07:00
Justin Frank
7f3224b117
Added lae3 keymap
2017-04-22 15:15:17 -07:00
Solomon
187c78f3cb
Added an additional clueboard layout. ( #1252 )
...
* Current building keymap
* Working media keys
* Added mute key. Fixed volume. Fixed media
* Updating readme
* Swapped readme order
2017-04-22 06:25:41 -07:00
skullY
973e91078b
Tweak the shift_fn keymap so it works
2017-04-21 21:46:01 -07:00
dbroqua
215dd126d0
- Moved S60-X RGB in sub project for S60-X
2017-04-19 22:12:23 +02:00
Jack Humbert
460b5f8751
Merge pull request #1246 from reversebias/master
...
Initial support for the Mitosis Keyboard
2017-04-19 08:43:28 -04:00
reversebias
43fd889d7e
Update readme.md
2017-04-19 22:39:44 +10:00
Jack Humbert
95242fe0f1
Merge pull request #1245 from fredizzimo/fix_lcd_pin_configuration
...
Fix LCD SS pin configuration
2017-04-19 07:50:03 -04:00
Jack Humbert
4760b26bec
Merge pull request #1244 from ryanmaclean/patch-3
...
Adding Maximized Keymap
2017-04-19 07:49:46 -04:00