]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agoChanges based on @fredizzimo review, flashing Infinity details
Sean Reifschneider [Wed, 24 Aug 2016 15:26:41 +0000 (09:26 -0600)]
Changes based on @fredizzimo review, flashing Infinity details

7 years agoMerge pull request #679 from algernon/h/ucis/subproject-fix
Jack Humbert [Wed, 24 Aug 2016 15:21:17 +0000 (11:21 -0400)]
Merge pull request #679 from algernon/h/ucis/subproject-fix

quantum: Move qk_ucis_state to process_unicode.c

7 years agoMerge pull request #646 from nclundsten/master
Jack Humbert [Wed, 24 Aug 2016 15:14:21 +0000 (11:14 -0400)]
Merge pull request #646 from nclundsten/master

fix ergodox ez link

7 years agoquantum: Move qk_ucis_state to process_unicode.c
Gergely Nagy [Wed, 24 Aug 2016 13:39:23 +0000 (15:39 +0200)]
quantum: Move qk_ucis_state to process_unicode.c

In order to not declare the same variable in multiple objects (which
happens when building UCIS-enabled keymap for both the ErgoDox EZ and
the ErgoDox Infinity), move the declaration to the .c file, and keep
only an extern reference in the header.

Many thanks to @fredizzimo for spotting the error in Travis, and
suggesting the fix.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years ago- Updated readme by adding link on kle for each layer
dbroqua [Wed, 24 Aug 2016 10:57:32 +0000 (12:57 +0200)]
- Updated readme by adding link on kle for each layer

7 years agoMerge remote-tracking branch 'upstream/master' into makefile_overhaul
Fred Sundvik [Wed, 24 Aug 2016 07:37:02 +0000 (10:37 +0300)]
Merge remote-tracking branch 'upstream/master' into makefile_overhaul

7 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.

7 years agoNightly
IBNobody [Wed, 24 Aug 2016 04:05:35 +0000 (23:05 -0500)]
Nightly

Prep for Vision build

7 years agoMerge remote-tracking branch 'refs/remotes/origin/master' into vision_division_dev
IBNobody [Wed, 24 Aug 2016 01:53:21 +0000 (20:53 -0500)]
Merge remote-tracking branch 'refs/remotes/origin/master' into vision_division_dev

7 years agoMerge remote-tracking branch 'refs/remotes/jackhumbert/master'
IBNobody [Wed, 24 Aug 2016 01:52:19 +0000 (20:52 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

7 years agoFixed line ending
IBNobody [Wed, 24 Aug 2016 01:47:35 +0000 (20:47 -0500)]
Fixed line ending

7 years agoMerge remote-tracking branch 'refs/remotes/jackhumbert/master'
IBNobody [Wed, 24 Aug 2016 01:45:06 +0000 (20:45 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

7 years agoMerge remote-tracking branch 'upstream/master'
dbroqua [Tue, 23 Aug 2016 18:39:01 +0000 (20:39 +0200)]
Merge remote-tracking branch 'upstream/master'

7 years agoMerge pull request #677 from SmackleFunky/master
Jack Humbert [Tue, 23 Aug 2016 15:05:26 +0000 (11:05 -0400)]
Merge pull request #677 from SmackleFunky/master

Virtual Serial Port - and a Layout that uses that virtual serial port for Plover

7 years agoMerge remote-tracking branch 'upstream/master'
dbroqua [Tue, 23 Aug 2016 11:39:49 +0000 (13:39 +0200)]
Merge remote-tracking branch 'upstream/master'

# Conflicts:
# keyboards/planck/keymaps/dbroqua/keymap.c

7 years agoadded my personal keymap
René Werner [Tue, 23 Aug 2016 11:20:59 +0000 (13:20 +0200)]
added my personal keymap

I ported my keymap from tmk to QMK.

7 years agoMerge branch 'kitten_paw'
René Werner [Tue, 23 Aug 2016 10:17:39 +0000 (12:17 +0200)]
Merge branch 'kitten_paw'

7 years agoFixed wrong keycode in default keymap
René Werner [Tue, 23 Aug 2016 10:15:29 +0000 (12:15 +0200)]
Fixed wrong keycode in default keymap

Where I used KC_MENU I should have used KC_APP instead.

7 years agomove to ergodox-ez only
Jason Green [Tue, 23 Aug 2016 07:02:44 +0000 (07:02 +0000)]
move to ergodox-ez only

7 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

7 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

7 years agoRemove unneeded include
Jason Green [Tue, 23 Aug 2016 04:49:05 +0000 (04:49 +0000)]
Remove unneeded include

7 years agoadd missing #include
Jason Green [Tue, 23 Aug 2016 04:32:40 +0000 (04:32 +0000)]
add missing #include

7 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

7 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

7 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

7 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

7 years agoTxBolt (Steno) Serial protocol for Ergodox Ez
Jason Green [Mon, 1 Aug 2016 18:28:21 +0000 (18:28 +0000)]
TxBolt (Steno) Serial protocol for Ergodox Ez

7 years agoAdded USB Virtual Serial support
Jason Green [Mon, 1 Aug 2016 05:02:52 +0000 (05:02 +0000)]
Added USB Virtual Serial support

7 years ago- Added PrintScreen key on multimedia layer
dbroqua [Mon, 22 Aug 2016 19:19:03 +0000 (21:19 +0200)]
- Added PrintScreen key on multimedia layer

7 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/

7 years agoChanges from review by @fredizzimo and @Xyverz
Sean Reifschneider [Mon, 22 Aug 2016 16:26:18 +0000 (10:26 -0600)]
Changes from review by @fredizzimo and @Xyverz

7 years agoNightly
IBNobody [Mon, 22 Aug 2016 03:05:55 +0000 (22:05 -0500)]
Nightly

Only major change to qmk was the addition of A0-A7 pins for the AT90USB

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

7 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

7 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

7 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

7 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

7 years ago- Inverted key Tab and Esc
dbroqua [Sun, 21 Aug 2016 21:20:24 +0000 (23:20 +0200)]
- Inverted key Tab and Esc
- Reorganised bottom row

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

Updating with proper Dvorak layout.

7 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

7 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

7 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.

7 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

7 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.

7 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.

7 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.

7 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.

7 years agoIn Progress Merge
IBNobody [Sat, 20 Aug 2016 19:49:16 +0000 (14:49 -0500)]
In Progress Merge

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

7 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

7 years agoInitial Commmit
IBNobody [Sat, 20 Aug 2016 15:26:36 +0000 (10:26 -0500)]
Initial Commmit

7 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.

7 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.

7 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

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

7 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

7 years agoMerge
IBNobody [Sat, 20 Aug 2016 13:34:42 +0000 (08:34 -0500)]
Merge

7 years agoMerge
IBNobody [Sat, 20 Aug 2016 13:31:24 +0000 (08:31 -0500)]
Merge

7 years agofixed color detection routine in makefile
IBNobody [Sat, 11 Jun 2016 22:24:28 +0000 (17:24 -0500)]
fixed color detection routine in makefile

7 years agofixed color detection routine in makefile
IBNobody [Sat, 11 Jun 2016 22:24:28 +0000 (17:24 -0500)]
fixed color detection routine in makefile

7 years agoMerge
IBNobody [Sat, 20 Aug 2016 13:16:06 +0000 (08:16 -0500)]
Merge

7 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

7 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

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

7 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.

7 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.

7 years agofixed color detection routine in makefile
IBNobody [Sat, 11 Jun 2016 22:24:28 +0000 (17:24 -0500)]
fixed color detection routine in makefile

7 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

7 years agoMerge https://github.com/IBNobody/qmk_firmware
IBNobody [Sat, 20 Aug 2016 04:39:35 +0000 (23:39 -0500)]
Merge https://github.com/IBNobody/qmk_firmware

7 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

7 years agofixed color detection routine in makefile
IBNobody [Sat, 11 Jun 2016 22:24:28 +0000 (17:24 -0500)]
fixed color detection routine in makefile

7 years agoTweaks after review.
Sean Reifschneider [Sat, 20 Aug 2016 03:50:04 +0000 (21:50 -0600)]
Tweaks after review.

7 years agoRestructuring of the ergodox README.
Sean Reifschneider [Sat, 20 Aug 2016 03:47:00 +0000 (21:47 -0600)]
Restructuring of the ergodox README.

7 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.

7 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

7 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

7 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.

7 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

7 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

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

7 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

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

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

7 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

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

7 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.

7 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

7 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

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

7 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.

7 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

7 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

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

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

7 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

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

7 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

7 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

7 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