megamanmalte/qmk_firmware
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
3292 commits 1 branch 0 tags 275 MiB
Commit graph

3292 commits

This branch
This branch
All branches
Author SHA1 Message Date
profet23 a485e13afe Adding 80 Key Ergodox Support 2016-09-02 16:24:05 -04:00
Callum Oakley e4167c8c53 fixed incorrect key combination for locking screen on macOS 2016-09-02 09:03:39 +01:00
Callum Oakley 4c67ccc81e changed some of the wording in the readme 2016-09-01 18:30:49 +01:00
Callum Oakley 8b2a235c8d changed order of modifiers after experimentation, updated readme 2016-09-01 18:14:39 +01:00
Callum Oakley 9c3193f225 Merge remote-tracking branch 'upstream/master' 2016-09-01 17:55:00 +01:00
Gergely Nagy acda2b793f 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>
 2016-09-01 08:32:47 +02:00
Jack Humbert e28d151a8a Merge pull request #707 from algernon/f/unicode/get-mode 
process_unicode: Add get_unicode_input_mode()
 2016-08-31 11:28:52 -04:00
Gergely Nagy c9ea236fc3 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>
 2016-08-31 08:21:52 +02:00
Jack Humbert 27f9671a3e Merge pull request #705 from VoodaGod/bone2planck 
Bone2planck update
 2016-08-30 23:07:24 -04:00
Jason Janse van Rensburg fc2ca62a3b Merge branch 'master' 
Conflicts:
	keyboards/planck/keymaps/bone2planck/keymap.c
 2016-08-30 14:54:00 +02:00
Jack Humbert 8e00c464e6 Merge pull request #703 from jhenahan/feature/jhenahan-keymap 
jhenahan Planck layout
 2016-08-29 20:16:20 -04:00
Jack Humbert 3301e2219f Merge pull request #700 from algernon/h/ucis/enable-fix 
build_keyboard.mk: Restore UCIS_ENABLE support
 2016-08-29 20:15:46 -04:00
cbbrowne fba509780e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-29 12:32:03 -04:00
Jack Henahan 6d7637ae3e Update README 2016-08-29 11:43:06 -04:00
Jack Henahan 42f1ce08dc jhenahan layout 2016-08-29 11:35:07 -04:00
Gergely Nagy 2f0395ce72 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>
 2016-08-29 11:30:38 +02:00
IBNobody 6da0eb2b2b Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-28 18:50:06 -05:00
Jack Humbert 6d1e916851 Merge pull request #697 from fredizzimo/fix_gh_token_problem 
Fix the .travis.yml so that GH_TOKEN works properly
 2016-08-27 19:00:21 -04:00
Jack Humbert 25502277e8 Merge pull request #696 from fredizzimo/community_boards 
Update list of community keyboards
 2016-08-27 18:56:42 -04:00
Fred Sundvik 83eb9e4eed Fix the .travis.yml so that GH_TOKEN works properly 2016-08-28 01:10:14 +03:00
Fred Sundvik 3bdebd2270 Update list of community keyboards 2016-08-28 00:54:26 +03:00
Jack Humbert 326de65439 Merge pull request #689 from jeebak/tv44-jeebak 
Port jeebak's Planck/JD45 keymap to TV44
 2016-08-27 17:30:39 -04:00
Jack Humbert 2ac90ed704 Merge pull request #684 from tomb0y/kc60_workman_dead 
Correct typo in kc60 workman-dead keymap
 2016-08-27 17:30:05 -04:00
Jack Humbert bade8be66c Merge pull request #695 from fredizzimo/dfu-util_instructions 
Add dfu-util to the instructions
 2016-08-27 17:29:35 -04:00
Jack Humbert 98bedbeb75 Merge pull request #693 from fredizzimo/infinity60 
Rename infinity_chibios to infinity60, and add readme
 2016-08-27 17:29:12 -04:00
Jack Humbert a1b289c99a Merge pull request #694 from fredizzimo/keyboard_template 
Fix the keyboard template with new make syntax
 2016-08-27 17:07:49 -04:00
Jack Humbert 4fd5ac8326 Merge pull request #690 from fredizzimo/unit_test 
Add Unit Testing support
 2016-08-27 17:06:45 -04:00
Fred Sundvik 8ab9c5c55a Rename infinity_chibios to infinity60, and add readme 2016-08-27 23:55:33 +03:00
Fred Sundvik 53302328d0 Add dfu-util to the instructions 2016-08-27 23:43:49 +03:00
Fred Sundvik 1f5838a286 Fix the keyboard template with new make syntax 
Also add proper link to the parent
 2016-08-27 23:31:15 +03:00
Fred Sundvik 922c4ea3bc Add unit test documentation 2016-08-27 21:57:49 +03:00
Fred Sundvik ca51457327 Another attempt to make keyboards and tests in parallel 2016-08-27 21:57:49 +03:00
Fred Sundvik fd93a9bb29 Make tests and keyboards in two different jobs 2016-08-27 21:57:49 +03:00
Fred Sundvik 03b1d142f2 Add -p parameter to mkdir 
So that it's created even when there's a deeper structure
 2016-08-27 21:57:49 +03:00
Fred Sundvik 6b92b62802 Travis builds the default all target 2016-08-27 21:57:49 +03:00
Fred Sundvik 6410f0c021 The all target makes all keyboards and all tests 2016-08-27 21:57:49 +03:00
Fred Sundvik 1b963117fe Support for running and cleaning all tests 2016-08-27 21:57:49 +03:00
Fred Sundvik 42baa6cf43 Disable map file creation when building tests 
It causes strange linker warnings on cygwin.
 2016-08-27 21:57:49 +03:00
Fred Sundvik 7eefb34e7c Detect failures when running multiple tests 
Also add better output.
 2016-08-27 21:57:49 +03:00
Fred Sundvik ffb0a126f5 Convert tirple_buffered_object_tests to GTest 2016-08-27 21:57:49 +03:00
Fred Sundvik bcdf9ab76b Convert transport_tests to GTest 2016-08-27 21:57:49 +03:00
Fred Sundvik b3eba797af Convert frame_validator_tests to GTest 2016-08-27 21:57:49 +03:00
Fred Sundvik cdd0913bcc Convert frame_router_tests to GTest 2016-08-27 21:57:49 +03:00
Fred Sundvik c692fd1d55 More common settings for unit tests and keyboards 2016-08-27 21:57:49 +03:00
Fred Sundvik fc855cb30e Fix running multiple tests 2016-08-27 21:57:49 +03:00
Fred Sundvik f4429ba48c Running of unit tests 
But only if the compilation has succeeded
 2016-08-27 21:57:49 +03:00
Fred Sundvik 0a11460175 Build actual tests, convert byte_stuffer_tests 2016-08-27 21:57:49 +03:00
Fred Sundvik 8a9aac6e32 Rules for compiling and linking google test 2016-08-27 21:57:49 +03:00
Fred Sundvik 27a673f5cf The makefile actually calls build_test 2016-08-27 21:57:49 +03:00
Fred Sundvik 6d7cd639a5 Basic framework for parsing test targets 2016-08-27 21:57:49 +03:00