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

1113 Commits (8bc69afc633d3e199e3ac0a5bf39e4d255f2ce4a)

Author SHA1 Message Date
Stephan Bösebeck 7060e10669 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-05 16:28:47 +02:00
Nicholas Keene 5daf24b1a5 The Ordinary Layout is the most natural and powerful layout for the Ergodox EZ. Come check it out. 2016-05-04 22:17:47 -05:00
Erez Zukerman dbb1c2f281 Merge pull request #305 from nrrkeene/master 
Custom handling for shift keys, improved media layer
 2016-05-04 22:31:00 -04:00
Stephan Bösebeck 660511f050 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-04 08:03:25 +02:00
Erez Zukerman 31a697bc05 Merge pull request #304 from adiabatic/ergodox-zweihander-osx 
zweihander: comment out action_get_macro()
 2016-05-03 22:27:39 -04:00
Nathan Sharfi 6bafe44486 zweihander: comment out action_get_macro() 2016-05-03 19:19:47 -07:00
Nicholas Keene 4b74eca2a5 The Ordinary Layout is arranged as close as possible to a traditional keyboard, but with extra special features 2016-05-03 20:58:27 -05:00
Nicholas Keene 575ca2b96d The Ordinary Layout works the way you expect it to, with extra powerful features 2016-05-03 20:40:15 -05:00
IBNobody 83e1cc241e Clarified audio.c (#302) 
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs
 2016-05-03 13:56:40 -04:00
Stephan Bösebeck 507db3ab13 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-03 08:29:55 +02:00
Nicholas Keene 8b0274f60a Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-02 21:35:58 -05:00
James ‘Twey’ Kay 1173dbd02f Swap steno/media layers to allow using media keys in the Plover layer; display all active layers, not just the top; use only momentary modifiers 2016-05-02 19:22:32 +01:00
Stephan Bösebeck 61b2b58bee Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-02 14:38:54 +02:00
Erez Zukerman 1ce6da2605 Merge pull request #298 from adiabatic/ergodox-zweihander-osx 
ergodox-zweihander-osx: initial commit
 2016-05-02 08:30:34 -04:00
Erez Zukerman 98ed12843e Merge pull request #294 from sneako/master 
Add my Ergodox EZ config
 2016-05-02 08:24:26 -04:00
Erez Zukerman 84b736dc7f Merge pull request #258 from romanzolotarev/master 
Add Roman's single layer layout based on Norman
 2016-05-02 08:24:11 -04:00
Stephan Bösebeck 0e7a3a25bb new version of the experimental layout. changed media keys in MDIA layer 2016-05-02 13:46:00 +02:00
Nicholas Keene 1076c2b122 The Ordinary Layout is the layout you are looking for. Come and see v3.14. 2016-05-01 23:16:41 -05:00
Nathan Sharfi fe022a508f zweihander: move dim/brighten to 1/2, add ⌘Q 2016-05-01 15:12:38 -07:00
Nathan Sharfi 9b163d2feb zweihander: Add ⌘`, ⌘⇧`, ⌥⇥, ⌥⇧⇥ 2016-05-01 13:55:00 -07:00
Nathan Sharfi 8ec1d41a28 Ergodox EZ: add zweihander-osx.hex 2016-04-30 22:36:09 -07:00
Nathan Sharfi 262930c8d5 ergodox-zweihander: initial commit 2016-04-30 22:12:13 -07:00
Anand Babu (AB) Periasamy ed0798de24 Beginner's keymap for Ergodox-EZ 2016-04-30 11:28:38 -07:00
Erez Zukerman e7d56215de Merge pull request #295 from techtomas/techtomas 
Add my layout to the list
 2016-04-30 07:42:20 -04:00
Jack Humbert 0656f2fa10 moves backlight functionality to keyboard files and updates template makefile 
previously there were two backlight.c files (bad)
 2016-04-29 22:19:40 -04:00
Jack Humbert 9ab7098c83 fixes plover start sound 2016-04-29 21:21:08 -04:00
Thomas Anderson fb57b2e55d Added readme 2016-04-29 17:25:14 -07:00
Thomas Anderson 711809fdac Finalized my personal layout 2016-04-29 14:42:31 -07:00
Erez Zukerman 9edcfcdf6f Adds brackets to inner vertical keys in experimental layout 2016-04-29 22:39:05 +03:00
Jack Humbert 66e0323881 removes extra voices, updates .hex files 2016-04-29 12:42:55 -04:00
Jack Humbert 27d24faf39 adds condition to one last audio ref in planck default 2016-04-28 23:11:09 -04:00
skullY ca9b85f702 Bring the clueboard firmware size down 2016-04-28 20:07:07 -07:00
sneako b79124ac14 Adding .hex file 2016-04-28 22:20:25 -04:00
sneako 38858338f8 Add my Ergodox EZ config 2016-04-28 21:58:29 -04:00
Erez Zukerman 4f998657e9 Addresses #290 2016-04-29 04:47:06 +03:00
Tobias Matt 4122ad3f7b switch shift and enter thumb key 2016-04-28 15:09:34 +02:00
Tobias Matt a101d9ebcd update hex file 2016-04-28 15:02:40 +02:00
Tobias Matt d4710d8d7a shift to thumb key 2016-04-28 15:01:27 +02:00
IBNobody ce75a7675e Updated personal layouts (#291) 2016-04-27 00:25:16 -04:00
a0-c 8fda26db7d gh60 Rev C with LED controls (#289) 
* gh60_rev_c

* gh60 Rev C

Support for WASD, Poker, Esc, FN LED clusters

* clean up spacing

* Update README.md

* Added image and pinout

* PCB image
 2016-04-26 20:05:05 -04:00
Jack Humbert c37d52d213 resolves conflicts in rgblight.c 
# Conflicts:
#	quantum/rgblight.c
 2016-04-26 13:48:36 -04:00
Erez Zukerman ea091e7f1b Honing in on an interval that works for me 2016-04-26 14:25:35 +03:00
Roman Zolotarev bf925fb71c
Add Roman's layout with QWERTY 2016-04-26 16:46:43 +08:00
Roman Zolotarev 28f0b64e31
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-26 16:23:10 +08:00
Tobias Matt d280a59c82 add hex file 2016-04-26 08:43:56 +02:00
Tobias Matt 0181663771 organize in subfolder 2016-04-26 08:41:17 +02:00
Bubblepoint 57789c64bd basic layout 2016-04-26 05:39:33 +02:00
Erez Zukerman 6274a216f8 [Erez & Jack] Examples for advanced macro stuff 2016-04-26 05:25:31 +03:00
Erez Zukerman aabcfd5b4e Merge pull request #282 from jasontwong/master 
Add new keymap
 2016-04-25 06:57:00 -04:00
Jack Humbert 28352f4619 adds revisions of .hex files for planck/preonic 2016-04-25 01:01:41 -04:00
Jack Humbert 0889cc0d9a removes old .hex files 2016-04-25 01:00:34 -04:00
Jack Humbert 170d9b7d15 addresses memory limits concerns for atomic default makefile 2016-04-25 00:25:49 -04:00
Jack Humbert 9fb1e5441f updates preonic default keymap 2016-04-25 00:22:35 -04:00
Jack Humbert 130a485bf7 updates planck default keymap 2016-04-25 00:15:23 -04:00
Jason T. Wong 9f8f34119a Compiled Hex File 
The keymap file to use without compilation.
 2016-04-24 22:14:09 -04:00
IBNobody f32f80cf32 updating personal atomic keymap (#285) 2016-04-24 22:06:59 -04:00
Erez Zukerman 68532ced24 Merge pull request #280 from Twey/master 
Add `quantum/keymap_extras/keymap_plover.h` and a keymap.
 2016-04-24 20:33:38 -04:00
James ‘Twey’ Kay 5713083e91 Add Twey's keymap 2016-04-25 01:08:36 +01:00
Jason T. Wong 93da70a43a Update keymap image 
Why:

* The transparency made it ugly.

This change addresses the need by:

* Make transparent parts white.
 2016-04-23 23:36:41 -04:00
Jack Humbert def6853532 adds voice iteration to planck default 2016-04-23 23:30:09 -04:00
Jason T. Wong 762065578b Add new keymap 
Why:

* I want a custom keymap that suits my needs.

This change addresses the need by:

* Cloned default keymap.
* Customized layout.
* Updated README.
* Add an image created from keyboard layout editor.
 2016-04-23 23:21:13 -04:00
IBNobody 082a0f313d fixed compiler warnings (#273) 2016-04-22 01:01:38 -04:00
Eric Tang 620ac4b260 Update functions used to write to EEPROM 2016-04-21 20:07:03 -07:00
Jack Humbert 9828aba2a1 adds multiple voices and the ability to iterate/deiterate between them 2016-04-21 18:14:25 -04:00
Erez Zukerman a8fd65d86f Merge pull request #265 from sboesebeck/master 
ErgodoxLayoutGenerator used
 2016-04-21 08:10:39 +03:00
Jack Humbert 7d1a683607 sounds for plover layout 2016-04-20 22:28:47 -04:00
Jack Humbert 157ddccc2c start-up sound working, removes tick with some devices 2016-04-20 20:11:05 -04:00
Jack Humbert 0fd093b400 there is no on 2016-04-20 18:41:10 -04:00
Jack Humbert b0635e58eb delay isn't the problem here 2016-04-20 18:39:36 -04:00
Jack Humbert b8c932f9aa makes the plover keymap correct 2016-04-20 18:39:17 -04:00
Stephan Bösebeck e065ff8cba changed the macro generation of the ELG to use UP, DOWN, TYPE instead of U,D,T - makes it work with custom keycodes 2016-04-20 22:34:02 +02:00
Stephan Bösebeck 17140ec082 added some words about the ELG in the readme 2016-04-20 11:16:29 +02:00
Stephan Bösebeck 13244a259c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-20 11:15:59 +02:00
Jack Humbert f489ae1ac0 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-04-20 01:08:27 -04:00
Jack Humbert de4690593c fixed startup audio with a 500ms delay 2016-04-20 01:08:17 -04:00
Erez Zukerman a9ef1c0a03 Merge pull request #267 from nrrkeene/master 
Improved modifier keys, code
 2016-04-20 07:48:54 +03:00
Nicholas Keene 5319c2cd6e The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-19 21:56:50 -05:00
Jack Humbert 462601f5e8 breaking changes - restructuring audio.c a little 2016-04-19 21:25:48 -04:00
Stephan Bösebeck f645f9946c re-created all layouts using ErgodoxLayoutGenerator 2016-04-19 23:27:10 +02:00
Stephan Bösebeck 6ff5e10592 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-19 23:07:11 +02:00
Jack Humbert a2ee277158 updated comments about plover 2016-04-19 17:03:43 -04:00
Jack Humbert 6ae34f20aa added plover to default layout 2016-04-19 17:01:04 -04:00
Jack Humbert a2f31c886f getting ready for getters and setters 2016-04-19 12:58:13 -04:00
Stephan Bösebeck 04f36b3681 new overview pic 2016-04-19 15:59:43 +02:00
Stephan Bösebeck a16a9b30b6 added new macro for toggling and holiding layer 2016-04-19 10:37:37 +02:00
Stephan Bösebeck 0fbc52809e new experimental layout 2016-04-19 07:50:29 +02:00
Jack Humbert 78b3a88154 merging in #262 2016-04-18 21:04:29 -04:00
Jack Humbert e49712b559 note sliding - on right now 2016-04-18 21:01:48 -04:00
IBNobody 4b3358acc2 Fixed speaker being on during sleep. 2016-04-18 18:58:37 -05:00
IBNobody 4f4b5b8c18 Added CM/DK 2016-04-18 01:58:25 -05:00
Stephan Bösebeck 42fad96be5 added smly layer again 2016-04-18 08:27:58 +02:00
Stephan Bösebeck 9cc39156f7 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-18 08:03:22 +02:00
IBNobody 82ec81660e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into personal_atomic_planck 2016-04-17 23:16:36 -05:00
IBNobody ef73ab6628 Notes Bugfix 2016-04-17 22:08:05 -05:00
Jack Humbert 5a15c113d7 Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 2016-04-17 21:15:50 -04:00
IBNobody 5c98ad5960 Added extra songs, LED indicator notes 2016-04-17 20:14:37 -05:00
Jack Humbert e0ab1dcf4c merging 2016-04-17 18:15:35 -04:00
Jack Humbert ce463ef424 audio fixes 2016-04-17 18:14:42 -04:00
Stephan Bösebeck 6732d6cf1a new png 2016-04-17 23:04:43 +02:00
Stephan Bösebeck a9d8c61dbd new iteration, change of lower row 2016-04-17 23:02:29 +02:00