gitbot
/
qmk_firmware
mirror of https://github.com/qmk/qmk_firmware
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,609 Commits
63 Branches
1,608 Tags
1.4 GiB
Commit Graph

246 Commits (93f366fa7d59d0a3abb03879da88082a1e2128a8)

Author SHA1 Message Date
Jack Humbert f9aadd17e8 Merge pull request #558 from lindhe/master 
Fix misspelled command in Norwegian helper
 2016-07-25 11:16:54 -04:00
Andreas Lindhé 283ebbe142 Change Nordic ampersand code to match the English 
Changed from "NO_AMP" to "NO_AMPR" since the KC one is "KC_AMPR"
 2016-07-25 12:50:56 +02:00
Andreas Lindhé b6fa762234 Fix misspelled command in Norwegian helper 2016-07-25 11:29:54 +02:00
Jack Humbert 8b94e26d7c Fixes midi functionality 2016-07-24 22:07:43 -04:00
Jack Humbert 24bd931962 Merge pull request #552 from robertdale/music-play-fix 
Fixes issue #551 - ensure there's a recording to play before playing
 2016-07-24 21:58:01 -04:00
Jack Humbert 41f15d8c34 Merge pull request #550 from Darthabel/fix_bepo 
Fix some errors in bepo mapping
 2016-07-24 21:57:38 -04:00
Robert Dale 3ea738e450 ensure there's a recording to play before playing; also enables the LGUI button to play a tone 2016-07-24 10:00:39 -04:00
Vivien Alger 7b4d30ee50 Fix some errors in bepo mapping 2016-07-24 10:57:49 +02:00
Gergely Nagy 44e16ffc80 tap-dance: Code cleanup 
Removes a number of duplicated code, by passing actions around instead
of keycodes, so the various dance action functions do not have to look
up the action, but the caller does that for them.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-07-22 09:10:17 +02:00
Gergely Nagy ce8cc9219f tap-dance: Support user_data for the callbacks 
Refactored the code a little, so all callbacks now receive a `user_data`
pointer, which can be anything. As an example, the key pairs from
`ACTION_TAP_DANCE_DOUBLE` now use this, and custom, built-in functions.

This makes it easier to extend the tap dance functionality, and also
simplifies the code a little.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-07-22 09:10:17 +02:00
Gergely Nagy 70e42489de tap-dance: Support for holding keys 
With this change, tap dance will now store the pressed state of the
tap-dance key, and allow one to make an action sooner, while the key is
still held, and only unregister when the key is released.

The registration must happen in the `on_dance_finished` callback, while
unregistering goes to `on_reset`. The surrounding code makes sure not to
call either multiple times.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-07-22 09:10:17 +02:00
Jack Humbert 940358ed4f Merge pull request #518 from jakllsch/upstream 
keymap_extras changes
 2016-07-21 20:56:54 -04:00
Pavlos Vinieratos 4e6a8627d8 add a couple of comments 2016-07-19 18:18:57 +02:00
Pavlos Vinieratos d5daec2a58 on_each_tap_fn is called on tap down and tap up 2016-07-19 18:18:57 +02:00
Pavlos Vinieratos dda2fd6ff3 in the default case, it should be called if there is actually a tap 
dance happening, and in the normal case, it should be called when the
tap down is happening.
 2016-07-18 23:34:02 +02:00
Pavlos Vinieratos d3091faf36 change naming, and remove extraneous definition 2016-07-17 08:28:03 +02:00
Pavlos Vinieratos f3b56701ed add an `anyway` and a `reset` callback 
when using tap dance, we have the `regular` callback that is called on
the last tap. this commit adds an `anyway` callback that is called on
every tap, and a `reset` callback that is called on reset of the tap
dance taps.
 2016-07-16 00:04:12 +02:00
Pavlos Vinieratos 1a7e954f9f in case its NULL 2016-07-16 00:04:12 +02:00
Jonathan A. Kollasch 4278d88615 keymap_dvorak.h: add missing shifted keys, fix whitespace 2016-07-14 11:32:43 -05:00
Jonathan A. Kollasch 25938a09a6 extra_keymaps: use RALT() instead of 0x1400 for AltGr 2016-07-14 11:13:35 -05:00
Jonathan A. Kollasch 010dd13084 keymap_extras: add newline at end of files 2016-07-14 11:10:05 -05:00
Pavlos Vinieratos a28a6e5b79 extract reset keyboard into a function 
that makes it easy to call reset_keyboard() from a function in a keymap
 2016-07-13 16:38:02 +02:00
Jack Humbert a998a48673 Merge pull request #477 from Smilliam/master 
Canceling Space Cadet state with opposite shift key
 2016-07-11 09:14:43 -04:00
Smilliam b12fe6abb2 Made rollover behavior for space cadet optional 2016-07-10 19:04:01 -07:00
TerryMathews f7a8682226 Move return out of event if block 
According to Jack, this makes the return case not be processed. Doesn't
break anything in the firmware.
 2016-07-08 03:32:28 -04:00
TerryMathews 50c686587e Create keycodes for RGB control functions 
Moves RGB controls out of the macro function and assigns them their own
keycodes:
RGB_TOG (toggle on/off)
RGB_MOD (mode step)
RGB_HUI (increase hue)
RGB_HUD (decrease hue)
RGB_SAI (increase saturation)
RGB_SAD (decrease saturation)
RGB_VAI (increase brightness)
RGB_VAD (decrease brightness)
 2016-07-07 23:34:33 -04:00
Fred Sundvik 9870082a06 Fix the range for consumer keys 2016-07-07 19:48:39 +03:00
Jack Humbert c1dfb636ef fixes quantum template (actually) 2016-07-07 12:22:10 -04:00
Jack Humbert 57e08eb8ba updates rgblight implementation, makes non-timer stuff compatible with audio 2016-07-07 11:33:34 -04:00
Jack Humbert ad43d450ca Merge pull request #490 from fredizzimo/integrate_visualizer 
Integrate visualizer for ChibiOS and Infinity Ergodox
 2016-07-07 09:59:33 -04:00
Jack Humbert 589df84d6c corrects quantum template 2016-07-07 09:58:44 -04:00
Fred Sundvik caedec92d2 Move the visualizer_user file to keymap folder 
Also rename it to visualizer.c
 2016-07-07 14:42:16 +03:00
Fred Sundvik aaac254ebc Delete lcd_backlight_hal.c 
The functionality can now be found in the infinity_erogodox.c file
instead.
 2016-07-07 14:29:53 +03:00
Fred Sundvik dae7c9bfb3 Fix the SERIAL_LINK_ENABLE macro in Visualizer 
Rename from USE_SERIAL_LINK -> SERIAL_LINK_ENABLE
 2016-07-07 14:12:56 +03:00
Fred Sundvik 7229751ba9 Fix visualizer crash at startup 
Visualizer and serial link initialized in the wrong order.
The LED_ENABLED define wasn't set properly
uGfx is always initialized
 2016-07-07 14:01:20 +03:00
Fred Sundvik 07d0d5cbe4 Makefile fixes and update of Visualizer 2016-07-07 12:46:10 +03:00
Jack Humbert a4bf46f9b1 default keymap, reset sorted out for now, added serial to makefile 2016-07-06 22:48:19 -04:00
Fred Sundvik 70797bb8f2 Makefile changes and files to compile Visualizer 2016-07-07 00:20:20 +03:00
Fred Sundvik 6c29655790 Merge commit '73d890a2c9c34b905cd5e74e7146fdd4578dcb96' into add_visualizer 2016-07-06 20:30:58 +03:00
Fred Sundvik f727801bc6 Delete .gitmodules from visualizer 2016-07-06 20:17:16 +03:00
Fred Sundvik 9f33a5593c Add 'quantum/visualizer/' from commit 'bde869aa7ec8601459bc63b9636081d21108d1be' 
git-subtree-dir: quantum/visualizer
git-subtree-mainline: 19f480992c
git-subtree-split: bde869aa7e
 2016-07-06 20:15:45 +03:00
Jack Humbert c6d671e54c Merge pull request #482 from fredizzimo/serial_link 
Add serial link library
 2016-07-06 08:56:57 -04:00
Fred Sundvik d5e7603d55 Remove extra serial_link subdirectory 2016-07-06 13:26:20 +03:00
Fred Sundvik c5bf090d16 Remove CGreen make files 2016-07-06 13:10:30 +03:00
Fred Sundvik 3ac52b2e76 Remove serial_link .gitignore and .gitmodules 2016-07-06 13:09:51 +03:00
Jack Humbert 3577e26fd9 fix/annotate wait_us lines 2016-07-06 00:24:31 -04:00
Fred Sundvik 639cdd363e Add 'quantum/serial_link/' from commit 'a20d513e3cdacbf6e0e70a80402497ad10166434' 
git-subtree-dir: quantum/serial_link
git-subtree-mainline: 7d28d6a7bc
git-subtree-split: a20d513e3c
 2016-07-05 23:27:47 +03:00
Jack Humbert 421ff74e0c Merge pull request #471 from Chipairon/patch-1 
Fix for '~' in spanish layout
 2016-07-05 11:05:14 -04:00
Smilliam 6b0c9cc905 fixed indentation. 2016-07-04 19:58:26 -07:00
Smilliam 1412076df6 Allow Space Cadet state to be canceled by alternate Shift key 
Allows you to press RSHIFT to cancel the insertion of a "(" when holding down LSHIFT. Alternatively, allows you to press LSHIFT to cancel the insertion of a ")" when holding down RSHIFT. This change enables you to renege from outputting a character should you press a shift key erroneously.
 2016-07-04 19:56:08 -07:00