]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agoMerge remote-tracking branch 'origin/feature/DK60'
dbroqua [Tue, 30 May 2017 21:10:14 +0000 (23:10 +0200)]
Merge remote-tracking branch 'origin/feature/DK60'

7 years ago- Updated copyright
dbroqua [Tue, 30 May 2017 21:09:39 +0000 (23:09 +0200)]
- Updated copyright

7 years agoMerge remote-tracking branch 'origin/feature/DK60'
Damien Broqua [Tue, 30 May 2017 20:17:20 +0000 (22:17 +0200)]
Merge remote-tracking branch 'origin/feature/DK60'

7 years ago- Updated readme
Damien Broqua [Tue, 30 May 2017 20:17:03 +0000 (22:17 +0200)]
- Updated readme

7 years agoMerge remote-tracking branch 'origin/feature/DK60'
Damien Broqua [Tue, 30 May 2017 20:15:07 +0000 (22:15 +0200)]
Merge remote-tracking branch 'origin/feature/DK60'

7 years ago- Added Capslock/Esc led
Damien Broqua [Tue, 30 May 2017 20:13:34 +0000 (22:13 +0200)]
- Added Capslock/Esc led

7 years ago- Some changes on DK60
Damien Broqua [Tue, 30 May 2017 14:59:56 +0000 (16:59 +0200)]
- Some changes on DK60

7 years ago- Added schematic for Trackpoint demonstration
dbroqua [Fri, 26 May 2017 19:27:11 +0000 (21:27 +0200)]
- Added schematic for Trackpoint demonstration

7 years ago- Added integration of IBM Trackpoint
dbroqua [Fri, 26 May 2017 18:35:31 +0000 (20:35 +0200)]
- Added integration of IBM Trackpoint

7 years agoMerge pull request #22 from qmk/master
Damien [Fri, 26 May 2017 13:57:08 +0000 (15:57 +0200)]
Merge pull request #22 from qmk/master

Merge from QMK

7 years agoMerge pull request #1316 from nikchi/master
Jack Humbert [Wed, 24 May 2017 17:59:30 +0000 (13:59 -0400)]
Merge pull request #1316 from nikchi/master

FrostyFlake Keymap

7 years agomoved unicodemap rules to localer make
Nick Choi [Wed, 24 May 2017 16:36:36 +0000 (12:36 -0400)]
moved unicodemap rules to localer make

7 years agoMerge pull request #1317 from qmk/hf/faster_mouse
Erez Zukerman [Wed, 24 May 2017 12:09:29 +0000 (05:09 -0700)]
Merge pull request #1317 from qmk/hf/faster_mouse

tweaks default mouse speed constants

7 years agotweaks default mouse speed constants
Erez Zukerman [Wed, 24 May 2017 11:56:41 +0000 (07:56 -0400)]
tweaks default mouse speed constants

7 years agomore emoji function comments
Nick Choi [Wed, 24 May 2017 04:35:04 +0000 (00:35 -0400)]
more emoji function comments

7 years agoTap dancing emoji support 😩😩
Nick Choi [Wed, 24 May 2017 03:52:48 +0000 (23:52 -0400)]
Tap dancing emoji support 😩😩

7 years agoremoved s
Nick Choi [Tue, 23 May 2017 22:47:06 +0000 (18:47 -0400)]
removed s

7 years agoMerge branch 'master' of https://github.com/nikchi/qmk_firmware
Nick Choi [Tue, 23 May 2017 17:13:23 +0000 (13:13 -0400)]
Merge branch 'master' of https://github.com/nikchi/qmk_firmware

7 years agopreonic map
Nick Choi [Tue, 23 May 2017 17:13:20 +0000 (13:13 -0400)]
preonic map

7 years agoMerge pull request #1 from qmk/master
Nick Choi [Tue, 23 May 2017 17:08:44 +0000 (13:08 -0400)]
Merge pull request #1 from qmk/master

pull new to mine

7 years agoUpdate readme.md
Jack Humbert [Sat, 20 May 2017 16:38:30 +0000 (12:38 -0400)]
Update readme.md

7 years agoUpdate readme.md
Jack Humbert [Sat, 20 May 2017 16:37:31 +0000 (12:37 -0400)]
Update readme.md

7 years agoWorkaround for the macOS caps lock delay (#1308)
jerryen [Sat, 20 May 2017 00:24:47 +0000 (17:24 -0700)]
Workaround for the macOS caps lock delay (#1308)

* Add 80ms delay for KC_CAPS when used as a tap key

Workaround for the macOS caps lock delay

* Revert "Increase TAPPING_TERM for the Clueboard"

This reverts commit a74e69e9fa889113ee31fbc8dc7e6848fdb07576.

7 years agom10a lowercase
Jack Humbert [Thu, 18 May 2017 22:55:07 +0000 (18:55 -0400)]
m10a lowercase

7 years agoMerge pull request #1303 from cwesterlund/dvorak_dev_swe
Erez Zukerman [Thu, 18 May 2017 22:31:16 +0000 (15:31 -0700)]
Merge pull request #1303 from cwesterlund/dvorak_dev_swe

Created a dvorak keymap for Swedish developers using Visual Studio

7 years agoESC/GRAVE/TILDE better handling (#1307)
tengg [Thu, 18 May 2017 01:20:01 +0000 (21:20 -0400)]
ESC/GRAVE/TILDE better handling (#1307)

* revise HHKB bootloader_size to 4096 such that sw reset works

* cleanup esr/grave/tilde handling function

7 years agoupdate travis script
Jack Humbert [Thu, 18 May 2017 00:27:07 +0000 (20:27 -0400)]
update travis script

7 years agoIncrease TAPPING_TERM for the Clueboard
skullY [Tue, 16 May 2017 20:09:23 +0000 (13:09 -0700)]
Increase TAPPING_TERM for the Clueboard

7 years agoMake KC_GRV accessible
skullY [Sat, 22 Apr 2017 05:05:22 +0000 (22:05 -0700)]
Make KC_GRV accessible

7 years agoCreated a dvorak keymap for Swedish developers using Visual Studio
Christian Westerlund [Tue, 16 May 2017 13:15:42 +0000 (15:15 +0200)]
Created a dvorak keymap for Swedish developers using Visual Studio

7 years agoMerge pull request #1298 from barrar/master
Jack Humbert [Mon, 15 May 2017 16:20:17 +0000 (12:20 -0400)]
Merge pull request #1298 from barrar/master

Anti-ghost improvement for older keyboards with empty spots in matrix

7 years agoemojis and reorg
Nick Choi [Mon, 15 May 2017 06:19:50 +0000 (02:19 -0400)]
emojis and reorg

7 years agoemoji support but
Nick Choi [Mon, 15 May 2017 05:52:45 +0000 (01:52 -0400)]
emoji support but

7 years agochange readme
Nick Choi [Mon, 15 May 2017 04:12:04 +0000 (00:12 -0400)]
change readme

7 years agonikchi flake
Nick Choi [Mon, 15 May 2017 04:10:25 +0000 (00:10 -0400)]
nikchi flake

7 years agoadded comments and made function name clearer
Jeremiah [Sun, 14 May 2017 22:36:44 +0000 (15:36 -0700)]
added comments and made function name clearer

7 years agowhoops
Jeremiah [Sun, 14 May 2017 16:36:50 +0000 (09:36 -0700)]
whoops

7 years agofaster, less bits :)
Jeremiah [Sun, 14 May 2017 15:01:01 +0000 (08:01 -0700)]
faster, less bits :)

7 years agofaster and less bits... again
Jeremiah [Sun, 14 May 2017 02:07:05 +0000 (19:07 -0700)]
faster and less bits... again

7 years agofaster and less bits
Jeremiah [Sun, 14 May 2017 01:24:43 +0000 (18:24 -0700)]
faster and less bits

7 years agoshould be using matrix_row_t
Jeremiah [Sun, 14 May 2017 00:22:38 +0000 (17:22 -0700)]
should be using matrix_row_t

7 years agoa bit smaller
Jeremiah [Sun, 14 May 2017 00:01:27 +0000 (17:01 -0700)]
a bit smaller

7 years agoa bit smaller
Jeremiah [Sat, 13 May 2017 23:57:23 +0000 (16:57 -0700)]
a bit smaller

7 years agoimprovements
Jeremiah [Sat, 13 May 2017 20:19:28 +0000 (13:19 -0700)]
improvements

7 years agoUpdates readme.md
Jack Humbert [Sat, 13 May 2017 18:25:08 +0000 (18:25 +0000)]
Updates readme.md

Auto commit by GitBook Editor

7 years agoanti-ghost improvement for older keyboards with empty spots in matrix
Jeremiah [Sat, 13 May 2017 15:51:20 +0000 (08:51 -0700)]
anti-ghost improvement for older keyboards with empty spots in matrix

7 years agoMerge pull request #1 from qmk/master
barrar [Sat, 13 May 2017 15:37:25 +0000 (08:37 -0700)]
Merge pull request #1 from qmk/master

pull

7 years agoMerge pull request #1297 from khogeland/satan-colemak
Jack Humbert [Fri, 12 May 2017 20:24:51 +0000 (16:24 -0400)]
Merge pull request #1297 from khogeland/satan-colemak

Colemak layout for GH60 Satan

7 years agoMerge pull request #1291 from adzenith/persistent
Jack Humbert [Fri, 12 May 2017 20:24:29 +0000 (16:24 -0400)]
Merge pull request #1291 from adzenith/persistent

Fix spelling of "persistent"

7 years agoColemak layout GH60 Satan
Kevin Hogeland [Fri, 12 May 2017 19:03:09 +0000 (12:03 -0700)]
Colemak layout GH60 Satan

7 years agoFix spelling of "persistent"
Nikolaus Wittenstein [Thu, 11 May 2017 19:32:35 +0000 (15:32 -0400)]
Fix spelling of "persistent"

Fixes #1201.

7 years agoMerge pull request #1283 from TerryMathews/master
Jack Humbert [Thu, 11 May 2017 18:34:02 +0000 (14:34 -0400)]
Merge pull request #1283 from TerryMathews/master

Establish support for Bathroom Epiphanies Tiger Lily controller

7 years agoMerge pull request #1288 from Nephiel/led-set-on-layer-change
Jack Humbert [Thu, 11 May 2017 18:32:56 +0000 (14:32 -0400)]
Merge pull request #1288 from Nephiel/led-set-on-layer-change

Call led_set for layer action events to update LEDs on layer changes

7 years agoMerge pull request #1290 from shieldsd/master
Jack Humbert [Thu, 11 May 2017 18:31:11 +0000 (14:31 -0400)]
Merge pull request #1290 from shieldsd/master

Add new features to dshields keymap.

7 years agoAdd new features to dshields keymap.
Daniel Shields [Fri, 5 May 2017 14:49:35 +0000 (15:49 +0100)]
Add new features to dshields keymap.

- one shot layers, dynamic macros and tap dance keys
- add a basic readme.md and layout image.

7 years agoCall led_set for layer action events to update LEDs on layer changes
Nephiel [Wed, 10 May 2017 17:26:39 +0000 (19:26 +0200)]
Call led_set for layer action events to update LEDs on layer changes

7 years agoAdd smt keymap for Clueboard (HHKB-style layout) (#1286)
Stephen Tudor [Mon, 8 May 2017 22:32:15 +0000 (18:32 -0400)]
Add smt keymap for Clueboard (HHKB-style layout) (#1286)

* Add keymap for smt Clueboard (HHKB layout)

* Add readme for smt Clueboard (HHKB) keymap

* Flesh out the keymap a bit more to support Colemak & Dvorak

* Update README with layout image

7 years agoMerge pull request #1279 from awpr/master
Erez Zukerman [Mon, 8 May 2017 01:52:00 +0000 (21:52 -0400)]
Merge pull request #1279 from awpr/master

Change to per-key eager debouncing for ErgoDox EZ.

7 years agoMerge pull request #1275 from Vifon/dynamic_macro/trailing_keypresses
Jack Humbert [Mon, 8 May 2017 00:20:55 +0000 (20:20 -0400)]
Merge pull request #1275 from Vifon/dynamic_macro/trailing_keypresses

dynamic macros: Trim the trailing modifiers; further cleanup

7 years agoMerge pull request #1278 from shieldsd/master
Jack Humbert [Mon, 8 May 2017 00:18:23 +0000 (20:18 -0400)]
Merge pull request #1278 from shieldsd/master

Add new keymap for dshields.

7 years agoMerge pull request #1280 from tobsn/patch-1
Jack Humbert [Mon, 8 May 2017 00:17:47 +0000 (20:17 -0400)]
Merge pull request #1280 from tobsn/patch-1

lowercase .jpg

7 years agoMerge pull request #1282 from coderkun/coderkun_neo2
Jack Humbert [Mon, 8 May 2017 00:16:30 +0000 (20:16 -0400)]
Merge pull request #1282 from coderkun/coderkun_neo2

Merge changes for coderkun’s Neo2 layout

7 years agoMerge pull request #1284 from bigtunaIO/master
Jack Humbert [Mon, 8 May 2017 00:16:03 +0000 (20:16 -0400)]
Merge pull request #1284 from bigtunaIO/master

[Bigtuna.IO] Updating Miuni32 Layouts

7 years agoFix compile error
TerryMathews [Sun, 7 May 2017 22:00:06 +0000 (18:00 -0400)]
Fix compile error

7 years agoMerge branch 'dev'
Adam Lee [Sun, 7 May 2017 21:44:28 +0000 (14:44 -0700)]
Merge branch 'dev'

7 years ago[Miuni32] Rm accidentally committed file
Adam Lee [Sun, 7 May 2017 21:42:21 +0000 (14:42 -0700)]
[Miuni32] Rm accidentally committed file

7 years agoMerge remote-tracking branch 'bigtunaio/layouts/adam-lee' into dev
Adam Lee [Sun, 7 May 2017 21:40:37 +0000 (14:40 -0700)]
Merge remote-tracking branch 'bigtunaio/layouts/adam-lee' into dev

7 years agoMerge remote-tracking branch 'upstream/master'
Adam Lee [Sun, 7 May 2017 21:36:10 +0000 (14:36 -0700)]
Merge remote-tracking branch 'upstream/master'

7 years agoMerge remote-tracking branch 'upstream/master' into dev
Adam Lee [Sun, 7 May 2017 21:35:43 +0000 (14:35 -0700)]
Merge remote-tracking branch 'upstream/master' into dev

7 years agoEstablish support for Bathroom Epiphanies Tiger Lily controller
TerryMathews [Sun, 7 May 2017 21:23:19 +0000 (17:23 -0400)]
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.

7 years ago- Initial commit for branch DK60
dbroqua [Sun, 7 May 2017 20:56:27 +0000 (22:56 +0200)]
- Initial commit for branch DK60

7 years agoUpdate README for keymap “coderkun_neo2”
coderkun [Sat, 6 May 2017 10:25:24 +0000 (12:25 +0200)]
Update README for keymap “coderkun_neo2”

7 years agoMerge tag '0.5.43' into coderkun_neo2
coderkun [Sat, 6 May 2017 10:19:45 +0000 (12:19 +0200)]
Merge tag '0.5.43' into coderkun_neo2

7 years agoFix F-keys on right hand to start on first key
coderkun [Wed, 5 Apr 2017 13:53:58 +0000 (15:53 +0200)]
Fix F-keys on right hand to start on first key

7 years agolowercase .jpg I think
Tobias O [Fri, 5 May 2017 21:55:06 +0000 (23:55 +0200)]
lowercase .jpg I think

i guess that fixes the image link - currently its broken

7 years agoAdd new keymap for dshields.
Daniel Shields [Fri, 5 May 2017 13:41:13 +0000 (14:41 +0100)]
Add new keymap for dshields.

7 years agodynamic_macro.h: Do not use backlight_toggle if backlight is disabled
Wojciech Siewierski [Thu, 4 May 2017 22:11:24 +0000 (00:11 +0200)]
dynamic_macro.h: Do not use backlight_toggle if backlight is disabled

Fixes #1199.

7 years agodynamic_macro.h: Add debug logs
Wojciech Siewierski [Thu, 4 May 2017 20:55:35 +0000 (22:55 +0200)]
dynamic_macro.h: Add debug logs

7 years agodynamic_macro.h: Make the documentation more clear
Wojciech Siewierski [Thu, 4 May 2017 20:39:02 +0000 (22:39 +0200)]
dynamic_macro.h: Make the documentation more clear

7 years agoMerge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefix
Jack Humbert [Thu, 4 May 2017 19:07:57 +0000 (15:07 -0400)]
Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefix

[ps2avrGB] Add KEYMAP without KC-prefix

7 years agoMerge pull request #1273 from Vifon/pr_1267_fix
Jack Humbert [Thu, 4 May 2017 19:07:04 +0000 (15:07 -0400)]
Merge pull request #1273 from Vifon/pr_1267_fix

Add DYN_REC_STOP to the dynamic macros, cleanup PR #1267

7 years agorevise HHKB bootloader_size to 4096 such that sw reset works (#1274)
tengg [Thu, 4 May 2017 17:27:35 +0000 (13:27 -0400)]
revise HHKB bootloader_size to 4096 such that sw reset works (#1274)

7 years agodynamic_macro.h: Do not save the keys being held when stopping the recording
Wojciech Siewierski [Wed, 3 May 2017 23:37:46 +0000 (01:37 +0200)]
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.

7 years agodynamic_macro.h: Fix an off-by-two error
Wojciech Siewierski [Wed, 3 May 2017 23:19:05 +0000 (01:19 +0200)]
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.

7 years agodynamic_macro.h: Always toggle the backlight twice as a notification
Wojciech Siewierski [Wed, 3 May 2017 22:58:01 +0000 (00:58 +0200)]
dynamic_macro.h: Always toggle the backlight twice as a notification

Apparently sometimes the backlight was toggled only once and it was left on.

7 years agodynamic_macro.h: Ignore all the initial key releases
Wojciech Siewierski [Wed, 3 May 2017 21:47:52 +0000 (23:47 +0200)]
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.

7 years agoUse KC_KEYMAP for default-keymap
Thor77 [Wed, 3 May 2017 20:13:46 +0000 (22:13 +0200)]
Use KC_KEYMAP for default-keymap

and remove obsolete explicit line-separator "\"

7 years agoAdd KEYMAP without KC_##-prefix
Thor77 [Wed, 3 May 2017 20:01:02 +0000 (22:01 +0200)]
Add KEYMAP without KC_##-prefix

and rename old variant to KEYMAP_KC

7 years agoMerge pull request #1269 from ryanmaclean/patch-6
Jack Humbert [Mon, 1 May 2017 16:15:27 +0000 (12:15 -0400)]
Merge pull request #1269 from ryanmaclean/patch-6

Cleaning Up Dockerfile Layers Per Official Docs

7 years agoCleaning Up Dockerfile Layers Per Official Docs
Ryan MacLean [Sun, 30 Apr 2017 22:04:00 +0000 (15:04 -0700)]
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/

7 years agoMerge pull request #1266 from ryanmaclean/patch-5
Jack Humbert [Sun, 30 Apr 2017 20:57:14 +0000 (16:57 -0400)]
Merge pull request #1266 from ryanmaclean/patch-5

Adding AMJ60 ANSI Maximized Layout

7 years agoMerge pull request #1268 from priyadi/promethium
Jack Humbert [Sun, 30 Apr 2017 15:18:54 +0000 (11:18 -0400)]
Merge pull request #1268 from priyadi/promethium

Promethium keymap update

7 years agoMerge pull request #1264 from fredizzimo/wsl_support
Jack Humbert [Sun, 30 Apr 2017 15:17:47 +0000 (11:17 -0400)]
Merge pull request #1264 from fredizzimo/wsl_support

Add possibility to override the command to execute when flashing

7 years agofixes s60_x keyboard
Jack Humbert [Sun, 30 Apr 2017 14:48:17 +0000 (10:48 -0400)]
fixes s60_x keyboard

7 years agoMerge pull request #1263 from Dbroqua/master
Jack Humbert [Sun, 30 Apr 2017 14:27:40 +0000 (10:27 -0400)]
Merge pull request #1263 from Dbroqua/master

Fixed bugs for S60-X RGB version

7 years agoSimple RGB backlight theming
Priyadi Iman Nurcahyo [Sun, 30 Apr 2017 11:04:58 +0000 (18:04 +0700)]
Simple RGB backlight theming

7 years agoSyntax fix
Priyadi Iman Nurcahyo [Sun, 30 Apr 2017 11:03:03 +0000 (18:03 +0700)]
Syntax fix

7 years agoUpdate vifon keymap to use `DYN_REC_STOP`
Weiyi Lou [Sun, 30 Apr 2017 08:36:43 +0000 (18:36 +1000)]
Update vifon keymap to use `DYN_REC_STOP`

7 years agoAdd cinaeco hhkb keymap
Weiyi Lou [Sat, 29 Apr 2017 12:05:31 +0000 (22:05 +1000)]
Add cinaeco hhkb keymap

7 years agoAdd `DYN_REC_STOP` to dynamic macros
Weiyi Lou [Sat, 29 Apr 2017 12:02:01 +0000 (22:02 +1000)]
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;
    }