Commit graph

1821 commits

Author SHA1 Message Date
deepshitgoeshere
e8f17e5136 Delete dfu-programmer.exe 2016-02-25 22:26:44 +01:00
Lucas Hecht
cae9993a25 Merge branch 'jackhumbert-master' 2016-02-25 21:45:28 +01:00
Lucas Hecht
34a7012a33 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into jackhumbert-master 2016-02-25 21:40:16 +01:00
Lucas Hecht
bbfdfdcc5f delete old keymap (keymap_eigen.c) 2016-02-25 21:39:32 +01:00
Lucas Hecht
6280adbb6e Added keymap "lucas.c" 2016-02-24 22:54:39 +01:00
Stephan Bösebeck
3c2f935d87 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-02-24 17:06:32 +01:00
Jack Humbert
11c591c30d Merge pull request #158 from DidierLoiseau/eclipse-config
Add Eclipse settings files to .gitignore
2016-02-23 11:44:14 -05:00
Jack Humbert
af6163f934 Merge pull request #159 from Keller-Laminar/patch-1
Include Dvorak underscore and plus keys.
2016-02-22 13:12:19 -05:00
Keller-Laminar
233af3a41c Include Dvorak underscore and plus keys.
There were previously no Dvorak specific underscore and plus key codes. For a keyboard like the Planck which has layers directly to shifted versions of special character keys you were unable to produce those characters using the Lower layer.
2016-02-22 13:06:26 -05:00
Jack Humbert
d33681aa22 Merge pull request #157 from DidierLoiseau/typematrix
Small fixes and improvements to tm2030 layout
2016-02-21 13:35:08 -05:00
Didier Loiseau
e63126ace2 Added eclipse settings files to .gitignore 2016-02-21 19:23:28 +01:00
Didier Loiseau
a40273c7d7 Updated tm2030 keymap.hex 2016-02-21 19:10:03 +01:00
Didier Loiseau
e336af79eb Fixed compilation warnings due to missing return statements 2016-02-21 18:56:21 +01:00
Jack Humbert
b694fb3417 Merge pull request #153 from spydon/xmonad_keymap
Keymap optimized for xmonad
2016-02-21 12:35:46 -05:00
Jack Humbert
49cb207def Merge pull request #155 from vincent-pochet/fr_ch_extra_keymap
Add extra keymap for swiss french keyboard
2016-02-21 12:35:10 -05:00
Vincent Pochet
1934e8a270 Add extra keymap for swiss french keyboard 2016-02-20 14:01:28 +01:00
Lukas Klingsbo
39ed50f605 Added a keymap optimized for xmonad
The M(1) function changes layer temporarily (so that numbers can be used)
and holds LGUI which makes it possible to easily change virtual screens
and swap windows inbetween them.
2016-02-18 21:27:02 +01:00
Jack Humbert
a6414eb257 Merge pull request #145 from gerbercj/feature/atreus_astar
Add support for Atreus running on A-Star
2016-02-17 21:18:13 -05:00
Chris Gerber
1db3558a92 Change default controller for Atreus from Teensy2 to A-Star 2016-02-17 19:14:25 -05:00
Chris Gerber
47dcec2945 Add support for Atreus running on A-Star 2016-02-15 20:53:56 -05:00
Stephan Bösebeck
f0dfe8ab97 testing moving the 6 to the left, having one key more on the right used for hash now
feels a bit more natural to me. Need to investigate further.
2016-02-15 14:13:29 +01:00
Erez Zukerman
2c29ce3cfe Merge pull request #141 from XenoBits/master
Ergodox EZ new keymap for C# developers
2016-02-12 08:50:01 -05:00
Maxime Millet
9eea6850f9 Another readme.md improvement 2016-02-12 12:01:36 +01:00
Maxime Millet
8f1bafece5 Improved readme 2016-02-12 12:00:13 +01:00
Maxime Millet
8c051f2d05 Added C# developer keymap 2016-02-12 11:54:27 +01:00
Jack Humbert
043ac26c24 Merge pull request #140 from lasko/master
A slightly different default layout
2016-02-11 23:58:08 -05:00
Lasko Height
d290e09d7b Added pageup, pagedown, home, and end keys 2016-02-11 20:52:59 -08:00
Lasko Height
006d277ec1 Added a Tenkey layer and moved the del key 2016-02-11 20:46:12 -08:00
Lasko Height
d3488f131c Adding my initial layout 2016-02-11 20:20:09 -08:00
Lasko Height
073a6c206e Adding my initial layout 2016-02-11 20:19:07 -08:00
Erez Zukerman
f4fc7fd4d5 Merge pull request #139 from joarau/norwegian-colemak-ergodox-with-norwegian-definitions
Norwegian Colemak Ergodox and Norwegian key definitions
2016-02-11 20:40:47 -05:00
joar
2f7cda63d0 Norwegian Colemak Ergodox and Norwegian key definitions 2016-02-11 16:28:28 +01:00
Erez Zukerman
9f6966f765 More tweaks to experimental layout 2016-02-11 16:55:10 +02:00
Erez Zukerman
9e075e28be Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-02-11 16:39:40 +02:00
Erez Zukerman
ec4428b1c6 Merge pull request #138 from Willyfrog/master
ergodox_ez for emacs + mac + altgr users
2016-02-10 15:40:25 -05:00
Guillermo Vayá
f96186ed9c add image 2016-02-10 19:04:26 +01:00
Erez Zukerman
8aeaa6df81 Merge pull request #137 from uzytkownik/master
Add mpiechotka ergodox ez keymap
2016-02-10 08:24:06 -05:00
Guillermo Vayá
3c805548d9 added .hex file 2016-02-10 09:47:11 +01:00
Maciej Piechotka
03f61dcdb4 Add mpiechotka ergodox ez keymap 2016-02-09 23:37:02 -08:00
Jack Humbert
0206976267 Merge pull request #136 from cbbrowne/master
Random improvements
2016-02-08 14:25:22 -05:00
Christopher Browne
8079dc0682 Eliminate switch statement by using contiguous character ranges 2016-02-08 11:25:55 -05:00
Christopher Browne
bbcc1046a6 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-02-08 10:53:50 -05:00
Erez Zukerman
cd90dd9f6d Corrects typo 2016-02-08 15:22:56 +02:00
Erez Zukerman
67f14d938b Merge pull request #130 from jacobono/jacobono
Jacobono
2016-02-08 08:01:54 -05:00
Erez Zukerman
ac84fa47fc Updates documentation, adds Cmd/Win dual-function key 2016-02-08 14:56:19 +02:00
Jack Humbert
f575079357 Merge pull request #134 from dragon788/patch-2
Added note about using avr_setup.sh
2016-02-07 22:00:45 -05:00
dragon788
34a8ad506c Added note about using avr_setup.sh
On most Linux distributions the avr_setup.sh script can be sourced ```. avr_setup.sh``` or under Bash ```source avr_setup.sh```. This will try and detect the appropriate package manager and install the required packages.
2016-02-07 17:16:28 -06:00
Didier Loiseau
a2f6ab16c0 FN macro: use layer_invert() instead of modifying layer_state directly
- fixes stuck keys from the temporary layers
  (see also jackhumbert/qmk_firmware#78)
- removed the workaround for jackhumbert/qmk_firmware#81
  (using layer_invert() fixes the problem)
2016-02-07 23:33:37 +01:00
Didier Loiseau
7ba42b994b Fixed inconsistency between comment and actual numeric layer
- KC_INS should only be present on Fn layer
2016-02-07 23:33:37 +01:00
DidierLoiseau
47fc8b8dbd Fixed link to Magic doc in Dvorak section 2016-02-07 23:31:27 +01:00