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

545 commits

Author SHA1 Message Date
cbbrowne
90abe70586 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-22 13:16:49 -04:00
Sean Reifschneider
0418ecc073 Changes from review by @fredizzimo and @Xyverz 2016-08-22 10:26:18 -06:00
IBNobody
705c775a4a Nightly 
Only major change to qmk was the addition of A0-A7 pins for the AT90USB
 2016-08-21 22:05:55 -05:00
Xyverz
02f4e5b064 Merge remote-tracking branch 'upstream/master' 2016-08-21 19:02:32 -07:00
Xyverz
364b77563c Added missing key K3A to KEYMAP() macro in tv44.h 2016-08-21 18:59:10 -07:00
dbroqua
d7b6d74842 - Inverted key Tab and Esc 
- Reorganised bottom row
 2016-08-21 23:20:24 +02:00
Kyle Berry
30de8663a9 Fixing Dvorak 
Updating with proper Dvorak layout.
 2016-08-21 14:01:43 -07:00
Joe Wasson
c20bf83afd Add one-hand key to planck/experimental keymap. 2016-08-20 18:47:06 -07:00
Joe Wasson
66adbfcab5 Add default swap configs for a couple of boards. 2016-08-20 17:46:53 -07:00
IBNobody
4807feec8a In Progress Merge 2016-08-20 14:49:16 -05:00
IBNobody
5febdb0a3c Initial Commmit 2016-08-20 10:26:36 -05:00
Jack Humbert
a3f726174c Merge pull request #665 from linsomniac/keymap_jafo 
Adding jafo layout.
 2016-08-20 11:04:54 -04:00
Jack Humbert
a592c9dcf4 Merge pull request #658 from Xyverz/master 
Got rid of all the kludge in my ErgoDox keymap.
 2016-08-20 11:04:02 -04:00
Jack Humbert
7cef0f56e9 Merge pull request #630 from nrrkeene/master 
The Ordinary Layout is the unsurprising layout
 2016-08-20 11:01:22 -04:00
Xyverz
70d4ea7904 Merge remote-tracking branch 'upstream/master' 2016-08-19 22:50:55 -07:00
Xyverz
e4984f65de Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md. 2016-08-19 22:45:20 -07:00
Xyverz
aff792545d Changed my keymap to match normal keymaps. 2016-08-19 22:30:34 -07:00
Nicholas Keene
6a9a6b9477 The Ordinary Layout is boring because all the keys are where you expect them to be 2016-08-19 23:44:08 -05:00
Nicholas Keene
8f78ba1f73 The Ordinary Layout is boring because all the keys are where you expect them to be 2016-08-19 23:38:13 -05:00
Sean Reifschneider
d98e5ddf30 Tweaks after review. 2016-08-19 21:50:04 -06:00
Sean Reifschneider
9e03517ae5 Restructuring of the ergodox README. 2016-08-19 21:47:00 -06:00
Sean Reifschneider
a25480b3b5 Bringing over changes from default map. 2016-08-19 20:55:50 -06:00
Fred Sundvik
da226e6126 Update keyboard readme files with new makefile instructions 2016-08-20 03:56:48 +03:00
Fred Sundvik
051017c312 Split subproject make files into Makefile and rules.mk 2016-08-20 03:56:23 +03:00
Fred Sundvik
44441de8ca Split keyboard makefiles into rules and Makefile 2016-08-20 03:56:08 +03:00
Jack Humbert
a3a312f8f4 Merge pull request #662 from toneman77/iso_satan 
Satan Cleanup
 2016-08-19 17:55:54 -04:00
Jack Humbert
47b670bced Merge pull request #663 from tomb0y/kc60_workman_dead 
Add the workman-dead layout for kc60
 2016-08-19 17:54:12 -04:00
Sean Reifschneider
30c63b1495 Noting the change directory. 2016-08-19 14:52:05 -06:00
Sean Reifschneider
b918aa6bab Adding submodule note. 2016-08-19 14:49:29 -06:00
Sean Reifschneider
50531068b3 Adding jafo layout. 2016-08-19 14:42:41 -06:00
Sean Reifschneider
32216066e7 Adding nicer Infinity build instructions. 2016-08-19 14:36:41 -06:00
zs
a1da23d827 Add the workman-dead layout for kc60 2016-08-19 21:59:08 +02:00
dbroqua
b9a284352e - Moved Insert/Del in Esc layer 2016-08-19 21:10:07 +02:00
dbroqua
11aa19a626 - Updated lower and raise layer 2016-08-19 21:00:24 +02:00
dbroqua
c6e733afce - Added readme file and layout preview 2016-08-19 14:17:07 +02:00
dbroqua
b4f23b146f - Moved Home/End/PgUp/PgDn on arrow keys 2016-08-19 14:01:37 +02:00
Toni
bc0bd11430 forgot media keys 2016-08-19 10:24:48 +02:00
Toni
225c73ed30 Merge remote-tracking branch 'origin/master' into amj60 
merge with upstream
 2016-08-19 09:49:56 +02:00
dbroqua
31120ed166 - Moved Brite function on esc to avoid conflict with ctrl key. 2016-08-19 09:39:25 +02:00
dbroqua
578b7e969e - Updated dbroqua layout for planck keyboard 2016-08-19 09:19:55 +02:00
Xyverz
ed1291bfbd Added compatibility for the Infinity ErgoDox to my Ergodox keymap. 
Updated readme.md to reflect this change.
 2016-08-18 22:43:31 -07:00
Damien
a5e6da7aa8 Added dbroqua layout for planck keyboard 2016-08-18 22:25:13 +02:00
Jack Humbert
6c359cabbf Merge pull request #652 from iFreilicht/master 
Added S60-X keyboard
 2016-08-18 10:34:22 -04:00
Jack Humbert
8f32595820 Merge pull request #650 from Xyverz/master 
Minor changes to keymaps and other files
 2016-08-18 10:31:17 -04:00
Toni
21dc8381d1 made a correct default KEYMAP. moved the old one to KEYMAP_ANSI 
fixed all layouts that were referencing KEYMAP to KEYMAP_ANSI
whitespace prettyfying
 2016-08-18 15:57:17 +02:00
Toni
fe90653886 smyll typo fixed 2016-08-18 15:32:06 +02:00
Toni
0e86c85241 amj60 variant of the readme 2016-08-18 15:30:52 +02:00
Toni
0edf7c7cad first attempt at documentation for the amj60 board 2016-08-18 15:22:34 +02:00
Gergely Nagy
0d9d4b8658 planck/circuit: Update after the latest tap-dance change 
Fixes #653.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-08-18 13:22:16 +02:00
Toni
068e76bbf0 uniform whitespace 2016-08-18 13:10:02 +02:00
Toni
387bd772e1 initial commit for the AMJ60 PCB 2016-08-18 13:06:16 +02:00
Felix Uhl
dbfb27326b Added info to docs 2016-08-18 12:15:10 +02:00
Felix Uhl
ed6ecff292 Merge pull request #1 from jackhumbert/master 
Merging from base Repo
 2016-08-18 12:02:31 +02:00
Felix Uhl
73f13c8f26 Bugfixes 2016-08-18 11:56:44 +02:00
Felix Uhl
a72dc6da70 Final link fix 2016-08-18 11:45:56 +02:00
Felix Uhl
406ae1a2eb More link fixing 2016-08-18 11:43:32 +02:00
Felix Uhl
aa71ebfbba Fixed links again 
Note to self: check before commiting.
 2016-08-18 11:41:52 +02:00
Felix Uhl
d34c0a2fc1 Fixed dead link 2016-08-18 11:40:05 +02:00
Felix Uhl
738151d12a Minor documentation changes 2016-08-18 11:38:04 +02:00
Felix Uhl
c5f13e5836 Fixed links again 2016-08-18 11:16:10 +02:00
Felix Uhl
a865995595 Fixed pictures and links 2016-08-18 11:11:42 +02:00
Felix Uhl
2618260b34 Documentation overhaul. 2016-08-18 10:37:32 +02:00
Toni
864e26f439 cleanup, readability , shift swap in ISO_SPLIT_RSHIFT 2016-08-18 10:06:13 +02:00
Felix Uhl
07924511f3 Small changes, renamed keymap 
Added MicMute
Revived all dead keys
Removed OS Shift
 2016-08-18 10:01:46 +02:00
Toni
64ecb15310 corrected the split rshift key to reality 
fixed my keymap in the process to adjust to that
 2016-08-18 09:56:11 +02:00
Xyverz
aa37a57e0f One last change to the readme. 2016-08-18 00:38:25 -07:00
Xyverz
eb81978ecb One last formatting change 2016-08-18 00:35:32 -07:00
Xyverz
118ad691c4 more formatting changes 2016-08-18 00:34:22 -07:00
Xyverz
4dd641a128 Hopefully this fixes the layout diagrams. 2016-08-18 00:27:54 -07:00
Xyverz
035290b7d8 Added a readme, tidied up comments in the keymap. 2016-08-18 00:22:56 -07:00
Xyverz
47beb763e8 Returned RAISE and LOWER buttons to their original functions - too many inopportune ENTER inputs. :-( 2016-08-18 00:05:24 -07:00
Xyverz
67227e4c71 Merge branch 'master' of https://github.com/Xyverz/qmk_firmware 2016-08-17 23:55:58 -07:00
Xyverz
385b827c85 Merge remote-tracking branch 'upstream/master' 
this merge is necessary,
 2016-08-17 23:53:56 -07:00
Jack Humbert
f4f80a0e3a Merge pull request #645 from algernon/f/tap-dance/buffering 
tap-dance rework
 2016-08-17 21:15:29 -04:00
Jack Humbert
1442a882d4 Merge pull request #640 from toneman77/iso_satan 
heavily modified spacefn layout for iso boards using the satan PCB
 2016-08-17 21:11:59 -04:00
Jack Humbert
f59b61332f Merge pull request #638 from premek/master 
Split layout for planck
 2016-08-17 21:11:02 -04:00
Xyverz
ef95c10c66 Update readme.md 2016-08-17 14:55:01 -07:00
Xyverz
e3486caf87 Create readme.md 2016-08-17 14:54:05 -07:00
Toni
c024de4a87 wring keypress for german iso fixed. prettified 2016-08-17 15:33:14 +02:00
Gergely Nagy
29f64d7a93 tap-dance: Major rework, to make it more reliable 
This reworks how the tap-dance feature works: instead of one global
state, we have a state for each tap-dance key, so we can cancel them
when another tap-dance key is in flight. This fixes #527.

Since we have a state for each key, we can avoid situation where a keyup
would mess with our global state. This fixes #563.

And while here, we also make sure to fire events only once, and this
fixes #574.

There is one breaking change, though: tap-dance debugging support was
removed, because dumping the whole state would increase the firmware
size too much. Any keymap that made use of this, will have to be
updated (but there's no such keymap in the repo).

Also, there's a nice trick used in this rework: we need to iterate
through tap_dance_actions in a few places, to check for timeouts, and so
on. For this, we'd need to know the size of the array. We can't discover
that at compile-time, because tap-dance gets compiled separately. We'd
like to avoid having to terminate the list with a sentinel value,
because that would require updates to all keymaps that use the feature.
So, we keep track of the highest tap-dance code seen so far, and iterate
until that index.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-08-17 15:05:58 +02:00
Toni
8e142d8cbe no more warning thanks to iFreilicht's tip with undef 2016-08-16 17:35:03 +02:00
Toni
deedd2f408 in accordance to keymap_makefile_example.mk 2016-08-16 16:44:12 +02:00
Toni
03a24eb86a minor grammer fixes 2016-08-16 16:35:57 +02:00
Toni
b1ac91a040 big cleanup and minor refactoring. thanks iFreilicht. 2016-08-16 16:32:42 +02:00
Přemek Vyhnal
2ebfdcac40 Update readme.md 2016-08-16 01:07:34 +02:00
premek
a75d4bd593 premek split layout 2016-08-16 00:50:35 +02:00
premek
5abb05ca40 premek split layout 2016-08-16 00:44:58 +02:00
Matt
f5ed3e5155 Added my custom Planck layout called Circuit. 
* Layout has image and readme, as well as documentation in the code.
 2016-08-15 17:26:01 -05:00
Felix Uhl
faa3fd48ae Minor changes to felix keymap 2016-08-15 22:57:26 +02:00
Toni
68005ce602 grammar 2016-08-15 21:47:07 +02:00
Toni
7e1be3ae7c reference to reddit post and Terry Mathews 2016-08-15 21:44:20 +02:00
Toni
b8cbf7c9c0 script now waits for the user to press the button 2016-08-15 21:18:25 +02:00
Toni
396b59f256 readme now with picture 2016-08-15 21:12:49 +02:00
Toni
94ff9c9fa5 more prettyness 2016-08-15 21:04:11 +02:00
Toni
14de76ea80 Update readme.md 
typo
 2016-08-15 21:02:40 +02:00
Toni
5cf5e27dcd Update readme.md 
attempt to prettify the table
 2016-08-15 21:02:07 +02:00
Toni
77f3efbef6 more information. first steps in markdown 2016-08-15 20:59:50 +02:00
Toni
ca4968bc44 readme.md added 2016-08-15 20:46:38 +02:00
Toni
f89aec98ae removed my personal stuff 2016-08-15 20:32:45 +02:00
Toni
5ecebc3a66 Merge remote-tracking branch 'origin/master' into iso_split_rshift 
no idea what is merged
 2016-08-15 19:48:53 +02:00
cbbrowne
8a14952e44 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-15 11:19:24 -04:00
Xyverz
5c5c3e626b Adding KC_BSPC to the LT() macro for LOWER resulted in a backspace stroke being sent if the LOWER key was used too quickly. 
Switching back to original LOWER macro, but keeping the new RAISE macro.
 2016-08-15 06:57:24 -07:00
Xyverz
8e2d69d5a2 Adding u/treasuredfrog's hack to use LT() with the RAISE and LOWER macros. 2016-08-15 06:28:39 -07:00
Xyverz
4f0bcfe724 Merge remote-tracking branch 'upstream/master' 2016-08-14 20:27:41 -07:00
Xyverz
055b887b0d Setup the bottom-row modifiers to be mac-like in their arrangement. 2016-08-14 20:25:52 -07:00
di0ib
959c48e146 moved to handwired folder 2016-08-14 14:13:58 -10:00
di0ib
288bf4faa3 Merge branch 'master' of https://github.com/di0ib/qmk_firmware 2016-08-14 13:20:00 -10:00
di0ib
df56d742b1 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-14 13:19:20 -10:00
Jack Humbert
4865e6f81f Merge pull request #631 from jacwib/master 
Jacwib's keymap
 2016-08-14 18:50:22 -04:00
di0ib
503ec7f9f6 Updated readme 
Added link to Minorca/Sebright blog.
 2016-08-14 11:15:46 -10:00
di0ib
f58a67c991 cleanup readme 2016-08-14 11:10:12 -10:00
di0ib
1eaa685872 Correct data pin to D5 2016-08-14 11:08:15 -10:00
di0ib
65060ad000 Fix list 2016-08-14 11:07:35 -10:00
di0ib
dde9ee572c clean up readnme 2016-08-14 11:06:46 -10:00
di0ib
b4218a2b3e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-14 10:58:22 -10:00
di0ib
c6c2c3fc14 minorca 
minirca with RGB keymap
 2016-08-14 10:58:10 -10:00
Toni
5705a40320 increased readability with a defince 2016-08-14 20:06:47 +02:00
Felix Uhl
df01d502d4 Ported all keymaps 
Old TMK keymaps were ported and confirmed to compile
All keymaps compiled and added to zip-archive.
Documentation was updated.
 2016-08-14 13:07:03 +02:00
Felix Uhl
6774f300da Update readme.md 2016-08-14 11:48:59 +02:00
Felix Uhl
ec75c04663 Fixed links to keymap sources 2016-08-14 11:44:43 +02:00
jacwib
54e37fd2d1 Fix bug 2016-08-14 11:08:01 +02:00
jacwib
6ba27ea318 Remove pointless comments 2016-08-14 11:02:46 +02:00
jacwib
e4e13ddc54 Update readme.md 2016-08-14 10:57:47 +02:00
jacwib
26f4a0cf04 Update Makefile 2016-08-14 10:49:26 +02:00
jacwib
62004866b3 Update config.h 2016-08-14 10:49:06 +02:00
jacwib
cf91aa416a Update keymap.c 2016-08-14 10:48:52 +02:00
jacwib
1ab78110bd Update readme.md 2016-08-14 10:48:22 +02:00
jacwib
880486bd24 Jack's keymap. 2016-08-14 10:46:40 +02:00
Xyverz
049343e523 Added my own layout to the Phantom. 2016-08-14 00:33:11 -07:00
Xyverz
97fca1efff Fixing a mixup. Tidying up the keymap. 2016-08-13 20:14:27 -07:00
Xyverz
1920c290a4 Merge remote-tracking branch 'upstream/master' 2016-08-13 19:51:49 -07:00
Erez Zukerman
6323f3d1e7 Merge pull request #623 from algernon/ergodox-ez/algernon 
ergodox: Update my keymap to v1.5
 2016-08-13 20:12:15 -04:00
Felix Uhl
911cc68325 Added all original S60-X keymaps 
All keymaps that were included in VinnyCordeiro's repository were ported to QMK.
Main Readme was copied over from VC's repo, slightly altered.
Main Makefile was updated to reflect VC's original configuration.
Small changes in felix keymap.
 2016-08-14 00:41:09 +02:00
Nicholas Keene
ba7f2b1d3f The Ordinary Layout is the unsurprising layout 2016-08-13 15:53:03 -05:00
Ian Sterling
e87506767c Removal of old minivan44 folder. 2016-08-13 10:44:42 -07:00
Ian Sterling
2d0f585e42 Renamed minivan44 to tv44 in all occurrences per wishes of 
Jack and Evan.
 2016-08-13 10:36:08 -07:00
Toni
e0aa216905 Merge remote-tracking branch 'origin/master' into iso_split_rshift 
update from Upstream
 2016-08-13 09:24:24 +02:00
Ian Sterling
c07fe96581 Adding the MiniVan44 aka TheVan 44 by u/evangs to the repo. 
Initial Commit.
 2016-08-12 23:45:40 -07:00
Xyverz
3bae791372 Update keymap.c 2016-08-12 22:30:01 -07:00
Ian Sterling
458607ee5e Corrections to the Atreus Makefile and updates to my keymap 2016-08-12 22:26:30 -07:00
Callum Oakley
993d72b11f added a lock screen key 2016-08-12 21:05:52 +01:00
Toni
cafa528b88 only aesthetics 2016-08-12 19:14:48 +02:00
cbbrowne
c21a882ec9 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-12 11:17:34 -04:00
Gergely Nagy
b98d47abe5 ergodox: Update my keymap to v1.5 
Major changes include:

* The **1HAND** layer has been removed.
* A `Delete` key is now available on the right thumb cluster.
* The **ADORE** layer received a major update, see the updated layout
  image.
* It is now possible to enable automatic logging for the **ADORE**
  layer, by setting the `ADORE_AUTOLOG` makefile variable to `yes` when
  compiling the keymap. It is off by default.
* The `~` key and the `Media Next/Prev` key have been swapped on
  the **base** layer.
* On the **ARROW** layer, `Backspace` has been replaced by `Enter`.
* There is some experimental support for entering Unicode symbols.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-08-12 16:36:07 +02:00
shela
11e23fd3fd add new line 2016-08-12 21:45:36 +09:00
shela
c9272fee08 add new line 2016-08-12 21:33:32 +09:00
shela
1c8d64d3b3 add my keymap 2016-08-12 21:24:43 +09:00
Jack Humbert
97cd7afc32 Merge pull request #618 from denolfe/master 
Add denolfe satan keymap
 2016-08-11 21:34:34 -04:00
Jack Humbert
a087a207f1 Merge pull request #608 from finleye/master 
Adds keymap based on Kinesis advantage
 2016-08-11 21:32:32 -04:00
Felix Uhl
4725942dc7 Small changes 
Enabled Bootmagic and ISO layouts on felix keymap
Added unused pins
 2016-08-11 21:49:10 +02:00