]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
9 years agoMerge pull request #541 from milestogo/master
Jack Humbert [Fri, 22 Jul 2016 01:05:06 +0000 (21:05 -0400)]
Merge pull request #541 from milestogo/master

initial kinisis advantage build

9 years agoMerge pull request #540 from replicaJunction/feature-atreus-keymapFunction
Jack Humbert [Fri, 22 Jul 2016 01:04:45 +0000 (21:04 -0400)]
Merge pull request #540 from replicaJunction/feature-atreus-keymapFunction

Adjusted Atreus KEYMAP() function.

9 years agoMerge pull request #538 from robertdale/preonic-map-correction
Jack Humbert [Fri, 22 Jul 2016 01:03:56 +0000 (21:03 -0400)]
Merge pull request #538 from robertdale/preonic-map-correction

Preonic: Corrected the ascii layout to match the coded layout

9 years agoMerge pull request #536 from pvinis/debug-doc
Jack Humbert [Fri, 22 Jul 2016 01:02:37 +0000 (21:02 -0400)]
Merge pull request #536 from pvinis/debug-doc

add some debugging doc, after i found out how to print debug messages

9 years agoMerge pull request #530 from sethbc/master
Jack Humbert [Fri, 22 Jul 2016 01:01:35 +0000 (21:01 -0400)]
Merge pull request #530 from sethbc/master

Misc. fixes from sethbc

9 years agoMerge pull request #529 from CommandLineDesign/CMD60-newKeymap
Jack Humbert [Fri, 22 Jul 2016 00:59:02 +0000 (20:59 -0400)]
Merge pull request #529 from CommandLineDesign/CMD60-newKeymap

Added CMD60 keymap

9 years agoMerge pull request #525 from edasque/master
Jack Humbert [Fri, 22 Jul 2016 00:58:39 +0000 (20:58 -0400)]
Merge pull request #525 from edasque/master

Added Docker as a simple way to build firmwares

9 years agoMerge pull request #522 from exiva/extrakey-macfix
Jack Humbert [Fri, 22 Jul 2016 00:57:54 +0000 (20:57 -0400)]
Merge pull request #522 from exiva/extrakey-macfix

Fix OS X Recognizing keyboard as Mouse/Tablet

9 years agoMerge pull request #521 from exiva/makefile-wait
Jack Humbert [Fri, 22 Jul 2016 00:57:32 +0000 (20:57 -0400)]
Merge pull request #521 from exiva/makefile-wait

Make DFU wait for bootloader

9 years agoMerge pull request #518 from jakllsch/upstream
Jack Humbert [Fri, 22 Jul 2016 00:56:54 +0000 (20:56 -0400)]
Merge pull request #518 from jakllsch/upstream

keymap_extras changes

9 years agoMerge pull request #516 from pvinis/tap-dance-anyway
Jack Humbert [Fri, 22 Jul 2016 00:56:24 +0000 (20:56 -0400)]
Merge pull request #516 from pvinis/tap-dance-anyway

Tap dance anyway

9 years agoFirst draft of the 'impossible' layout.
Stephen Christie [Thu, 21 Jul 2016 22:19:08 +0000 (18:19 -0400)]
First draft of the 'impossible' layout.

9 years agoMerge pull request #4 from Skrymir/macroUpdates
Joshua Colbeck [Thu, 21 Jul 2016 04:50:06 +0000 (23:50 -0500)]
Merge pull request #4 from Skrymir/macroUpdates

Macro updates

9 years agoAdded reset keys
Josh Colbeck [Thu, 21 Jul 2016 04:15:15 +0000 (23:15 -0500)]
Added reset keys

9 years agoadding traveller keyboard
milestogo [Thu, 21 Jul 2016 04:12:00 +0000 (21:12 -0700)]
adding traveller keyboard

9 years agoMerge pull request #3 from jackhumbert/master
Joshua Colbeck [Thu, 21 Jul 2016 02:56:44 +0000 (21:56 -0500)]
Merge pull request #3 from jackhumbert/master

pulling in remote changes

9 years agofixed include paths
Jason Janse van Rensburg [Wed, 20 Jul 2016 15:05:23 +0000 (17:05 +0200)]
fixed include paths

9 years agoreformat
Jason Janse van Rensburg [Wed, 20 Jul 2016 14:58:10 +0000 (16:58 +0200)]
reformat

9 years agoupdated bone2planck
Jason Janse van Rensburg [Wed, 20 Jul 2016 14:42:09 +0000 (16:42 +0200)]
updated bone2planck

9 years agoCreated readme and added screenshots
Joshua T [Wed, 20 Jul 2016 05:38:56 +0000 (00:38 -0500)]
Created readme and added screenshots

9 years agoinitial kinisis advantage build
milestogo [Wed, 20 Jul 2016 05:35:38 +0000 (22:35 -0700)]
initial kinisis advantage build

9 years agoAdjusted Atreus KEYMAP() function.
Joshua T [Tue, 19 Jul 2016 22:33:10 +0000 (17:33 -0500)]
Adjusted Atreus KEYMAP() function.

This change adjusts the KEYMAP() function to provide a more visual representation of the key positions on the keyboard. Previously, keymaps have been defined directly using arrays for the Atreus keyboard. While this works, it doesn't utilize the helpful KEYMAP() function at all to allow the user to visually position the key codes for ease of editing. See the Ergodox-EZ KEYMAP() function and layouts for a great example of how this can work.

This change should not break any existing Atreus layouts. At the time of this commit, there are two existing layouts for the Atreus board, and neither use the KEYMAP() function.

9 years agoModified Atreus layout to account for keymap() function
Joshua T [Tue, 19 Jul 2016 22:39:15 +0000 (17:39 -0500)]
Modified Atreus layout to account for keymap() function

9 years agoAdjusted Atreus KEYMAP() function.
Joshua T [Tue, 19 Jul 2016 22:33:10 +0000 (17:33 -0500)]
Adjusted Atreus KEYMAP() function.

This change adjusts the KEYMAP() function to provide a more visual representation of the key positions on the keyboard. Previously, keymaps have been defined directly using arrays for the Atreus keyboard. While this works, it doesn't utilize the helpful KEYMAP() function at all to allow the user to visually position the key codes for ease of editing. See the Ergodox-EZ KEYMAP() function and layouts for a great example of how this can work.

This change should not break any existing Atreus layouts. At the time of this commit, there are two existing layouts for the Atreus board, and neither use the KEYMAP() function.

9 years agoAdded Gaming layer and removed Dvorak
Joshua T [Tue, 19 Jul 2016 22:01:21 +0000 (17:01 -0500)]
Added Gaming layer and removed Dvorak

Also added tap/hold functions on central keys

9 years agoadd a couple of comments
Pavlos Vinieratos [Tue, 19 Jul 2016 16:02:13 +0000 (18:02 +0200)]
add a couple of comments

9 years agoon_each_tap_fn is called on tap down and tap up
Pavlos Vinieratos [Tue, 19 Jul 2016 16:00:59 +0000 (18:00 +0200)]
on_each_tap_fn is called on tap down and tap up

9 years agoadd link to hid_listen
Pavlos Vinieratos [Tue, 19 Jul 2016 15:34:23 +0000 (17:34 +0200)]
add link to hid_listen

9 years agoadded Midi On/Off; Enter is actually transparent
Robert Dale [Tue, 19 Jul 2016 12:43:41 +0000 (08:43 -0400)]
added Midi On/Off; Enter is actually transparent

9 years agoCorrected the ascii layout to match the coded layout
Robert Dale [Tue, 19 Jul 2016 12:00:03 +0000 (08:00 -0400)]
Corrected the ascii layout to match the coded layout

9 years agochanged ctrl back to enter. "j" interfered with my vimming
Toni [Tue, 19 Jul 2016 07:17:31 +0000 (09:17 +0200)]
changed ctrl back to enter. "j" interfered with my vimming

9 years agosmall cosmetic change
Toni [Tue, 19 Jul 2016 07:16:55 +0000 (09:16 +0200)]
small cosmetic change

9 years agoadd some debugging doc, after i found out how to print debug messages
Pavlos Vinieratos [Mon, 18 Jul 2016 22:07:50 +0000 (00:07 +0200)]
add some debugging doc, after i found out how to print debug messages

9 years agoadd a bit of documentation
Pavlos Vinieratos [Mon, 18 Jul 2016 22:01:11 +0000 (00:01 +0200)]
add a bit of documentation

9 years agoin the default case, it should be called if there is actually a tap
Pavlos Vinieratos [Mon, 18 Jul 2016 21:34:02 +0000 (23:34 +0200)]
in the default case, it should be called if there is actually a tap
dance happening, and in the normal case, it should be called when the
tap down is happening.

9 years agoNotes about changes
Christopher Browne [Mon, 18 Jul 2016 20:07:00 +0000 (16:07 -0400)]
Notes about changes

9 years agorenamed keymap
Toni [Mon, 18 Jul 2016 08:50:45 +0000 (10:50 +0200)]
renamed keymap

9 years agoreduced makefile size. not so much needed due to "inheritance"
Toni [Mon, 18 Jul 2016 08:50:19 +0000 (10:50 +0200)]
reduced makefile size. not so much needed due to "inheritance"

9 years agoergodox_ez: Update my keymap to v1.3
Gergely Nagy [Mon, 18 Jul 2016 06:46:04 +0000 (08:46 +0200)]
ergodox_ez: Update my keymap to v1.3

This updates my ErgoDox EZ layout to v1.3, which has the following
noteworthy changes:

* Added support for logging keys, by pressing `LEAD d`. Also included is
  a tool to generate a **heatmap** out of the logs.
* The arrow and navigation keys were rearranged again, and now require
  an additional key being held to activate. See the **base layer** for
  an image that shows where arrows are.
* The **experimental** layer has been redone, and is now
  called **ADORE**, and as such, can be enabled by `LEAD a` now.
* Switching between Dvorak and ADORE is now persisted into EEPROM, and
  survives a reboot.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
9 years agoUpdate readme.md
Will Wolff-Myren [Sun, 17 Jul 2016 22:08:04 +0000 (15:08 -0700)]
Update readme.md

* Markdown cleanup

9 years agoUpdate readme.md
Will Wolff-Myren [Sun, 17 Jul 2016 22:04:50 +0000 (15:04 -0700)]
Update readme.md

* Updated layout images, json from Keyboard Layout Designer
* Added links to Keyboard Layout Designer templates.
* Added images of TECK, Kinesis layouts.

9 years agoUpdate description comment.
Will Wolff-Myren [Sun, 17 Jul 2016 21:56:37 +0000 (14:56 -0700)]
Update description comment.

9 years ago[MEDIA]: Remove Power, Sleep, Mail, MyComp
Will Wolff-Myren [Sun, 17 Jul 2016 21:19:22 +0000 (14:19 -0700)]
[MEDIA]: Remove Power, Sleep, Mail, MyComp

I kept hitting these on accident while attempting to move the cursor or
mouse. =P

9 years ago[BASE]: Meh, Hyper now have symbols on both sides
Will Wolff-Myren [Sun, 17 Jul 2016 21:16:31 +0000 (14:16 -0700)]
[BASE]: Meh, Hyper now have symbols on both sides

Left: MEH_T(KC_BSLS),ALL_T(KC_SLSH)
Right: ALL_T(KC_LBRC),MEH_T(KC_RBRC)

9 years agonew modifier "J" is crtl
Toni [Sun, 17 Jul 2016 21:13:49 +0000 (23:13 +0200)]
new modifier "J" is crtl

9 years agoUpdate Base Layer comment to match new layout.
Will Wolff-Myren [Sun, 17 Jul 2016 21:08:22 +0000 (14:08 -0700)]
Update Base Layer comment to match new layout.

9 years ago[BASE]: KC_MINS -> KC_GRV
Will Wolff-Myren [Sun, 17 Jul 2016 21:07:14 +0000 (14:07 -0700)]
[BASE]: KC_MINS -> KC_GRV

9 years agoRSpec: KC_EQL -> KC_MINS
Will Wolff-Myren [Sun, 17 Jul 2016 21:01:41 +0000 (14:01 -0700)]
RSpec: KC_EQL -> KC_MINS

9 years agoLSpec: KC_GRV -> KC_EQL
Will Wolff-Myren [Sun, 17 Jul 2016 20:58:43 +0000 (13:58 -0700)]
LSpec: KC_GRV -> KC_EQL

9 years agoUpdate readme. My layout optimized for emacs & vim
Mazin Bokhari [Sun, 17 Jul 2016 20:57:23 +0000 (15:57 -0500)]
Update readme. My layout optimized for emacs & vim

9 years agoUpdate readme. My layout optimized for emacs & vim
Mazin Bokhari [Sun, 17 Jul 2016 20:53:42 +0000 (15:53 -0500)]
Update readme. My layout optimized for emacs & vim

9 years agoUpdate .gitignore to include VSCode setting.
Will Wolff-Myren [Sun, 17 Jul 2016 20:50:36 +0000 (13:50 -0700)]
Update .gitignore to include VSCode setting.

9 years agoMerge branch 'master' of https://github.com/mazinbokhari/qmk_firmware
Mazin Bokhari [Sun, 17 Jul 2016 20:35:05 +0000 (15:35 -0500)]
Merge branch 'master' of https://github.com/mazinbokhari/qmk_firmware

9 years agoAdd caps lock; sucks that there is no light for it...
Mazin Bokhari [Sun, 17 Jul 2016 20:32:53 +0000 (15:32 -0500)]
Add caps lock; sucks that there is no light for it...

9 years agoRemove more keys
Mazin Bokhari [Sun, 17 Jul 2016 19:56:32 +0000 (14:56 -0500)]
Remove more keys

9 years agoMove dot in symbol layer
Mazin Bokhari [Sun, 17 Jul 2016 19:44:37 +0000 (14:44 -0500)]
Move dot in symbol layer

9 years agoMove modifier kyes around
Mazin Bokhari [Sun, 17 Jul 2016 19:43:21 +0000 (14:43 -0500)]
Move modifier kyes around

9 years agoRemove more unnecessary buttons
Mazin Bokhari [Sun, 17 Jul 2016 19:29:37 +0000 (14:29 -0500)]
Remove more unnecessary buttons

9 years agoAdd page up/down and home/end to arrow
Mazin Bokhari [Sun, 17 Jul 2016 19:11:08 +0000 (14:11 -0500)]
Add page up/down and home/end to arrow

9 years agoChange visual
Mazin Bokhari [Sun, 17 Jul 2016 19:02:46 +0000 (14:02 -0500)]
Change visual

9 years agoReorganize media keys
Mazin Bokhari [Sun, 17 Jul 2016 18:55:10 +0000 (13:55 -0500)]
Reorganize media keys

9 years agoRemove unnecessary modifiers
Mazin Bokhari [Sun, 17 Jul 2016 18:35:47 +0000 (13:35 -0500)]
Remove unnecessary modifiers

9 years agoEdit visual keymap
Mazin Bokhari [Sun, 17 Jul 2016 18:19:11 +0000 (13:19 -0500)]
Edit visual keymap

9 years agoAdd arrow keys to layer
Mazin Bokhari [Sun, 17 Jul 2016 18:14:04 +0000 (13:14 -0500)]
Add arrow keys to layer

9 years agoMinor changes
Mazin Bokhari [Sun, 17 Jul 2016 18:09:54 +0000 (13:09 -0500)]
Minor changes

9 years agoAdd empty arrow layer, reorder some keys in media, map layer keys
Mazin Bokhari [Sun, 17 Jul 2016 18:02:54 +0000 (13:02 -0500)]
Add empty arrow layer, reorder some keys in media, map layer keys

9 years agodon't believe the hex files are posted to qmk.fm
Seth Chandler [Sun, 17 Jul 2016 14:37:45 +0000 (10:37 -0400)]
don't believe the hex files are posted to qmk.fm

9 years agohelper file for me to stay up-to-date with master
Toni [Sun, 17 Jul 2016 13:10:14 +0000 (15:10 +0200)]
helper file for me to stay up-to-date with master

9 years agochanges needed for a ISO satan PCB including a split right-shift key
Toni [Sun, 17 Jul 2016 12:57:56 +0000 (14:57 +0200)]
changes needed for a ISO satan PCB including a split right-shift key

9 years agoupdate more non-existent readmes for QMK.fm
Seth Chandler [Sun, 17 Jul 2016 07:53:34 +0000 (03:53 -0400)]
update more non-existent readmes for QMK.fm

9 years agoupdate broken link
Seth Chandler [Sun, 17 Jul 2016 07:38:53 +0000 (03:38 -0400)]
update broken link

9 years agoupdate audio links
Seth Chandler [Sun, 17 Jul 2016 07:32:02 +0000 (03:32 -0400)]
update audio links

9 years agoupdate tmk link
Seth Chandler [Sun, 17 Jul 2016 07:28:48 +0000 (03:28 -0400)]
update tmk link

9 years agoupdate link to Vagrant docfile
Seth Chandler [Sun, 17 Jul 2016 07:24:36 +0000 (03:24 -0400)]
update link to Vagrant docfile

9 years agoupdate readmes in certain directories to work with qmk.fm
Seth Chandler [Sun, 17 Jul 2016 07:24:00 +0000 (03:24 -0400)]
update readmes in certain directories to work with qmk.fm

9 years agochange naming, and remove extraneous definition
Pavlos Vinieratos [Fri, 15 Jul 2016 21:54:08 +0000 (23:54 +0200)]
change naming, and remove extraneous definition

9 years agoadd custom makefile for sethbc keymap
Seth Chandler [Sun, 17 Jul 2016 03:52:02 +0000 (23:52 -0400)]
add custom makefile for sethbc keymap

9 years agoupdate makefile to default to no virtual dip switches
Seth Chandler [Sun, 17 Jul 2016 03:51:27 +0000 (23:51 -0400)]
update makefile to default to no virtual dip switches

9 years agoupdate readme images
Seth Chandler [Sun, 17 Jul 2016 03:41:20 +0000 (23:41 -0400)]
update readme images

9 years agoFix erroneous character
Jonathan Lucas [Sun, 17 Jul 2016 03:38:55 +0000 (20:38 -0700)]
Fix erroneous character

Must have been keeb testing :)

9 years agoAdded CMD60 keymap
Jonathan Lucas [Sun, 17 Jul 2016 03:24:14 +0000 (20:24 -0700)]
Added CMD60 keymap

9 years agoMerge branch 'master' of https://github.com/replicaJunction/qmk_firmware
Joshua T [Fri, 15 Jul 2016 23:02:38 +0000 (18:02 -0500)]
Merge branch 'master' of https://github.com/replicaJunction/qmk_firmware

9 years agoAdded default layer switch QWERTY to Colemak
Joshua T [Fri, 15 Jul 2016 22:49:14 +0000 (17:49 -0500)]
Added default layer switch QWERTY to Colemak

9 years agoAdded default layer switch QWERTY to Colemak
Joshua T [Fri, 15 Jul 2016 22:49:14 +0000 (17:49 -0500)]
Added default layer switch QWERTY to Colemak

9 years agoFixed a merge conflict
Joshua T [Fri, 15 Jul 2016 22:44:39 +0000 (17:44 -0500)]
Fixed a merge conflict

9 years agoadd an `anyway` and a `reset` callback
Pavlos Vinieratos [Wed, 13 Jul 2016 14:47:45 +0000 (16:47 +0200)]
add an `anyway` and a `reset` callback

when using tap dance, we have the `regular` callback that is called on
the last tap. this commit adds an `anyway` callback that is called on
every tap, and a `reset` callback that is called on reset of the tap
dance taps.

9 years agoin case its NULL
Pavlos Vinieratos [Tue, 12 Jul 2016 22:20:28 +0000 (00:20 +0200)]
in case its NULL

9 years agoFurther simplyfying the docker usage
Erik Dasque [Fri, 15 Jul 2016 17:26:34 +0000 (13:26 -0400)]
Further simplyfying the docker usage

We'll be able to change the image user name if we set up the initial repo to trigger Docker images rebuilds on hub.docker.com

9 years agoAdding Docker build system & documentation
Erik Dasque [Fri, 15 Jul 2016 16:55:40 +0000 (12:55 -0400)]
Adding Docker build system & documentation

9 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Fri, 15 Jul 2016 15:19:52 +0000 (11:19 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

9 years agoFix OS X Recognizing keyboard as Mouse/Tablet
Travis La Marr [Fri, 15 Jul 2016 14:41:32 +0000 (10:41 -0400)]
Fix OS X Recognizing keyboard as Mouse/Tablet

Modified the LUFA USB HID Descriptor to change the logical/usage
minimums for System Control from 0x01 (Mouse) to 0x81 (System Power
Down), this fixes OS X recognizing the Planck as having a mouse and
tablet, even with mousekeys off.

9 years agoMake DFU wait for bootloader
Travis La Marr [Fri, 15 Jul 2016 14:28:23 +0000 (10:28 -0400)]
Make DFU wait for bootloader

Added a loop for waiting for the keyboard to be put in bootloader mode,
rather than failing out. Makes building keymaps easier.

9 years agoMerge remote-tracking branch 'upstream/master'
Joshua T [Fri, 15 Jul 2016 06:01:19 +0000 (01:01 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agokeymap_dvorak.h: add missing shifted keys, fix whitespace
Jonathan A. Kollasch [Thu, 14 Jul 2016 16:32:43 +0000 (11:32 -0500)]
keymap_dvorak.h: add missing shifted keys, fix whitespace

9 years agoextra_keymaps: use RALT() instead of 0x1400 for AltGr
Jonathan A. Kollasch [Thu, 14 Jul 2016 16:13:35 +0000 (11:13 -0500)]
extra_keymaps: use RALT() instead of 0x1400 for AltGr

9 years agokeymap_extras: add newline at end of files
Jonathan A. Kollasch [Thu, 14 Jul 2016 16:04:25 +0000 (11:04 -0500)]
keymap_extras: add newline at end of files

9 years agoMerge pull request #489 from Skrymir/master
Jack Humbert [Thu, 14 Jul 2016 14:59:23 +0000 (10:59 -0400)]
Merge pull request #489 from Skrymir/master

New ergodox-ez layout

9 years agoMerge pull request #515 from pvinis/reset-function
Jack Humbert [Thu, 14 Jul 2016 14:53:51 +0000 (10:53 -0400)]
Merge pull request #515 from pvinis/reset-function

extract reset keyboard into a function

9 years agoReplaced ordinary-media.{png|json} with new media layout
Will Wolff-Myren [Thu, 14 Jul 2016 08:22:15 +0000 (01:22 -0700)]
Replaced ordinary-media.{png|json} with new media layout

9 years agoReplaced ordinary-symbol.{png|json} with new base layout.
Will Wolff-Myren [Thu, 14 Jul 2016 08:03:45 +0000 (01:03 -0700)]
Replaced ordinary-symbol.{png|json} with new base layout.