]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agoMore common settings for unit tests and keyboards
Fred Sundvik [Sat, 27 Aug 2016 10:43:12 +0000 (13:43 +0300)]
More common settings for unit tests and keyboards

7 years agoFix running multiple tests
Fred Sundvik [Sat, 27 Aug 2016 10:29:54 +0000 (13:29 +0300)]
Fix running multiple tests

7 years agoRunning of unit tests
Fred Sundvik [Thu, 25 Aug 2016 08:25:27 +0000 (11:25 +0300)]
Running of unit tests

But only if the compilation has succeeded

7 years agoBuild actual tests, convert byte_stuffer_tests
Fred Sundvik [Wed, 24 Aug 2016 19:23:17 +0000 (22:23 +0300)]
Build actual tests, convert byte_stuffer_tests

7 years agoRules for compiling and linking google test
Fred Sundvik [Mon, 22 Aug 2016 06:16:08 +0000 (09:16 +0300)]
Rules for compiling and linking google test

7 years agoThe makefile actually calls build_test
Fred Sundvik [Sun, 21 Aug 2016 14:14:38 +0000 (17:14 +0300)]
The makefile actually calls build_test

7 years agoBasic framework for parsing test targets
Fred Sundvik [Sun, 21 Aug 2016 13:29:54 +0000 (16:29 +0300)]
Basic framework for parsing test targets

7 years agoAdd Google Test submodule
Fred Sundvik [Sat, 23 Jul 2016 10:27:23 +0000 (13:27 +0300)]
Add Google Test submodule

7 years agoMerge pull request #691 from fredizzimo/fix_line_endings
Jack Humbert [Sat, 27 Aug 2016 18:54:55 +0000 (14:54 -0400)]
Merge pull request #691 from fredizzimo/fix_line_endings

Fix line endings

7 years agoMerge branch 'master' into fix_line_endings
Fred Sundvik [Sat, 27 Aug 2016 18:01:46 +0000 (21:01 +0300)]
Merge branch 'master' into fix_line_endings

7 years agoMerge pull request #666 from fredizzimo/makefile_overhaul
Jack Humbert [Sat, 27 Aug 2016 17:49:42 +0000 (13:49 -0400)]
Merge pull request #666 from fredizzimo/makefile_overhaul

Makefile overhaul

7 years agoFix travis_compiled_push
Fred Sundvik [Sat, 27 Aug 2016 17:18:26 +0000 (20:18 +0300)]
Fix travis_compiled_push

7 years agoNormalize line endings
Fred Sundvik [Sat, 27 Aug 2016 15:40:50 +0000 (18:40 +0300)]
Normalize line endings

7 years agoSet eep files to binary mode
Fred Sundvik [Sat, 27 Aug 2016 15:37:28 +0000 (18:37 +0300)]
Set eep files to binary mode

7 years agoMerge remote-tracking branch 'upstream/master' into makefile_overhaul
Fred Sundvik [Fri, 26 Aug 2016 18:57:17 +0000 (21:57 +0300)]
Merge remote-tracking branch 'upstream/master' into makefile_overhaul

7 years agoMerge pull request #664 from linsomniac/infinity_readme
Erez Zukerman [Fri, 26 Aug 2016 11:32:24 +0000 (07:32 -0400)]
Merge pull request #664 from linsomniac/infinity_readme

Adding nicer Infinity build instructions.

7 years agoMerge pull request #685 from fredizzimo/windows10_instructions_typo
Erez Zukerman [Fri, 26 Aug 2016 11:29:12 +0000 (07:29 -0400)]
Merge pull request #685 from fredizzimo/windows10_instructions_typo

Fix minor typo in the readme

7 years agoFix bad merge
Fred Sundvik [Thu, 25 Aug 2016 21:05:58 +0000 (00:05 +0300)]
Fix bad merge

Led should have been added to KC60, not GH60

7 years agoFix minor typo in the readme
Fred Sundvik [Thu, 25 Aug 2016 20:54:05 +0000 (23:54 +0300)]
Fix minor typo in the readme

7 years agoRemove google test submodule
Fred Sundvik [Thu, 25 Aug 2016 20:37:18 +0000 (23:37 +0300)]
Remove google test submodule

It had been added for some strange reason, allthough it's supposed
to be there only in another branch.

7 years agoSplit vision_division into Makefile/rules.mk
Fred Sundvik [Thu, 25 Aug 2016 20:28:10 +0000 (23:28 +0300)]
Split vision_division into Makefile/rules.mk

7 years agoMerge branch 'master' into makefile_overhaul
Fred Sundvik [Thu, 25 Aug 2016 20:26:02 +0000 (23:26 +0300)]
Merge branch 'master' into makefile_overhaul

7 years agoMerge pull request #659 from Dbroqua/master
Jack Humbert [Thu, 25 Aug 2016 19:49:50 +0000 (15:49 -0400)]
Merge pull request #659 from Dbroqua/master

- Updated dbroqua layout for planck keyboard

7 years ago- Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works)
dbroqua [Thu, 25 Aug 2016 18:39:55 +0000 (20:39 +0200)]
- Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works)

7 years agoMerge pull request #683 from ickerwx/master
Jack Humbert [Thu, 25 Aug 2016 16:22:28 +0000 (12:22 -0400)]
Merge pull request #683 from ickerwx/master

LEDs work now, fixed Kitten Paw default keymap, added my own keymap as a better example

7 years agoMerge pull request #681 from IBNobody/vision_division_dev
Jack Humbert [Thu, 25 Aug 2016 15:40:51 +0000 (11:40 -0400)]
Merge pull request #681 from IBNobody/vision_division_dev

Added Port A Pin Mapping / Added Vision Division (WIP)

7 years agoMerge pull request #682 from jeebak/jd45-jeebak
Jack Humbert [Thu, 25 Aug 2016 15:33:14 +0000 (11:33 -0400)]
Merge pull request #682 from jeebak/jd45-jeebak

Port jeebak's Planck keymap to JD45

7 years agoMerge pull request #680 from replicaJunction/layout-atreus-replicaJunction
Jack Humbert [Thu, 25 Aug 2016 15:27:55 +0000 (11:27 -0400)]
Merge pull request #680 from replicaJunction/layout-atreus-replicaJunction

Added replicaJunction keymap

7 years agoFixed naming of Analog pins to differentiate them from DIO pins used by Quantum Matrix
IBNobody [Thu, 25 Aug 2016 13:16:18 +0000 (08:16 -0500)]
Fixed naming of Analog pins to differentiate them from DIO pins used by Quantum Matrix

7 years agoMerge remote-tracking branch 'upstream/master' into kitten_paw
René Werner [Thu, 25 Aug 2016 10:27:29 +0000 (12:27 +0200)]
Merge remote-tracking branch 'upstream/master' into kitten_paw

7 years agofixed defaulf keymap, added my own keymap
René Werner [Thu, 25 Aug 2016 10:25:57 +0000 (12:25 +0200)]
fixed defaulf keymap, added my own keymap

now the LEDs are working like they should

7 years agoMake the "extra" key in the top row another backspace
JeeBak Kim [Thu, 25 Aug 2016 10:06:42 +0000 (03:06 -0700)]
Make the "extra" key in the top row another backspace

7 years agoMerge pull request #1 from jackhumbert/master
Damien [Thu, 25 Aug 2016 06:58:04 +0000 (08:58 +0200)]
Merge pull request #1 from jackhumbert/master

Merge from jackhumbert

7 years ago- Updated kc60/readme
dbroqua [Thu, 25 Aug 2016 06:29:30 +0000 (08:29 +0200)]
- Updated kc60/readme
- Added layout examples for kc60

7 years ago[jd45] Port jeebak's planck keymap to jd45
JeeBak Kim [Wed, 24 Aug 2016 03:56:19 +0000 (20:56 -0700)]
[jd45] Port jeebak's planck keymap to jd45

7 years ago[jd45] Add "jeebak" keymap folder as a copy of the "default" folder
JeeBak Kim [Wed, 24 Aug 2016 03:08:06 +0000 (20:08 -0700)]
[jd45] Add "jeebak" keymap folder as a copy of the "default" folder

7 years agoMerge remote-tracking branch 'refs/remotes/jackhumbert/master' into vision_division_dev
IBNobody [Thu, 25 Aug 2016 05:16:15 +0000 (00:16 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into vision_division_dev

7 years agoAdded pin support for A0-A7
IBNobody [Thu, 25 Aug 2016 05:15:41 +0000 (00:15 -0500)]
Added pin support for A0-A7

Vision Division - It works!

7 years agoAdded replicaJunction keymap
Joshua T [Thu, 25 Aug 2016 04:58:59 +0000 (23:58 -0500)]
Added replicaJunction keymap

7 years ago- Fixed layout for kc60
dbroqua [Wed, 24 Aug 2016 20:22:14 +0000 (22:22 +0200)]
- Fixed layout for kc60

7 years ago- Updated kc60.h for 2x 1u backspace (K49)
dbroqua [Wed, 24 Aug 2016 19:53:49 +0000 (21:53 +0200)]
- Updated kc60.h for 2x 1u backspace (K49)
- Added dbroqua layout

7 years agoMaking the existing firmware link better
Sean Reifschneider [Wed, 24 Aug 2016 15:30:29 +0000 (09:30 -0600)]
Making the existing firmware link better

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