megamanmalte/qmk_firmware
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
5032 commits 1 branch 0 tags 275 MiB
Commit graph

5032 commits

This branch
This branch
All branches
Author SHA1 Message Date
jpetermans b5675e2025 Merge branch 'user_led_configuration' of https://github.com/jpetermans/qmk_firmware into user_led_configuration 
Conflicts:
	keyboards/infinity60/led_controller.c
	keyboards/infinity60/led_controller.h
 2017-05-08 15:42:27 -07:00
jpetermans 967cf0f6d4 Merge remote-tracking branch 'upstream/master' into user_led_configuration 2017-05-08 15:24:50 -07:00
jpetermans 5df74f3ba7 updated keymap for new led functions 2017-05-08 15:13:02 -07:00
jpetermans f1d81d2cc6 minor change on lock leds 2017-05-08 14:55:57 -07:00
jpetermans 2c5b551970 CLeaned out debug code 2017-05-08 14:35:08 -07:00
jpetermans 52f671c23e small code cleanup 2017-05-08 11:57:40 -07:00
Erez Zukerman 153eb95ab2 Merge pull request #1279 from awpr/master 
Change to per-key eager debouncing for ErgoDox EZ.
 2017-05-07 21:52:00 -04:00
Jack Humbert d9b70cc1c9 Merge pull request #1275 from Vifon/dynamic_macro/trailing_keypresses 
dynamic macros: Trim the trailing modifiers; further cleanup
 2017-05-07 20:20:55 -04:00
Jack Humbert b11a5be62c Merge pull request #1278 from shieldsd/master 
Add new keymap for dshields.
 2017-05-07 20:18:23 -04:00
Jack Humbert 0b050f6c33 Merge pull request #1280 from tobsn/patch-1 
lowercase .jpg
 2017-05-07 20:17:47 -04:00
Jack Humbert 05b356dea7 Merge pull request #1282 from coderkun/coderkun_neo2 
Merge changes for coderkun’s Neo2 layout
 2017-05-07 20:16:30 -04:00
Jack Humbert 7a7b57ffb1 Merge pull request #1284 from bigtunaIO/master 
[Bigtuna.IO] Updating Miuni32 Layouts
 2017-05-07 20:16:03 -04:00
Adam Lee 22738df5f5 Merge branch 'dev' 2017-05-07 14:44:28 -07:00
Adam Lee d099266853 [Miuni32] Rm accidentally committed file 2017-05-07 14:42:21 -07:00
Adam Lee ba90cf422c Merge remote-tracking branch 'bigtunaio/layouts/adam-lee' into dev 2017-05-07 14:40:37 -07:00
Adam Lee f2fcab96a8 Merge remote-tracking branch 'upstream/master' 2017-05-07 14:36:10 -07:00
Adam Lee 29df2be2a9 Merge remote-tracking branch 'upstream/master' into dev 2017-05-07 14:35:43 -07:00
coderkun d28d390ad6 Update README for keymap “coderkun_neo2” 2017-05-06 12:25:24 +02:00
coderkun 49046f621b Merge tag '0.5.43' into coderkun_neo2 2017-05-06 12:19:45 +02:00
coderkun 9e7448ea89 Fix F-keys on right hand to start on first key 2017-05-06 12:17:51 +02:00
Tobias O b2083e21a2 lowercase .jpg I think 
i guess that fixes the image link - currently its broken
 2017-05-05 23:55:06 +02:00
Daniel Shields cb60fe393f Add new keymap for dshields. 2017-05-05 14:41:13 +01:00
Wojciech Siewierski a1e156a3d2 dynamic_macro.h: Do not use backlight_toggle if backlight is disabled 
Fixes #1199.
 2017-05-05 00:11:24 +02:00
Wojciech Siewierski 10a7cd7e5a dynamic_macro.h: Add debug logs 2017-05-04 23:57:22 +02:00
Wojciech Siewierski 8e94c9b4cb dynamic_macro.h: Make the documentation more clear 2017-05-04 22:39:02 +02: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 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
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
jpetermans b27fb216ef Testing initial blink support 2017-04-30 16:27:46 -07: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