]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
8 years agoFix slight inconsistency
Fred Sundvik [Wed, 24 Aug 2016 07:29:01 +0000 (10:29 +0300)]
Fix slight inconsistency

When running make from either a keyboard folder or a subproject
it runs all keymaps for all subprojects and the selected subproject
respectively. Without this fix, the same doesn't happen if your
run make clean for example. As it would just provide you with an
error message. Now this will work as expected.

8 years agoSplit kitten_paw into Makefile/rules.mk
Fred Sundvik [Tue, 23 Aug 2016 06:42:11 +0000 (09:42 +0300)]
Split kitten_paw into Makefile/rules.mk

8 years agoMerge branch 'master' into makefile_overhaul
Fred Sundvik [Tue, 23 Aug 2016 06:38:05 +0000 (09:38 +0300)]
Merge branch 'master' into makefile_overhaul

8 years agoMerge pull request #671 from Talljoe/one-hand
Jack Humbert [Tue, 23 Aug 2016 04:29:46 +0000 (00:29 -0400)]
Merge pull request #671 from Talljoe/one-hand

Add native one-handed support

8 years agoMerge pull request #673 from coderkun/master
Jack Humbert [Tue, 23 Aug 2016 04:28:01 +0000 (00:28 -0400)]
Merge pull request #673 from coderkun/master

Add method to set Unicode input key for ISO 14755

8 years agoMerge pull request #675 from Xyverz/master
Jack Humbert [Tue, 23 Aug 2016 04:27:23 +0000 (00:27 -0400)]
Merge pull request #675 from Xyverz/master

Added missing item K3A to KEYMAP() variable in tv44.h

8 years agoMerge pull request #676 from ickerwx/kitten_paw
Jack Humbert [Tue, 23 Aug 2016 04:26:59 +0000 (00:26 -0400)]
Merge pull request #676 from ickerwx/kitten_paw

Added support for the Kitten Paw controller

8 years agoAdded support for the Kitten Paw controller
René Werner [Mon, 22 Aug 2016 18:34:29 +0000 (20:34 +0200)]
Added support for the Kitten Paw controller

This adds support for the 2016 revision of the Kitten Paw [1] replacement
controller by Bathroom Epiphanies.

[1] http://bathroomepiphanies.com/controllers/

8 years agoMerge remote-tracking branch 'upstream/master'
Xyverz [Mon, 22 Aug 2016 02:02:32 +0000 (19:02 -0700)]
Merge remote-tracking branch 'upstream/master'

8 years agoAdded missing key K3A to KEYMAP() macro in tv44.h
Xyverz [Mon, 22 Aug 2016 01:59:10 +0000 (18:59 -0700)]
Added missing key K3A to KEYMAP() macro in tv44.h

8 years agoMerge pull request #669 from fredizzimo/windows10_build_instructions
Jack Humbert [Sun, 21 Aug 2016 23:13:19 +0000 (19:13 -0400)]
Merge pull request #669 from fredizzimo/windows10_build_instructions

Add instructions for Windows 10 subsystem for Linux

8 years agoMerge pull request #668 from fredizzimo/line_endings
Jack Humbert [Sun, 21 Aug 2016 23:13:06 +0000 (19:13 -0400)]
Merge pull request #668 from fredizzimo/line_endings

Enforce correct line endings

8 years agoMerge pull request #674 from kyleberry/master
Jack Humbert [Sun, 21 Aug 2016 23:09:26 +0000 (19:09 -0400)]
Merge pull request #674 from kyleberry/master

Fixing Dvorak

8 years agoFixing Dvorak
Kyle Berry [Sun, 21 Aug 2016 21:01:43 +0000 (14:01 -0700)]
Fixing Dvorak

Updating with proper Dvorak layout.

8 years agoDrop method to set Unicode input key and declare start and finish methods as “weak...
coderkun [Sun, 21 Aug 2016 19:02:18 +0000 (21:02 +0200)]
Drop method to set Unicode input key and declare start and finish methods as “weak” instead

8 years agoAdd method to set Unicode input key for ISO 14755
coderkun [Sun, 21 Aug 2016 18:25:19 +0000 (20:25 +0200)]
Add method to set Unicode input key for ISO 14755

https://github.com/jackhumbert/qmk_firmware/issues/672

8 years agoChange order of variable assignment
Fred Sundvik [Sun, 21 Aug 2016 10:53:36 +0000 (13:53 +0300)]
Change order of variable assignment

BUILD_DIR and TARGET was assigned too late, so the dfu-util target,
which depends on them did not work.

8 years agoAdd longest match to the rule-checking
Fred Sundvik [Sun, 21 Aug 2016 10:10:34 +0000 (13:10 +0300)]
Add longest match to the rule-checking

This fixes cases where you have several keyboards with a common
prefix, like algernon, and algernon-master

8 years agoAdd one-hand key to planck/experimental keymap.
Joe Wasson [Sun, 21 Aug 2016 01:32:13 +0000 (18:32 -0700)]
Add one-hand key to planck/experimental keymap.

8 years agoAdd default swap configs for a couple of boards.
Joe Wasson [Thu, 28 Jul 2016 08:25:29 +0000 (01:25 -0700)]
Add default swap configs for a couple of boards.

8 years agoImprove one-hand support by adding more actions and tap keys.
Joe Wasson [Thu, 28 Jul 2016 08:24:06 +0000 (01:24 -0700)]
Improve one-hand support by adding more actions and tap keys.

8 years agoAdd one-hand support.
Joe Wasson [Wed, 27 Jul 2016 15:43:02 +0000 (08:43 -0700)]
Add one-hand support.

This adds an action, `ACTION_SWAP_HANDS`, that swaps the the keys on the keyboard across a keymap-defined hemisphere in order to support one-hand typing without requiring a separate one-handed layer. See updated `doc/keymap.md` for more information.

8 years agoAdd warning about line endings
Fred Sundvik [Sat, 20 Aug 2016 16:11:22 +0000 (19:11 +0300)]
Add warning about line endings

8 years agoAdd instructions for Windows 10 subsystem for Linux
Fred Sundvik [Sat, 20 Aug 2016 15:59:01 +0000 (18:59 +0300)]
Add instructions for Windows 10 subsystem for Linux

Also simplify the linux instructions

8 years agoMerge pull request #665 from linsomniac/keymap_jafo
Jack Humbert [Sat, 20 Aug 2016 15:04:54 +0000 (11:04 -0400)]
Merge pull request #665 from linsomniac/keymap_jafo

Adding jafo layout.

8 years agoMerge pull request #658 from Xyverz/master
Jack Humbert [Sat, 20 Aug 2016 15:04:02 +0000 (11:04 -0400)]
Merge pull request #658 from Xyverz/master

Got rid of all the kludge in my ErgoDox keymap.

8 years agoMerge pull request #630 from nrrkeene/master
Jack Humbert [Sat, 20 Aug 2016 15:01:22 +0000 (11:01 -0400)]
Merge pull request #630 from nrrkeene/master

The Ordinary Layout is the unsurprising layout

8 years agoNormalize line endings
Fred Sundvik [Sat, 20 Aug 2016 14:59:18 +0000 (17:59 +0300)]
Normalize line endings

8 years agoAdd .gitattributes to ensure correct line endings
Fred Sundvik [Sat, 20 Aug 2016 14:21:28 +0000 (17:21 +0300)]
Add .gitattributes to ensure correct line endings

It also ensures that make files and shell script are checked out
with lf endings, for compability with the Windows 10 bash

8 years agoComment the Makefile
Fred Sundvik [Sat, 20 Aug 2016 11:53:29 +0000 (14:53 +0300)]
Comment the Makefile

Also move some messages to message.mk

8 years agoFix the clean target
Fred Sundvik [Sat, 20 Aug 2016 09:44:04 +0000 (12:44 +0300)]
Fix the clean target

It now properly cleans all the outputs

8 years agoMerge remote-tracking branch 'upstream/master'
Xyverz [Sat, 20 Aug 2016 05:50:55 +0000 (22:50 -0700)]
Merge remote-tracking branch 'upstream/master'

8 years agoChanged the Ergodox keymap to use the KEYMAP() macro, updated readme.md.
Xyverz [Sat, 20 Aug 2016 05:45:20 +0000 (22:45 -0700)]
Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.

8 years agoChanged my keymap to match normal keymaps.
Xyverz [Sat, 20 Aug 2016 05:30:34 +0000 (22:30 -0700)]
Changed my keymap to match normal keymaps.

8 years agoThe Ordinary Layout is boring because all the keys are where you expect them to be
Nicholas Keene [Sat, 20 Aug 2016 04:44:08 +0000 (23:44 -0500)]
The Ordinary Layout is boring because all the keys are where you expect them to be

8 years agoThe Ordinary Layout is boring because all the keys are where you expect them to be
Nicholas Keene [Sat, 20 Aug 2016 04:38:13 +0000 (23:38 -0500)]
The Ordinary Layout is boring because all the keys are where you expect them to be

8 years agoBringing over changes from default map.
Sean Reifschneider [Sat, 20 Aug 2016 02:55:50 +0000 (20:55 -0600)]
Bringing over changes from default map.

8 years agoUpdate keyboard readme files with new makefile instructions
Fred Sundvik [Sat, 20 Aug 2016 00:22:16 +0000 (03:22 +0300)]
Update keyboard readme files with new makefile instructions

8 years agoUpdate readme with new instructions for make
Fred Sundvik [Fri, 19 Aug 2016 23:42:38 +0000 (02:42 +0300)]
Update readme with new instructions for make

8 years agoAdd diffutils to travis.yml and install_dependencies
Fred Sundvik [Fri, 19 Aug 2016 06:37:39 +0000 (09:37 +0300)]
Add diffutils to travis.yml and install_dependencies

It has been required for a while now, and now actually checked in
the makefiles. Before, if you didn't have it installed it would
just recompile everything.

The readme hasn't been updated to reflect this, I think we need
to go through that separately, and see what's really needed. Or
just instruct people to run the batch scripts.

8 years agoFix the template for the Makefile/rules.mk split
Fred Sundvik [Fri, 19 Aug 2016 06:06:28 +0000 (09:06 +0300)]
Fix the template for the Makefile/rules.mk split

8 years agoBetter format for non-silent output
Fred Sundvik [Tue, 16 Aug 2016 05:57:10 +0000 (08:57 +0300)]
Better format for non-silent output

8 years agoContinue on error
Fred Sundvik [Tue, 16 Aug 2016 05:42:08 +0000 (08:42 +0300)]
Continue on error

8 years agoMove bootloader_defs include to build_keyboard
Fred Sundvik [Mon, 15 Aug 2016 06:07:32 +0000 (09:07 +0300)]
Move bootloader_defs include to build_keyboard

Also fix it for subprojects

8 years agoAdd output specific config file
Fred Sundvik [Mon, 15 Aug 2016 05:58:05 +0000 (08:58 +0300)]
Add output specific config file

8 years agoOutput specific include paths
Fred Sundvik [Mon, 15 Aug 2016 05:45:36 +0000 (08:45 +0300)]
Output specific include paths

8 years agoMore general system for generating several outputs
Fred Sundvik [Mon, 15 Aug 2016 05:20:16 +0000 (08:20 +0300)]
More general system for generating several outputs

8 years agoPass the target to submake
Fred Sundvik [Sun, 14 Aug 2016 09:25:23 +0000 (12:25 +0300)]
Pass the target to submake

8 years agoFix variable name clash with builtin
Fred Sundvik [Thu, 11 Aug 2016 06:34:23 +0000 (09:34 +0300)]
Fix variable name clash with builtin

This caused the submake to be called several times, messing up the
build.

8 years agoOptions for silent compilation
Fred Sundvik [Tue, 9 Aug 2016 06:52:01 +0000 (09:52 +0300)]
Options for silent compilation

A single keyboard is always by default compiled in verbose mode.
While multiple keyboards are compiled in silent mode. This can be
overriden by the silent variable from the command line

8 years agoDon't run builtin rules for submake
Fred Sundvik [Tue, 9 Aug 2016 05:31:04 +0000 (08:31 +0300)]
Don't run builtin rules for submake

To speed up the compilation

8 years agoFix running make in parallel
Fred Sundvik [Tue, 9 Aug 2016 05:30:21 +0000 (08:30 +0300)]
Fix running make in parallel

8 years agoDon't add VERSION as a define
Fred Sundvik [Mon, 8 Aug 2016 08:27:15 +0000 (11:27 +0300)]
Don't add VERSION as a define

To avoid full recompilation when the git commit hash changes.

8 years agoMove git submodule check and version generation to main Makefile
Fred Sundvik [Mon, 8 Aug 2016 08:19:29 +0000 (11:19 +0300)]
Move git submodule check and version generation to main Makefile

8 years agoRemove unneded code from tmk_core/rules.mk
Fred Sundvik [Mon, 8 Aug 2016 08:06:47 +0000 (11:06 +0300)]
Remove unneded code from tmk_core/rules.mk

8 years agoActual compilation
Fred Sundvik [Mon, 8 Aug 2016 07:26:23 +0000 (10:26 +0300)]
Actual compilation

8 years agoAdd color output
Fred Sundvik [Sun, 7 Aug 2016 22:16:06 +0000 (01:16 +0300)]
Add color output

8 years agoFix running make from various subfolders
Fred Sundvik [Sun, 7 Aug 2016 18:28:14 +0000 (21:28 +0300)]
Fix running make from various subfolders

8 years agoFixed the shortcut targets
Fred Sundvik [Sun, 7 Aug 2016 16:22:21 +0000 (19:22 +0300)]
Fixed the shortcut targets

8 years agoProper default goals when inside keyboard fodlers
Fred Sundvik [Sun, 7 Aug 2016 16:16:44 +0000 (19:16 +0300)]
Proper default goals when inside keyboard fodlers

8 years agoAdd backwards compability with makefile variables
Fred Sundvik [Sun, 7 Aug 2016 15:54:12 +0000 (18:54 +0300)]
Add backwards compability with makefile variables

8 years agoProper handling for running make from a subproject or keymap dir
Fred Sundvik [Sun, 7 Aug 2016 15:44:57 +0000 (18:44 +0300)]
Proper handling for running make from a subproject or keymap dir

8 years agoSplit subproject make files into Makefile and rules.mk
Fred Sundvik [Sun, 7 Aug 2016 15:38:03 +0000 (18:38 +0300)]
Split subproject make files into Makefile and rules.mk

8 years agoSupport for running from keyboard directory
Fred Sundvik [Sun, 7 Aug 2016 15:30:58 +0000 (18:30 +0300)]
Support for running from keyboard directory

8 years agoPrint error when building non-existing keyboard
Fred Sundvik [Sun, 7 Aug 2016 15:15:45 +0000 (18:15 +0300)]
Print error when building non-existing keyboard

8 years agoPrint error message when trying to build non-existing keymap
Fred Sundvik [Sun, 7 Aug 2016 15:12:45 +0000 (18:12 +0300)]
Print error message when trying to build non-existing keymap

8 years agoProper parsing of keymaps inside subprojects
Fred Sundvik [Sun, 7 Aug 2016 14:48:59 +0000 (17:48 +0300)]
Proper parsing of keymaps inside subprojects

8 years agoSplit keyboard makefiles into rules and Makefile
Fred Sundvik [Sun, 7 Aug 2016 14:04:39 +0000 (17:04 +0300)]
Split keyboard makefiles into rules and Makefile

8 years agoAdd default subproject parsing
Fred Sundvik [Sun, 7 Aug 2016 13:45:33 +0000 (16:45 +0300)]
Add default subproject parsing

8 years agoSlight rearrange of the Makefile for easier readability
Fred Sundvik [Sun, 7 Aug 2016 13:02:14 +0000 (16:02 +0300)]
Slight rearrange of the Makefile for easier readability

8 years agoSlight refactoring to remove some verbosity
Fred Sundvik [Sun, 7 Aug 2016 12:56:41 +0000 (15:56 +0300)]
Slight refactoring to remove some verbosity

8 years agoSubproject parsing
Fred Sundvik [Sun, 7 Aug 2016 11:33:49 +0000 (14:33 +0300)]
Subproject parsing

Does not handle keyboards without subprojects correctly yet.

8 years agoProper looping for allkb and allkm
Fred Sundvik [Thu, 4 Aug 2016 06:56:03 +0000 (09:56 +0300)]
Proper looping for allkb and allkm

8 years agoRefactor common rule list parsing into own function
Fred Sundvik [Thu, 4 Aug 2016 06:17:02 +0000 (09:17 +0300)]
Refactor common rule list parsing into own function

8 years agoAdd keymap parsing
Fred Sundvik [Thu, 4 Aug 2016 05:49:44 +0000 (08:49 +0300)]
Add keymap parsing

8 years agoRule parsing to match kebyoards
Fred Sundvik [Wed, 3 Aug 2016 06:28:47 +0000 (09:28 +0300)]
Rule parsing to match kebyoards

8 years agoFirst version of rule parsing
Fred Sundvik [Wed, 3 Aug 2016 05:44:11 +0000 (08:44 +0300)]
First version of rule parsing

Only handles allkb at the moment.

8 years agoParsing of makefile variables from starting dir
Fred Sundvik [Mon, 1 Aug 2016 06:23:37 +0000 (09:23 +0300)]
Parsing of makefile variables from starting dir

8 years agoMerge pull request #662 from toneman77/iso_satan
Jack Humbert [Fri, 19 Aug 2016 21:55:54 +0000 (17:55 -0400)]
Merge pull request #662 from toneman77/iso_satan

Satan Cleanup

8 years agoMerge pull request #663 from tomb0y/kc60_workman_dead
Jack Humbert [Fri, 19 Aug 2016 21:54:12 +0000 (17:54 -0400)]
Merge pull request #663 from tomb0y/kc60_workman_dead

Add the workman-dead layout for kc60

8 years agoAdding jafo layout.
Sean Reifschneider [Fri, 19 Aug 2016 20:42:41 +0000 (14:42 -0600)]
Adding jafo layout.

8 years agoAdd the workman-dead layout for kc60
zs [Fri, 19 Aug 2016 19:59:08 +0000 (21:59 +0200)]
Add the workman-dead layout for kc60

8 years agoMerge pull request #660 from toneman77/amj60
Jack Humbert [Fri, 19 Aug 2016 15:19:52 +0000 (11:19 -0400)]
Merge pull request #660 from toneman77/amj60

new keyboard: AMJ60

8 years agoforgot media keys
Toni [Fri, 19 Aug 2016 08:24:48 +0000 (10:24 +0200)]
forgot media keys

8 years agoMerge remote-tracking branch 'origin/master' into amj60
Toni [Fri, 19 Aug 2016 07:49:56 +0000 (09:49 +0200)]
Merge remote-tracking branch 'origin/master' into amj60
merge with upstream

8 years agoAdded compatibility for the Infinity ErgoDox to my Ergodox keymap.
Xyverz [Fri, 19 Aug 2016 05:43:31 +0000 (22:43 -0700)]
Added compatibility for the Infinity ErgoDox to my Ergodox keymap.
Updated readme.md to reflect this change.

8 years agoMerge pull request #655 from Dbroqua/patch-1
Jack Humbert [Thu, 18 Aug 2016 23:25:36 +0000 (19:25 -0400)]
Merge pull request #655 from Dbroqua/patch-1

Added dbroqua layout for planck keyboard

8 years agoMerge pull request #656 from Vifon/dynamic_macros
Jack Humbert [Thu, 18 Aug 2016 23:23:53 +0000 (19:23 -0400)]
Merge pull request #656 from Vifon/dynamic_macros

Improve the dynamic macro documentation

8 years agoImprove the dynamic macro documentation
Wojciech Siewierski [Thu, 18 Aug 2016 22:17:57 +0000 (00:17 +0200)]
Improve the dynamic macro documentation

8 years agoAdded dbroqua layout for planck keyboard
Damien [Thu, 18 Aug 2016 20:25:13 +0000 (22:25 +0200)]
Added dbroqua layout for planck keyboard

8 years agoMerge pull request #652 from iFreilicht/master
Jack Humbert [Thu, 18 Aug 2016 14:34:22 +0000 (10:34 -0400)]
Merge pull request #652 from iFreilicht/master

Added S60-X keyboard

8 years agoMerge pull request #651 from algernon/f/register16
Jack Humbert [Thu, 18 Aug 2016 14:32:16 +0000 (10:32 -0400)]
Merge pull request #651 from algernon/f/register16

Add a register/unregister_code16 pair of functions

8 years agoMerge pull request #650 from Xyverz/master
Jack Humbert [Thu, 18 Aug 2016 14:31:17 +0000 (10:31 -0400)]
Merge pull request #650 from Xyverz/master

Minor changes to keymaps and other files

8 years agoMerge pull request #654 from algernon/h/planck-circuit-tap-dance-fix
Jack Humbert [Thu, 18 Aug 2016 14:04:02 +0000 (10:04 -0400)]
Merge pull request #654 from algernon/h/planck-circuit-tap-dance-fix

planck/circuit: Update after the latest tap-dance change

8 years agomade a correct default KEYMAP. moved the old one to KEYMAP_ANSI
Toni [Thu, 18 Aug 2016 13:57:17 +0000 (15:57 +0200)]
made a correct default KEYMAP. moved the old one to KEYMAP_ANSI
fixed all layouts that were referencing KEYMAP to KEYMAP_ANSI
whitespace prettyfying

8 years agosmyll typo fixed
Toni [Thu, 18 Aug 2016 13:32:06 +0000 (15:32 +0200)]
smyll typo fixed

8 years agoamj60 variant of the readme
Toni [Thu, 18 Aug 2016 13:30:52 +0000 (15:30 +0200)]
amj60 variant of the readme

8 years agofirst attempt at documentation for the amj60 board
Toni [Thu, 18 Aug 2016 13:22:34 +0000 (15:22 +0200)]
first attempt at documentation for the amj60 board

8 years agoplanck/circuit: Update after the latest tap-dance change
Gergely Nagy [Thu, 18 Aug 2016 11:20:25 +0000 (13:20 +0200)]
planck/circuit: Update after the latest tap-dance change

Fixes #653.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years agouniform whitespace
Toni [Thu, 18 Aug 2016 11:10:02 +0000 (13:10 +0200)]
uniform whitespace