]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
6 years agoSCKLCK is now SCROLLLOCK (#1376)
Ethan Madden [Fri, 9 Jun 2017 02:54:49 +0000 (19:54 -0700)]
SCKLCK is now SCROLLLOCK (#1376)

Yes, with all three Ls
At least it doesn't have a random K anymore lol

6 years agoMerge pull request #1375 from Wraul/kmac
Jack Humbert [Thu, 8 Jun 2017 20:42:05 +0000 (16:42 -0400)]
Merge pull request #1375 from Wraul/kmac

Add support for KMAC

6 years agoAdd support for KMAC
Mathias Andersson [Sun, 4 Jun 2017 20:13:17 +0000 (22:13 +0200)]
Add support for KMAC

6 years agoMerge pull request #1372 from chilifries/master
Jack Humbert [Thu, 8 Jun 2017 01:10:45 +0000 (21:10 -0400)]
Merge pull request #1372 from chilifries/master

Added support for Mechmini v1

6 years agoAdded support for Mechmini v1
chilifries [Wed, 7 Jun 2017 23:24:40 +0000 (16:24 -0700)]
Added support for Mechmini v1

6 years agoMerge pull request #1359 from agbell/PR
Jack Humbert [Wed, 7 Jun 2017 22:47:29 +0000 (18:47 -0400)]
Merge pull request #1359 from agbell/PR

Permissive Hold, and two keymaps

6 years agoAdd new keyboard layout for the ClueBoard (#1371)
Martin Gondermann [Wed, 7 Jun 2017 15:18:26 +0000 (17:18 +0200)]
Add new keyboard layout for the ClueBoard (#1371)

6 years agoMerge pull request #1366 from abperiasamy/refine-layout
Jack Humbert [Tue, 6 Jun 2017 16:35:26 +0000 (12:35 -0400)]
Merge pull request #1366 from abperiasamy/refine-layout

Replace enter with quote and few reorgs

6 years agoMerge pull request #1368 from shieldsd/master
Jack Humbert [Tue, 6 Jun 2017 16:35:04 +0000 (12:35 -0400)]
Merge pull request #1368 from shieldsd/master

Additional tap dance keys/functions for planck/keymap/dshields

6 years agoAdditional tap dance keys/functions for planck/keymap/dshields
Daniel Shields [Fri, 2 Jun 2017 10:10:22 +0000 (11:10 +0100)]
Additional tap dance keys/functions for planck/keymap/dshields

6 years agoupdate docs link
Jack Humbert [Mon, 5 Jun 2017 20:25:59 +0000 (16:25 -0400)]
update docs link

6 years agoremove build stuff
Adam Bell [Sat, 3 Jun 2017 18:32:02 +0000 (14:32 -0400)]
remove build stuff

6 years agoAdding permissive_hold
Adam Bell [Thu, 1 Jun 2017 01:34:34 +0000 (21:34 -0400)]
Adding permissive_hold

6 years agoadding lets split keymap
Adam Bell [Mon, 15 May 2017 01:08:53 +0000 (21:08 -0400)]
adding lets split keymap

6 years agoErgodox Adam keymap
Adam Bell [Sat, 3 Jun 2017 14:28:36 +0000 (10:28 -0400)]
Ergodox Adam keymap

6 years agoAdding docker compose
Adam Bell [Mon, 9 Jan 2017 17:02:23 +0000 (12:02 -0500)]
Adding docker compose

6 years agoMerge pull request #1357 from shieldsd/gherkin
Jack Humbert [Fri, 2 Jun 2017 14:23:54 +0000 (10:23 -0400)]
Merge pull request #1357 from shieldsd/gherkin

Initial commit for gherkin keyboard support. Compiles but untested.

6 years agoInitial commit for gherkin keyboard support. Compiles but untested.
Daniel Shields [Fri, 2 Jun 2017 11:32:00 +0000 (12:32 +0100)]
Initial commit for gherkin keyboard support. Compiles but untested.

6 years agoUpdate Keycodes.md
Jack Humbert [Fri, 2 Jun 2017 13:44:08 +0000 (09:44 -0400)]
Update Keycodes.md

6 years agoMerge pull request #1356 from fabienheureux/patch-1
Jack Humbert [Fri, 2 Jun 2017 13:21:15 +0000 (09:21 -0400)]
Merge pull request #1356 from fabienheureux/patch-1

Broken Keymap docs link

6 years agoUpdate Keycodes.md
Jack Humbert [Fri, 2 Jun 2017 13:21:01 +0000 (09:21 -0400)]
Update Keycodes.md

6 years agoBroken Keymap docs link
fabienheureux [Fri, 2 Jun 2017 08:51:12 +0000 (10:51 +0200)]
Broken Keymap docs link

6 years agoMerge pull request #1347 from nooges/nyquist
Jack Humbert [Thu, 1 Jun 2017 16:58:33 +0000 (12:58 -0400)]
Merge pull request #1347 from nooges/nyquist

Add Nyquist keyboard support

6 years agoMerge pull request #1294 from shieldsd/master
Jack Humbert [Thu, 1 Jun 2017 16:18:36 +0000 (12:18 -0400)]
Merge pull request #1294 from shieldsd/master

Prevent the recording of looping dynamic macros.

6 years agoPrevent the recording of looping dynamic macros.
Daniel Shields [Thu, 11 May 2017 08:46:11 +0000 (09:46 +0100)]
Prevent the recording of looping dynamic macros.

If a macro play key is inadvertently recorded in a dynamic macro
a loop is created and the macro will not terminate when played.

This should be prevented.

6 years agoMerge pull request #1350 from originerd/add-originerd-planck-keymap
Jack Humbert [Thu, 1 Jun 2017 15:19:40 +0000 (11:19 -0400)]
Merge pull request #1350 from originerd/add-originerd-planck-keymap

Add originerd planck keymap

6 years agoMerge pull request #1351 from Alfrheim/fixing_dvorak_layout
Jack Humbert [Thu, 1 Jun 2017 15:19:20 +0000 (11:19 -0400)]
Merge pull request #1351 from Alfrheim/fixing_dvorak_layout

replacing one R for a T

6 years agoMerge pull request #1353 from 333fred/333fred-layout
Jack Humbert [Thu, 1 Jun 2017 15:18:56 +0000 (11:18 -0400)]
Merge pull request #1353 from 333fred/333fred-layout

ergodox/333fred layout

6 years agoMerge pull request #1354 from shieldsd/tweaks
Jack Humbert [Thu, 1 Jun 2017 15:18:28 +0000 (11:18 -0400)]
Merge pull request #1354 from shieldsd/tweaks

Tweak reported power consumption to work with iOS

6 years agoUpdate keymap layout comments
Danny Nguyen [Thu, 1 Jun 2017 05:36:14 +0000 (01:36 -0400)]
Update keymap layout comments

6 years agoTweak reported power consumption to work with iOS
Daniel Shields [Thu, 25 May 2017 10:08:17 +0000 (11:08 +0100)]
Tweak reported power consumption to work with iOS

6 years agoRemove OLED code and set I2C rate back to 100kHz
Danny Nguyen [Thu, 1 Jun 2017 05:26:06 +0000 (01:26 -0400)]
Remove OLED code and set I2C rate back to 100kHz

6 years agoUpdate licensing on visualizer.c
Fredric Silberberg [Thu, 1 Jun 2017 01:07:02 +0000 (18:07 -0700)]
Update licensing on visualizer.c

6 years agoUpdated readme
Fredric Silberberg [Thu, 1 Jun 2017 00:57:38 +0000 (17:57 -0700)]
Updated readme

6 years agoAdded several new macros
Fredric Silberberg [Thu, 1 Jun 2017 00:42:50 +0000 (17:42 -0700)]
Added several new macros

6 years agoFixed numpad 0 layout
Fredric Silberberg [Wed, 31 May 2017 17:27:39 +0000 (10:27 -0700)]
Fixed numpad 0 layout

6 years agoreplacing one R for a T
Alfrheim [Wed, 31 May 2017 13:19:37 +0000 (15:19 +0200)]
replacing one R for a T

6 years agoAdd originerd planck keymap
Jitae Kim [Wed, 31 May 2017 13:00:44 +0000 (22:00 +0900)]
Add originerd planck keymap

6 years agoUse code blocks for keyboard layouts
Fredric Silberberg [Wed, 31 May 2017 06:56:28 +0000 (23:56 -0700)]
Use code blocks for keyboard layouts

6 years agoCompleted iteration 1 of my layout
Fredric Silberberg [Wed, 31 May 2017 06:52:20 +0000 (23:52 -0700)]
Completed iteration 1 of my layout

6 years agoMerge pull request #1348 from Dbroqua/master
Jack Humbert [Wed, 31 May 2017 03:12:11 +0000 (23:12 -0400)]
Merge pull request #1348 from Dbroqua/master

Added DK60 keyboard

6 years agoAdded initial keymap files
Fredric Silberberg [Wed, 31 May 2017 01:01:09 +0000 (18:01 -0700)]
Added initial keymap files

6 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'

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

6 years agoUpdate copyright info
Danny Nguyen [Tue, 30 May 2017 20:52:02 +0000 (16:52 -0400)]
Update copyright info

6 years agoRemove Let’s Split plate files
Danny Nguyen [Tue, 30 May 2017 20:42:04 +0000 (16:42 -0400)]
Remove Let’s Split plate files

6 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'

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

6 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'

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

6 years agoMerge pull request #1323 from nikchi/master
Jack Humbert [Tue, 30 May 2017 19:38:22 +0000 (15:38 -0400)]
Merge pull request #1323 from nikchi/master

Variable tapping terms

6 years agohmm?
Nick Choi [Tue, 30 May 2017 18:19:57 +0000 (14:19 -0400)]
hmm?

6 years agoMerge pull request #2 from qmk/master
Nick Choi [Tue, 30 May 2017 18:17:48 +0000 (14:17 -0400)]
Merge pull request #2 from qmk/master

pull in new qmk changes

6 years agoUpdate readme
Danny Nguyen [Tue, 30 May 2017 17:23:09 +0000 (13:23 -0400)]
Update readme

6 years agoMerge branch 'master' of https://github.com/qmk/qmk_firmware
Jack Humbert [Tue, 30 May 2017 16:49:38 +0000 (12:49 -0400)]
Merge branch 'master' of https://github.com/qmk/qmk_firmware

6 years agomake qmk bot do the hard work
Jack Humbert [Tue, 30 May 2017 16:49:26 +0000 (12:49 -0400)]
make qmk bot do the hard work

6 years agoMerge pull request #1342 from priyadi/adafruit-mouse-buttons
Jack Humbert [Tue, 30 May 2017 16:10:45 +0000 (12:10 -0400)]
Merge pull request #1342 from priyadi/adafruit-mouse-buttons

Adafruit Feather BLE / BLE Friend mouse buttons support

6 years agoMerge branch 'master' of https://github.com/qmk/qmk_firmware
Jack Humbert [Tue, 30 May 2017 15:46:34 +0000 (11:46 -0400)]
Merge branch 'master' of https://github.com/qmk/qmk_firmware

6 years agoexclude PRs
Jack Humbert [Tue, 30 May 2017 15:46:25 +0000 (11:46 -0400)]
exclude PRs

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

6 years agoswitched to uint8 and 16
Nick Choi [Tue, 30 May 2017 01:25:50 +0000 (21:25 -0400)]
switched to uint8 and 16

6 years agoModify pinout and layouts for Nyquist
Danny Nguyen [Mon, 29 May 2017 20:20:06 +0000 (16:20 -0400)]
Modify pinout and layouts for Nyquist

6 years agoFork Let’s Split files
Danny Nguyen [Mon, 29 May 2017 19:37:19 +0000 (15:37 -0400)]
Fork Let’s Split files

6 years agoMerge pull request #1344 from qmk/jackhumbert-patch-1
Jack Humbert [Mon, 29 May 2017 19:17:38 +0000 (15:17 -0400)]
Merge pull request #1344 from qmk/jackhumbert-patch-1

Re-enable mouse buttons from #1327

6 years agoRe-enable mouse buttons
Jack Humbert [Mon, 29 May 2017 17:21:38 +0000 (13:21 -0400)]
Re-enable mouse buttons

6 years agono master needed on push maybe
Jack Humbert [Mon, 29 May 2017 16:49:25 +0000 (12:49 -0400)]
no master needed on push maybe

6 years agoMerge branch 'master' of https://github.com/qmk/qmk_firmware
Jack Humbert [Mon, 29 May 2017 16:15:03 +0000 (12:15 -0400)]
Merge branch 'master' of https://github.com/qmk/qmk_firmware

6 years agopush to git url
Jack Humbert [Mon, 29 May 2017 16:14:49 +0000 (12:14 -0400)]
push to git url

6 years agoJokrik's Clueboard layout (#1340)
Priyadi Iman Nurcahyo [Mon, 29 May 2017 16:10:34 +0000 (23:10 +0700)]
Jokrik's Clueboard layout (#1340)

6 years agoMerge pull request #1343 from Maartenwut/patch-1
Jack Humbert [Mon, 29 May 2017 15:58:08 +0000 (11:58 -0400)]
Merge pull request #1343 from Maartenwut/patch-1

Added SEND_STRING(); to the documentation.

6 years agoMerge pull request #1337 from fredizzimo/wsl_setup
Jack Humbert [Mon, 29 May 2017 15:56:54 +0000 (11:56 -0400)]
Merge pull request #1337 from fredizzimo/wsl_setup

Add script for setting up Windows Subsystem for Linux

6 years agoAdded SEND_STRING(); to the documentation.
Maarten Dekkers [Mon, 29 May 2017 15:53:39 +0000 (17:53 +0200)]
Added SEND_STRING(); to the documentation.

6 years agoMerge branch 'master' of https://github.com/qmk/qmk_firmware
Jack Humbert [Mon, 29 May 2017 15:37:33 +0000 (11:37 -0400)]
Merge branch 'master' of https://github.com/qmk/qmk_firmware

6 years agoget rid of folders in tar
Jack Humbert [Mon, 29 May 2017 15:37:20 +0000 (11:37 -0400)]
get rid of folders in tar

6 years agoMerge pull request #1341 from Dbroqua/patch-3
Jack Humbert [Mon, 29 May 2017 14:55:32 +0000 (10:55 -0400)]
Merge pull request #1341 from Dbroqua/patch-3

Update Differences-from-TMK.md

6 years agoMerge branch 'master' of https://github.com/qmk/qmk_firmware
Jack Humbert [Mon, 29 May 2017 14:54:56 +0000 (10:54 -0400)]
Merge branch 'master' of https://github.com/qmk/qmk_firmware

6 years agomore than one en-file, and actually ignore docs
Jack Humbert [Mon, 29 May 2017 14:54:46 +0000 (10:54 -0400)]
more than one en-file, and actually ignore docs

6 years agoUpdate Differences-from-TMK.md
Damien [Mon, 29 May 2017 11:17:23 +0000 (13:17 +0200)]
Update Differences-from-TMK.md

Removed fn_actions.

According this [comment](https://github.com/qmk/qmk_firmware/pull/1336#issuecomment-304634633)

6 years agoAdafruit Feather BLE / BLE Friend mouse buttons support
Priyadi Iman Nurcahyo [Mon, 29 May 2017 11:17:21 +0000 (18:17 +0700)]
Adafruit Feather BLE / BLE Friend mouse buttons support

6 years agoMerge pull request #1338 from qmk/hf/prevent_stuck_mods
Erez Zukerman [Mon, 29 May 2017 00:14:36 +0000 (20:14 -0400)]
Merge pull request #1338 from qmk/hf/prevent_stuck_mods

Adds prevent stuck modifiers to EZ default

6 years agoAdds prevent stuck modifiers to EZ default
Erez Zukerman [Mon, 29 May 2017 00:05:37 +0000 (20:05 -0400)]
Adds prevent stuck modifiers to EZ default

6 years agoignore docs, fix tag/hex pushing
Jack Humbert [Sun, 28 May 2017 20:16:56 +0000 (16:16 -0400)]
ignore docs, fix tag/hex pushing

6 years agoUpdate windows 10 instructions
Fred Sundvik [Sun, 28 May 2017 19:35:45 +0000 (22:35 +0300)]
Update windows 10 instructions

6 years agoMerge pull request #1336 from Dbroqua/patch-2
Jack Humbert [Sun, 28 May 2017 18:47:57 +0000 (14:47 -0400)]
Merge pull request #1336 from Dbroqua/patch-2

Update Differences-from-TMK.md

6 years agoCreate a symlink to qmk if requested
Fred Sundvik [Sun, 28 May 2017 18:38:14 +0000 (21:38 +0300)]
Create a symlink to qmk if requested

6 years agoAdd activate_wsl to .bashrc
Fred Sundvik [Sun, 28 May 2017 18:28:18 +0000 (21:28 +0300)]
Add activate_wsl to .bashrc

6 years agoFix symlink creation
Fred Sundvik [Sun, 28 May 2017 17:49:42 +0000 (20:49 +0300)]
Fix symlink creation

6 years agoUse unzip instead of 7zip
Fred Sundvik [Sun, 28 May 2017 17:43:16 +0000 (20:43 +0300)]
Use unzip instead of 7zip

6 years agoActually install flip instead of just extracting
Fred Sundvik [Sun, 28 May 2017 17:36:27 +0000 (20:36 +0300)]
Actually install flip instead of just extracting

6 years agoMake symlink to utils and export programmer variables
Fred Sundvik [Sun, 28 May 2017 17:11:56 +0000 (20:11 +0300)]
Make symlink to utils and export programmer variables

6 years agoAdd install dependencies
Fred Sundvik [Sun, 28 May 2017 15:26:38 +0000 (18:26 +0300)]
Add install dependencies

6 years agoAdd prompt for re-downloading the utils
Fred Sundvik [Sun, 28 May 2017 11:49:58 +0000 (14:49 +0300)]
Add prompt for re-downloading the utils

6 years agoAdd driver installation
Fred Sundvik [Sun, 28 May 2017 11:42:02 +0000 (14:42 +0300)]
Add driver installation

6 years agoAdd checks for cloning to the right dir
Fred Sundvik [Sun, 28 May 2017 10:30:53 +0000 (13:30 +0300)]
Add checks for cloning to the right dir

6 years agoDownload windows flashing utils and driver_installer
Fred Sundvik [Sun, 28 May 2017 09:24:05 +0000 (12:24 +0300)]
Download windows flashing utils and driver_installer

6 years agoUpdate Differences-from-TMK.md
Damien [Sun, 28 May 2017 17:17:22 +0000 (19:17 +0200)]
Update Differences-from-TMK.md

Hello,

I'm not sure but it seems to be uint8_t for TMK/fn_actions (cf. https://github.com/tmk/tmk_keyboard/blob/master/README.md ).

Regards,
Damien

6 years agoMerge pull request #1334 from fredizzimo/fix_faq_lineending
Jack Humbert [Sun, 28 May 2017 16:12:47 +0000 (12:12 -0400)]
Merge pull request #1334 from fredizzimo/fix_faq_lineending

Fix line endings in FAQ.md

6 years agoFix line endings in FAQ.md
Fred Sundvik [Sun, 28 May 2017 09:28:02 +0000 (12:28 +0300)]
Fix line endings in FAQ.md

6 years agoUpdates book.json
Jack Humbert [Sat, 27 May 2017 22:24:53 +0000 (22:24 +0000)]
Updates book.json

Auto commit by GitBook Editor

6 years agoUpdates book.json
Jack Humbert [Sat, 27 May 2017 22:23:09 +0000 (22:23 +0000)]
Updates book.json

Auto commit by GitBook Editor