]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
cbbrowne [Wed, 7 Sep 2016 17:09:14 +0000 (13:09 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoMerge pull request #732 from romanzolotarev/master
Erez Zukerman [Wed, 7 Sep 2016 01:35:15 +0000 (21:35 -0400)]
Merge pull request #732 from romanzolotarev/master

Change CTL_T(KC_ESC) to KC_LCTRL and update readme

7 years agoMerge pull request #729 from joarau/master
Erez Zukerman [Wed, 7 Sep 2016 01:33:55 +0000 (21:33 -0400)]
Merge pull request #729 from joarau/master

norwegian programmer-friendly layout

7 years agoChange CTL_T(KC_ESC) to KC_LCTRL and update readme
Roman Zolotarev [Tue, 6 Sep 2016 23:55:22 +0000 (07:55 +0800)]
Change CTL_T(KC_ESC) to KC_LCTRL and update readme

7 years agonorwegian programmer-friendly layout
joar [Tue, 6 Sep 2016 14:00:08 +0000 (16:00 +0200)]
norwegian programmer-friendly layout

7 years agoMerge pull request #728 from fitzsim/yoruian
Erez Zukerman [Tue, 6 Sep 2016 11:07:25 +0000 (07:07 -0400)]
Merge pull request #728 from fitzsim/yoruian

Add new ErgoDox EZ keymap, YORUIAN

7 years agoFix ergodox_yoruian XKB naming
Thomas Fitzsimmons [Tue, 6 Sep 2016 04:09:14 +0000 (00:09 -0400)]
Fix ergodox_yoruian XKB naming

7 years agoAdd new ErgoDox EZ keymap, YORUIAN
Thomas Fitzsimmons [Mon, 5 Sep 2016 21:40:03 +0000 (17:40 -0400)]
Add new ErgoDox EZ keymap, YORUIAN

7 years agoMerge pull request #686 from coderkun/coderkun_neo2
Erez Zukerman [Tue, 6 Sep 2016 00:33:09 +0000 (20:33 -0400)]
Merge pull request #686 from coderkun/coderkun_neo2

Merge Ergodox keymap “coderkun_neo2”

7 years agoMerge pull request #678 from algernon/ergodox-ez/algernon
Erez Zukerman [Tue, 6 Sep 2016 00:32:46 +0000 (20:32 -0400)]
Merge pull request #678 from algernon/ergodox-ez/algernon

ergodox: Update algernon's keymap to v1.6

7 years agoMerge pull request #724 from sgoodwin/master
Jack Humbert [Mon, 5 Sep 2016 17:21:24 +0000 (13:21 -0400)]
Merge pull request #724 from sgoodwin/master

Add my keymap.

7 years agoMerge pull request #722 from fredizzimo/fix_always_linking
Jack Humbert [Mon, 5 Sep 2016 17:20:59 +0000 (13:20 -0400)]
Merge pull request #722 from fredizzimo/fix_always_linking

Fix the ldflags.txt and obj.txt checks

7 years agoMerge pull request #719 from IBNobody/master
Jack Humbert [Mon, 5 Sep 2016 17:20:48 +0000 (13:20 -0400)]
Merge pull request #719 from IBNobody/master

Updated docs to show more info on backlight breathing.

7 years agoMerge pull request #716 from MajorKoos/master
Jack Humbert [Mon, 5 Sep 2016 17:19:58 +0000 (13:19 -0400)]
Merge pull request #716 from MajorKoos/master

Add support for JD40 MKII PCB

7 years agoMerge pull request #711 from hot-leaf-juice/master
Jack Humbert [Mon, 5 Sep 2016 17:17:14 +0000 (13:17 -0400)]
Merge pull request #711 from hot-leaf-juice/master

Updated callum's keymap

7 years agoMerge pull request #710 from algernon/h/tap-dance/keyup-seq-start-fix
Jack Humbert [Mon, 5 Sep 2016 17:16:58 +0000 (13:16 -0400)]
Merge pull request #710 from algernon/h/tap-dance/keyup-seq-start-fix

tap-dance: Do not start a sequence on keyup

7 years agoAdd my keymap.
Samuel Ryan Goodwin [Mon, 5 Sep 2016 13:53:52 +0000 (15:53 +0200)]
Add my keymap.

7 years agoFix the ldflags.txt and obj.txt checks
Fred Sundvik [Sun, 4 Sep 2016 20:26:49 +0000 (23:26 +0300)]
Fix the ldflags.txt and obj.txt checks

There was a minor typo, which caused the files to not be generated
and therefore the elf files were always linked.

7 years agoMerge pull request #4 from IBNobody/update_atomic_planck_pvc_keymaps
IBNobody [Sun, 4 Sep 2016 06:08:36 +0000 (01:08 -0500)]
Merge pull request #4 from IBNobody/update_atomic_planck_pvc_keymaps

Added diagonal mice macros, breathing ala Atomic

7 years agoAdded diagonal mice macros, breathing ala Atomic
IBNobody [Sun, 4 Sep 2016 06:07:36 +0000 (01:07 -0500)]
Added diagonal mice macros, breathing ala Atomic

7 years agoMoved breathing backlighting section in readme.md
IBNobody [Sun, 4 Sep 2016 04:21:24 +0000 (23:21 -0500)]
Moved breathing backlighting section in readme.md

7 years agoUpdated doc to contain breathing information.
IBNobody [Sun, 4 Sep 2016 01:33:34 +0000 (20:33 -0500)]
Updated doc to contain breathing information.

7 years agoUpdated readme to have better backlight breathing info.
IBNobody [Sun, 4 Sep 2016 01:29:29 +0000 (20:29 -0500)]
Updated readme to have better backlight breathing info.

7 years agoMerge remote-tracking branch 'refs/remotes/jackhumbert/master'
IBNobody [Sat, 3 Sep 2016 16:52:55 +0000 (11:52 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

7 years agoAdd rules.mk file
Major Koos [Fri, 2 Sep 2016 23:42:40 +0000 (16:42 -0700)]
Add rules.mk file

7 years agoAdd support for JD40 MKII PCB
Major Koos [Fri, 2 Sep 2016 23:14:40 +0000 (16:14 -0700)]
Add support for JD40 MKII PCB

RGB Included.

7 years agofixed incorrect key combination for locking screen on macOS
Callum Oakley [Fri, 2 Sep 2016 08:03:39 +0000 (09:03 +0100)]
fixed incorrect key combination for locking screen on macOS

7 years agochanged some of the wording in the readme
Callum Oakley [Thu, 1 Sep 2016 17:30:49 +0000 (18:30 +0100)]
changed some of the wording in the readme

7 years agochanged order of modifiers after experimentation, updated readme
Callum Oakley [Thu, 1 Sep 2016 17:14:39 +0000 (18:14 +0100)]
changed order of modifiers after experimentation, updated readme

7 years agoMerge remote-tracking branch 'upstream/master'
Callum Oakley [Thu, 1 Sep 2016 16:55:00 +0000 (17:55 +0100)]
Merge remote-tracking branch 'upstream/master'

7 years agotap-dance: Do not start a sequence on keyup
Gergely Nagy [Thu, 1 Sep 2016 06:32:47 +0000 (08:32 +0200)]
tap-dance: Do not start a sequence on keyup

There was an odd case, which confused the hell out of tap-dance: suppose
you had a number of tap-dance keys, on a layer, and as part of the
tap-dance, you turned that layer off - or had it on one-shot to begin
with. In this case, the keydown event would trigger the tap-dance key,
but the keyup would not. This had two funky consequences:

- tap-dance did not correctly register that the dance has ended.
- pressing any other tap-dance key would interrupt the previous
  tap-dance, and potentially input unwanted characters.

To fix this, we simply do not start a tap-dance sequence on keyup, only
when it is pressed. This way the previous sequence has enough time to
time-out and finish properly, and we don't get confused.

This fixes algernon/ergodox-layout#107.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years agoMerge pull request #707 from algernon/f/unicode/get-mode
Jack Humbert [Wed, 31 Aug 2016 15:28:52 +0000 (11:28 -0400)]
Merge pull request #707 from algernon/f/unicode/get-mode

process_unicode: Add get_unicode_input_mode()

7 years agoprocess_unicode: Add get_unicode_input_mode()
Gergely Nagy [Wed, 31 Aug 2016 06:21:52 +0000 (08:21 +0200)]
process_unicode: Add get_unicode_input_mode()

There may be cases where one would like to know the current Unicode
input mode, without having to keep track of it themselves. Add a
function that does just this.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years agoMerge pull request #705 from VoodaGod/bone2planck
Jack Humbert [Wed, 31 Aug 2016 03:07:24 +0000 (23:07 -0400)]
Merge pull request #705 from VoodaGod/bone2planck

Bone2planck update

7 years agoMerge branch 'master'
Jason Janse van Rensburg [Tue, 30 Aug 2016 12:54:00 +0000 (14:54 +0200)]
Merge branch 'master'

Conflicts:
keyboards/planck/keymaps/bone2planck/keymap.c

7 years agoMerge pull request #703 from jhenahan/feature/jhenahan-keymap
Jack Humbert [Tue, 30 Aug 2016 00:16:20 +0000 (20:16 -0400)]
Merge pull request #703 from jhenahan/feature/jhenahan-keymap

jhenahan Planck layout

7 years agoMerge pull request #700 from algernon/h/ucis/enable-fix
Jack Humbert [Tue, 30 Aug 2016 00:15:46 +0000 (20:15 -0400)]
Merge pull request #700 from algernon/h/ucis/enable-fix

build_keyboard.mk: Restore UCIS_ENABLE support

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 agoUpdate README
Jack Henahan [Mon, 29 Aug 2016 15:43:06 +0000 (11:43 -0400)]
Update README

7 years agojhenahan layout
Jack Henahan [Mon, 29 Aug 2016 15:35:07 +0000 (11:35 -0400)]
jhenahan layout

7 years agobuild_keyboard.mk: Restore UCIS_ENABLE support
Gergely Nagy [Mon, 29 Aug 2016 09:30:38 +0000 (11:30 +0200)]
build_keyboard.mk: Restore UCIS_ENABLE support

During the build system refactor, support for enabling UCIS seems to
have been lost. This little patch adds that back, so that keymaps using
UCIS can be compiled again.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years agoMerge remote-tracking branch 'refs/remotes/jackhumbert/master'
IBNobody [Sun, 28 Aug 2016 23:50:06 +0000 (18:50 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

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 agoAdd box-drawing Unicode characters to keymap “coderkun_neo2”
coderkun [Fri, 26 Aug 2016 11:26:16 +0000 (13:26 +0200)]
Add box-drawing Unicode characters to keymap “coderkun_neo2”

7 years agoSet Unicode input mode and override unicode_input_start() method to keymap “coderkun_...
coderkun [Sun, 21 Aug 2016 18:39:09 +0000 (20:39 +0200)]
Set Unicode input mode and override unicode_input_start() method to keymap “coderkun_neo2”

7 years agoDisable debugging for Ergodox keymap “coderkun_neo2”
coderkun [Sun, 21 Aug 2016 17:31:34 +0000 (19:31 +0200)]
Disable debugging for Ergodox keymap “coderkun_neo2”

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