mirrors/keychron_qmk_firmware
mirrors/keychron_qmk_firmware
0
0
Fork 0
mirror of https://github.com/Keychron/qmk_firmware.git synced 2024-12-01 05:07:26 +06:00
Code Issues Packages Projects Releases Wiki Activity
2,577 Commits 9 Branches 1,419 Tags 332 MiB
5607b716ba
Commit Graph

2577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua T
5607b716ba Merge remote-tracking branch 'upstream/master' 2016-07-26 01:49:24 -05:00
Joshua T
876a6bdd4c Modified Atreus extend and Ergodox. 
Atreus: Removed home row Shift. It's under the thumb anyway. Also replaced dual modifier keys with macro keys (cut, copy, paste, undo).

Ergodox: Made Colemak the default layer instead of Dvorak. Also began the process of bringing it in line with the Atreus layout I've been working on.
 2016-07-26 01:44:57 -05:00
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
4aa7d2e206 Merge pull request #554 from robertdale/music-recording-documentation 
Added music recording/playing doc
 2016-07-24 21:58:23 -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
Jack Humbert
46f84157ce Merge pull request #549 from locksmithdon/patch-1 
Added LEADER_EXTERNS() call to readme.
 2016-07-24 21:57:15 -04:00
Jack Humbert
670327f1d0 Merge pull request #548 from CommandLineDesign/CMD-Preonic 
CMD keymap for Preonic
 2016-07-24 21:56:50 -04:00
Jack Humbert
384d9cd6bb Merge pull request #546 from sethbc/satan-cleanup 
Satan cleanup
 2016-07-24 21:56:23 -04:00
Erez Zukerman
4885225159 Merge pull request #534 from willwm/teckinesis 
Teckinesis for ErgoDox EZ
 2016-07-24 18:04:59 -07:00
Will Wolff-Myren
f4cb84c940 Remove images, per @ezuk request. =) 2016-07-24 14:33:17 -07:00
Erez Zukerman
1e944a4991 Merge pull request #542 from algernon/f/hold-the-dance 
Tap-dance: support for holding keys
 2016-07-24 11:36:05 -07:00
Erez Zukerman
36f2e22283 Merge pull request #535 from algernon/ergodox-ez/algernon 
ergodox_ez: Update my keymap to v1.3
 2016-07-24 11:34:33 -07:00
Robert Dale
812007a241 added music recording/playing doc 2016-07-24 10:23:33 -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
Don Smith
a4034b75c0 Added LEADER_EXTERNS() call. 
This seems to be needed in most cases.
 2016-07-24 19:18:22 +12:00
Jonathan Lucas
e6a41e43aa Updated Readme 2016-07-23 21:26:01 -07:00
commandlinedesign
c826bcfc39 Did a derp and forgot to set Trans on Arrow layer 2016-07-23 21:08:00 -07:00
commandlinedesign
4480a74a4b Arrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen position 2016-07-23 21:02:23 -07:00
commandlinedesign
c1fb82623c Tested, resolved Mouse issue, resolved numpad issue 2016-07-23 20:02:45 -07:00
commandlinedesign
fbafb9449e Resolved errors 2016-07-23 19:32:02 -07:00
Jonathan Lucas
9b3708f830 Init Readme 
This needs a better description.
 2016-07-23 18:52:52 -07:00
Jonathan Lucas
3c7075011b Create Makefile 
This is untested, use caution.
 2016-07-23 18:50:41 -07:00
Jonathan Lucas
b5761df57b Create CMD-Preonic Keymap 
This is very Alpha-Mode, and has not been tested or even Made yet.
 2016-07-23 18:47:36 -07:00
Jonathan Lucas
4059a16118 Merge pull request #1 from jackhumbert/master 
Update from parent
 2016-07-23 18:44:01 -07:00
Seth Chandler
75f0922711 fix typo in readme and satan.h 2016-07-23 20:55:20 -04:00
Seth Chandler
ef533be2d6 cleanup default layout 2016-07-23 20:52:27 -04:00
Seth Chandler
81fe3d962c update sethbc keymap 2016-07-23 20:37:41 -04:00
Gergely Nagy
13385f5691 readme.md: Update the tap dance docs 
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-07-22 09:10:17 +02:00
Gergely Nagy
fca34e2ad6 readme.md: algernon is strictly lowercase 
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-07-22 09:10:17 +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
8e1d96983a Merge pull request #543 from VoodaGod/bone2planck 
updated bone2planck
 2016-07-21 21:29:54 -04:00
Jack Humbert
66fed12c98 Merge pull request #541 from milestogo/master 
initial kinisis advantage build
 2016-07-21 21:05:06 -04:00
Jack Humbert
5249b4451c Merge pull request #540 from replicaJunction/feature-atreus-keymapFunction 
Adjusted Atreus KEYMAP() function.
 2016-07-21 21:04:45 -04:00
Jack Humbert
fb0bba5981 Merge pull request #538 from robertdale/preonic-map-correction 
Preonic: Corrected the ascii layout to match the coded layout
 2016-07-21 21:03:56 -04:00
Jack Humbert
d5d2eb8b5a Merge pull request #536 from pvinis/debug-doc 
add some debugging doc, after i found out how to print debug messages
 2016-07-21 21:02:37 -04:00
Jack Humbert
6f9f9baff4 Merge pull request #530 from sethbc/master 
Misc. fixes from sethbc
 2016-07-21 21:01:35 -04:00
Jack Humbert
26546f995f Merge pull request #529 from CommandLineDesign/CMD60-newKeymap 
Added CMD60 keymap
 2016-07-21 20:59:02 -04:00
Jack Humbert
2bed835a33 Merge pull request #525 from edasque/master 
Added Docker as a simple way to build firmwares
 2016-07-21 20:58:39 -04:00
Jack Humbert
fc9f128648 Merge pull request #522 from exiva/extrakey-macfix 
Fix OS X Recognizing keyboard as Mouse/Tablet
 2016-07-21 20:57:54 -04:00
Jack Humbert
fc4ab870f5 Merge pull request #521 from exiva/makefile-wait 
Make DFU wait for bootloader
 2016-07-21 20:57:32 -04:00
Jack Humbert
940358ed4f Merge pull request #518 from jakllsch/upstream 
keymap_extras changes
 2016-07-21 20:56:54 -04:00
Jack Humbert
62a6d3a6f5 Merge pull request #516 from pvinis/tap-dance-anyway 
Tap dance anyway
 2016-07-21 20:56:24 -04:00
milestogo
24e4e6dd18 adding traveller keyboard 2016-07-20 21:12:00 -07:00