_/qmk_firmware
1
0
Fork 0
Code Releases Activity
2693 commits 1 branch 0 tags 126 MiB
Commit graph

2693 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nathan Sharfi
c2419ffecc Remove /keyboard/* files 2016-07-31 14:10:03 -07:00
Nathan Sharfi
d889648d53 Merge branch 'master' of github.com:jackhumbert/qmk_firmware 
# Conflicts:
#	keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
#	keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
 2016-07-31 14:02:25 -07:00
Jack Humbert
b25dbc484d Merge pull request #594 from jeebak/jeebak 
Jeebak's keymap for planck
 2016-07-31 01:30:31 -04:00
Jack Humbert
7e000ff476 Merge pull request #590 from jeebak/in-like-flint 
Add IN_LIKE_FLINT song
 2016-07-31 01:30:09 -04:00
JeeBak Kim
230d313dbd Update readme.md 2016-07-30 17:30:10 -07:00
JeeBak Kim
a2ed7ce795 Add additional shortcut keymaps to TOUCHCURSOR layer 2016-07-30 12:52:51 -07:00
JeeBak Kim
db8ad8204e Add additional maps for [, and ], to LOWER 2016-07-30 12:52:51 -07:00
JeeBak Kim
b54a58859f Make RAISE layer an all numbers/arithmatic layer 2016-07-30 12:52:51 -07:00
JeeBak Kim
216efe6c99 Move reset to a less accessible location 2016-07-30 12:52:51 -07:00
JeeBak Kim
e0dd9d6af0 Add -, +, and . to RAISE 2016-07-30 12:52:51 -07:00
JeeBak Kim
6a2c681ae9 Change calls from persistant_default_layer_set() to default_layer_set() 2016-07-30 12:52:51 -07:00
JeeBak Kim
eb9416a67d PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE layers 2016-07-30 12:52:46 -07:00
JeeBak Kim
984fc2b630 Media keys for all the "regular" layers 2016-07-30 10:13:50 -07:00
JeeBak Kim
7209310d1b Add mouse layer, and remove default arrow keys (touchcursor only, now) 2016-07-30 10:13:50 -07:00
JeeBak Kim
a6bae9fb07 Add numbers to _RAISE 2016-07-30 10:13:49 -07:00
JeeBak Kim
6baf77d8fb Move _RAISE symbols to _LOWER 2016-07-30 10:13:49 -07:00
JeeBak Kim
ad7e4af45c Tap for Enter, hold for Shift 2016-07-30 10:13:49 -07:00
JeeBak Kim
b5d77440b6 Add personalized TouchCursor layer 2016-07-30 10:13:49 -07:00
JeeBak Kim
eb1a06d3ae Tap for Esc, hold for Control 2016-07-30 10:13:44 -07:00
JeeBak Kim
7d0345ef25 Add IN_LIKE_FLINT song 2016-07-30 01:52:33 -07:00
JeeBak Kim
f78a994355 Add "jeebak" keymap folder as a copy of the "default" folder 2016-07-30 00:16:04 -07:00
Jack Humbert
7775f3e4b3 Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodox 
Update some obsolete references
 2016-07-30 02:53:29 -04:00
Gergely Nagy
8a9bf1f165 Update some obsolete references 
Some links were still pointing to `/keyboards/ergodox_ez`, while the
directory is `/keyboards/erdogox` now.

Not all references have been updated, and some of the text here and
there may need updating to mention the ErgoDox Infinity too, but that's
out of the scope for this quick fix.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-07-30 08:37:30 +02:00
Jack Humbert
0b7557b60f Merge pull request #587 from fredizzimo/documentation_quick_fix 
Fix the quick aliases documentation section
 2016-07-29 22:33:29 -04:00
Jack Humbert
063983639d Merge pull request #503 from fredizzimo/ergodox_subproject 
Add both Ergodox EZ and Infinity Ergodox as sub-projects of Ergodox
 2016-07-29 22:32:27 -04:00
Fred Sundvik
7d55951050 Fix the quick aliases documentation section 
Also move all keyboard customization documentation under the
"Going Beyond the keycodes" heading.
 2016-07-29 22:47:35 +03:00
Fred Sundvik
566c79554e Small fix for infinity include guard 2016-07-29 21:09:42 +03:00
Fred Sundvik
6e8a5aca9d Fix typo in the readme. 2016-07-29 21:09:41 +03:00
Fred Sundvik
401dd09077 A couple of more Ergodox readme fixes 2016-07-29 21:09:40 +03:00
Fred Sundvik
c65da1f208 Unify the ErgoDox EZ and Infinity documentation 2016-07-29 21:09:39 +03:00
Fred Sundvik
44cefcb40a Refer to the right path in the readme 2016-07-29 21:09:38 +03:00
Fred Sundvik
349f189e83 Move Ergodox readme from ez subfolder to parent 2016-07-29 21:09:37 +03:00
Fred Sundvik
ad416fb1a3 Include the main Makefile before including Ergodox infinity drivers 2016-07-29 21:09:37 +03:00
Fred Sundvik
592ef7c6f0 Move Infinity Ergodox drivers to subproject, and fix makefile 2016-07-29 21:09:36 +03:00
Fred Sundvik
37052a53f1 Remove the Infinity Ergodox default keymap 2016-07-29 21:09:35 +03:00
Fred Sundvik
650298cec3 Cleanup the townk_osx config.h and make files 2016-07-29 21:09:34 +03:00
Fred Sundvik
fd7f20b029 Rename supercoder config_user to config.h 
Also fixup the include path of parent config
 2016-07-29 21:09:33 +03:00
Fred Sundvik
426e9ecc6f Fix config.h include guards 2016-07-29 21:09:32 +03:00
Fred Sundvik
a6577b272e Define weak matrix user function for Infinity Ergodox 
So that a few keyboards, which don't use them, links properly.
 2016-07-29 21:09:31 +03:00
Fred Sundvik
bf1c865c7a Speed up ChibiOS keymap compilation 
By sharing the external library object files between the whole
keyboard, instead of re-compiling them for each keymap.
 2016-07-29 21:09:30 +03:00
Fred Sundvik
1641743b9d Change _delay_ms to wait_ms in algernon keymap 2016-07-29 21:09:21 +03:00
Fred Sundvik
e7670f6d19 Move some of the Ergodox config settings to shared 2016-07-29 20:48:22 +03:00
Fred Sundvik
e0f28c2b10 Add empty led control functions to Infinity Ergodox 
So that most keymaps compiles and links
 2016-07-29 20:48:21 +03:00
Fred Sundvik
e01b4c3fd9 Most ergodox keymaps compiles on Infinity 
There are linker errors due to missing led funcitonality though
 2016-07-29 20:48:20 +03:00
Fred Sundvik
b0376687f4 All Ez keymaps compiles 2016-07-29 20:48:19 +03:00
Fred Sundvik
9af995c59b Initial structure for Ergodox as subprojects 
Only the EZ default keymaps compiles at the moment though.
 2016-07-29 20:48:04 +03:00
Erez Zukerman
30003d48f9 Merge pull request #584 from algernon/ergodox-ez/algernon 
ergodox_ez: Upgrade my keymap to v1.4
 2016-07-29 08:11:37 -04:00
Erez Zukerman
64e76f6ed3 Merge pull request #583 from coderkun/coderkun_neo2 
Ergodox EZ: update keymap “coderkun_neo2”
 2016-07-29 08:10:46 -04:00
Erez Zukerman
3c235b4bf9 Merge pull request #580 from MatsLanGoH/patch-1 
Fixed a typo
 2016-07-29 08:09:05 -04:00
Gergely Nagy
f82437f08e ergodox_ez: Upgrade my keymap to v1.4 
* When toggling the key logging on or off, the LEDs will do a little dance.
* The keylogger is now optional, but enabled by default. Use `KEYLOGGER_ENABLE=no` on the `make` command line to disable it.
* The `TAB`/`ARRW` key was turned into a tap-dance key, allowing one to toggle the **ARROW** layer on by double-tapping, and as such, avoid the need to hold the key.
* The `-`/`_` key was turned into a tap-dance key too.
* There is now a way to travel time with the keyboard, toggle the feature on by hitting `LEAD t`.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-07-29 12:24:33 +02:00