]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
cbbrowne [Mon, 29 Aug 2016 16:32:03 +0000 (12:32 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoMerge pull request #697 from fredizzimo/fix_gh_token_problem
Jack Humbert [Sat, 27 Aug 2016 23:00:21 +0000 (19:00 -0400)]
Merge pull request #697 from fredizzimo/fix_gh_token_problem

Fix the .travis.yml so that GH_TOKEN works properly

7 years agoMerge pull request #696 from fredizzimo/community_boards
Jack Humbert [Sat, 27 Aug 2016 22:56:42 +0000 (18:56 -0400)]
Merge pull request #696 from fredizzimo/community_boards

Update list of community keyboards

7 years agoFix the .travis.yml so that GH_TOKEN works properly
Fred Sundvik [Sat, 27 Aug 2016 22:10:14 +0000 (01:10 +0300)]
Fix the .travis.yml so that GH_TOKEN works properly

7 years agoUpdate list of community keyboards
Fred Sundvik [Sat, 27 Aug 2016 21:52:32 +0000 (00:52 +0300)]
Update list of community keyboards

7 years agoMerge pull request #689 from jeebak/tv44-jeebak
Jack Humbert [Sat, 27 Aug 2016 21:30:39 +0000 (17:30 -0400)]
Merge pull request #689 from jeebak/tv44-jeebak

Port jeebak's Planck/JD45 keymap to TV44

7 years agoMerge pull request #684 from tomb0y/kc60_workman_dead
Jack Humbert [Sat, 27 Aug 2016 21:30:05 +0000 (17:30 -0400)]
Merge pull request #684 from tomb0y/kc60_workman_dead

Correct typo in kc60 workman-dead keymap

7 years agoMerge pull request #695 from fredizzimo/dfu-util_instructions
Jack Humbert [Sat, 27 Aug 2016 21:29:35 +0000 (17:29 -0400)]
Merge pull request #695 from fredizzimo/dfu-util_instructions

Add dfu-util to the instructions

7 years agoMerge pull request #693 from fredizzimo/infinity60
Jack Humbert [Sat, 27 Aug 2016 21:29:12 +0000 (17:29 -0400)]
Merge pull request #693 from fredizzimo/infinity60

Rename infinity_chibios to infinity60, and add readme

7 years agoMerge pull request #694 from fredizzimo/keyboard_template
Jack Humbert [Sat, 27 Aug 2016 21:07:49 +0000 (17:07 -0400)]
Merge pull request #694 from fredizzimo/keyboard_template

Fix the keyboard template with new make syntax

7 years agoMerge pull request #690 from fredizzimo/unit_test
Jack Humbert [Sat, 27 Aug 2016 21:06:45 +0000 (17:06 -0400)]
Merge pull request #690 from fredizzimo/unit_test

Add Unit Testing support

7 years agoRename infinity_chibios to infinity60, and add readme
Fred Sundvik [Sat, 27 Aug 2016 20:14:27 +0000 (23:14 +0300)]
Rename infinity_chibios to infinity60, and add readme

7 years agoAdd dfu-util to the instructions
Fred Sundvik [Sat, 27 Aug 2016 20:43:49 +0000 (23:43 +0300)]
Add dfu-util to the instructions

7 years agoFix the keyboard template with new make syntax
Fred Sundvik [Sat, 27 Aug 2016 20:29:37 +0000 (23:29 +0300)]
Fix the keyboard template with new make syntax

Also add proper link to the parent

7 years agoAdd unit test documentation
Fred Sundvik [Sat, 27 Aug 2016 17:09:01 +0000 (20:09 +0300)]
Add unit test documentation

7 years agoAnother attempt to make keyboards and tests in parallel
Fred Sundvik [Sat, 27 Aug 2016 16:36:14 +0000 (19:36 +0300)]
Another attempt to make keyboards and tests in parallel

7 years agoMake tests and keyboards in two different jobs
Fred Sundvik [Sat, 27 Aug 2016 16:03:24 +0000 (19:03 +0300)]
Make tests and keyboards in two different jobs

7 years agoAdd -p parameter to mkdir
Fred Sundvik [Sat, 27 Aug 2016 15:59:22 +0000 (18:59 +0300)]
Add -p parameter to mkdir

So that it's created even when there's a deeper structure

7 years agoTravis builds the default all target
Fred Sundvik [Sat, 27 Aug 2016 15:13:52 +0000 (18:13 +0300)]
Travis builds the default all target

7 years agoThe all target makes all keyboards and all tests
Fred Sundvik [Sat, 27 Aug 2016 15:13:01 +0000 (18:13 +0300)]
The all target makes all keyboards and all tests

7 years agoSupport for running and cleaning all tests
Fred Sundvik [Sat, 27 Aug 2016 15:01:59 +0000 (18:01 +0300)]
Support for running and cleaning all tests

7 years agoDisable map file creation when building tests
Fred Sundvik [Sat, 27 Aug 2016 14:43:35 +0000 (17:43 +0300)]
Disable map file creation when building tests

It causes strange linker warnings on cygwin.

7 years agoDetect failures when running multiple tests
Fred Sundvik [Sat, 27 Aug 2016 11:53:57 +0000 (14:53 +0300)]
Detect failures when running multiple tests

Also add better output.

7 years agoConvert tirple_buffered_object_tests to GTest
Fred Sundvik [Sat, 27 Aug 2016 11:25:52 +0000 (14:25 +0300)]
Convert tirple_buffered_object_tests to GTest

7 years agoConvert transport_tests to GTest
Fred Sundvik [Sat, 27 Aug 2016 11:18:49 +0000 (14:18 +0300)]
Convert transport_tests to GTest

7 years agoConvert frame_validator_tests to GTest
Fred Sundvik [Sat, 27 Aug 2016 10:54:16 +0000 (13:54 +0300)]
Convert frame_validator_tests to GTest

7 years agoConvert frame_router_tests to GTest
Fred Sundvik [Sat, 27 Aug 2016 10:43:46 +0000 (13:43 +0300)]
Convert frame_router_tests to GTest

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 ago[tv44] Port jeebak's planck keymap to tv44
JeeBak Kim [Fri, 26 Aug 2016 22:05:51 +0000 (15:05 -0700)]
[tv44] Port jeebak's planck keymap to tv44

7 years ago[tv44] Add "jeebak" keymap folder as a copy of the "default" folder
JeeBak Kim [Fri, 26 Aug 2016 21:48:03 +0000 (14:48 -0700)]
[tv44] Add "jeebak" keymap folder as a copy of the "default" folder

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 branch 'master' of https://github.com/jackhumbert/qmk_firmware
cbbrowne [Fri, 26 Aug 2016 16:13:50 +0000 (12:13 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

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 agoCorrect typo in kc60 workman-dead keymap
zs [Thu, 25 Aug 2016 18:56:15 +0000 (20:56 +0200)]
Correct typo in kc60 workman-dead keymap

and rename README.md to readme.md

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 agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
cbbrowne [Wed, 24 Aug 2016 21:47:09 +0000 (17:47 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoMore notes
cbbrowne [Wed, 24 Aug 2016 21:47:01 +0000 (17:47 -0400)]
More notes

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