84a358845b
Fix compile error
2017-05-07 18:00:06 -04:00
22738df5f5
Merge branch 'dev'
2017-05-07 14:44:28 -07:00
d099266853
[Miuni32] Rm accidentally committed file
2017-05-07 14:42:21 -07:00
ba90cf422c
Merge remote-tracking branch 'bigtunaio/layouts/adam-lee' into dev
2017-05-07 14:40:37 -07:00
f2fcab96a8
Merge remote-tracking branch 'upstream/master'
2017-05-07 14:36:10 -07:00
29df2be2a9
Merge remote-tracking branch 'upstream/master' into dev
2017-05-07 14:35:43 -07:00
3381254c65
Establish support for Bathroom Epiphanies Tiger Lily controller
...
Replacement controller for Filco Majestouch 2 104 key keyboard. BE
advises code will also work with the Black Petal controller - I don't
have one to test with. Tests working perfectly on my Filco.
2017-05-07 17:23:19 -04:00
230c70e285
- Initial commit for branch DK60
2017-05-07 22:56:27 +02:00
d28d390ad6
Update README for keymap “coderkun_neo2”
2017-05-06 12:25:24 +02:00
49046f621b
Merge tag '0.5.43' into coderkun_neo2
2017-05-06 12:19:45 +02:00
9e7448ea89
Fix F-keys on right hand to start on first key
2017-05-06 12:17:51 +02:00
b2083e21a2
lowercase .jpg I think
...
i guess that fixes the image link - currently its broken
2017-05-05 23:55:06 +02:00
cb60fe393f
Add new keymap for dshields.
2017-05-05 14:41:13 +01:00
a1e156a3d2
dynamic_macro.h: Do not use backlight_toggle if backlight is disabled
...
Fixes #1199 .
2017-05-05 00:11:24 +02:00
10a7cd7e5a
dynamic_macro.h: Add debug logs
2017-05-04 23:57:22 +02:00
8e94c9b4cb
dynamic_macro.h: Make the documentation more clear
2017-05-04 22:39:02 +02:00
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
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
425f0a768b
revise HHKB bootloader_size to 4096 such that sw reset works ( #1274 )
2017-05-04 10:27:35 -07:00
4b50ea15a9
dynamic_macro.h: Do not save the keys being held when stopping the recording
...
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.
2017-05-04 01:42:09 +02:00
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
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
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
7f3b1232c4
Use KC_KEYMAP for default-keymap
...
and remove obsolete explicit line-separator "\"
2017-05-03 22:13:46 +02:00
38b076d22d
Add KEYMAP without KC_##-prefix
...
and rename old variant to KEYMAP_KC
2017-05-03 22:01:02 +02:00
c5cef025ec
Merge pull request #1269 from ryanmaclean/patch-6
...
Cleaning Up Dockerfile Layers Per Official Docs
2017-05-01 12:15:27 -04:00
b27fb216ef
Testing initial blink support
2017-04-30 16:27:46 -07:00
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
26b51383b2
Merge pull request #1266 from ryanmaclean/patch-5
...
Adding AMJ60 ANSI Maximized Layout
2017-04-30 16:57:14 -04:00
29026ec023
Merge pull request #1268 from priyadi/promethium
...
Promethium keymap update
2017-04-30 11:18:54 -04:00
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
d1d2b87f97
fixes s60_x keyboard
2017-04-30 10:48:17 -04:00
43aa59c703
Merge pull request #1263 from Dbroqua/master
...
Fixed bugs for S60-X RGB version
2017-04-30 10:27:40 -04:00
343f8d368e
Simple RGB backlight theming
2017-04-30 18:04:58 +07:00
2f28652dcc
Syntax fix
2017-04-30 18:03:03 +07:00
c8ac556e63
Update vifon keymap to use `DYN_REC_STOP`
2017-04-30 19:48:07 +10:00
1201d4910f
Add cinaeco hhkb keymap
2017-04-30 19:30:39 +10:00
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
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
9122b34a47
Adding Maximized Layout
...
Both split shifts and HHKB split backspace.
2017-04-29 16:16:21 -07:00
18b4d24cc3
Add possibility to override the command to execute when flashing
2017-04-29 23:45:27 +03:00
ff6beeb7a3
simplified lock led function
2017-04-29 09:22:40 -07:00
7180e195e8
Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware
2017-04-29 15:04:01 +02:00
584b804ee3
Merge pull request #21 from qmk/master
...
Merge from QMK
2017-04-29 15:03:52 +02:00
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
d8f1949029
Promethium update: demo LED, fix PS2 delay, fix LED ordering, change click frequency
2017-04-29 13:21:27 +07:00
cdef372f57
Document the MAGIC keys
2017-04-28 11:56:03 -07:00
425e7348d8
Modified ht_156 keymap
2017-04-27 23:12:43 -07:00
b3945c103c
Simplified processing in led_controller; more control at user level.
2017-04-26 23:12:25 -07:00
26bbfd7812
Merge pull request #1259 from laelath/master
...
Added a proper README to the lae3 keymap
2017-04-26 19:22:36 -04:00
TerryMathews
Adam Lee
dbroqua
coderkun
Tobias O
Daniel Shields
Wojciech Siewierski
Jack Humbert
tengg
Thor77
jpetermans
Ryan MacLean
Priyadi Iman Nurcahyo
Weiyi Lou
Fred Sundvik
Damien
skullydazed
htang156