Commit Graph

1904 Commits

Author SHA1 Message Date
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
Jack Humbert
bc4f20853d advanced macro stuff for README 2016-02-07 16:28:48 -05:00
Jack Humbert
8967c0705b advanced macro stuff for README 2016-02-07 11:15:03 -05:00
Jack Humbert
cf2c641557 advanced macro stuff for README 2016-02-07 11:14:47 -05:00
Jack Humbert
3a6e88d6f8 advanced macro stuff for README 2016-02-07 11:13:22 -05:00
Jack Humbert
e6a2c77fde README changes 2016-02-07 10:41:00 -05:00
Jack Humbert
623666888f Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-02-07 10:39:01 -05:00
Jack Humbert
5dc0d1dc20 README changes 2016-02-07 10:38:57 -05:00
Jack Humbert
8d785de796 Merge pull request #131 from Vifon/patch-1
Use boolean AND instead of bitwise (possible typo)
2016-02-07 09:30:39 -05:00
Wojciech Siewierski
65b41e2e59 Use boolean AND instead of bitwise (possible typo)
Fortunately seems harmless.
2016-02-07 11:48:28 +01:00
Christopher Browne
fe1519de07 Add in XOR of lowest 8 bits of system timer to encourage more randomness of the digits/letters chosen 2016-02-06 19:42:08 -05:00
Daniel Mijares
b5b9885df7 add hex file 2016-02-06 13:59:30 -05:00
Daniel Mijares
f5c1d6d1db my personal ergodox keymap layout
with pngs of layout and readme
2016-02-06 11:38:20 -05:00
Jack Humbert
240e8c6340 Merge pull request #129 from cbbrowne/master
Example of some "Random Keys"
2016-02-05 19:12:05 -05:00
Jack Humbert
832575f2e7 Update PCB_GUIDE.md 2016-02-05 19:06:25 -05:00
Erez Zukerman
3c683aa9f2 Fixes CM_SCLN and updates docs for Colemak 2016-02-05 16:28:24 +02:00
Erez Zukerman
1b0d0c6848 Tweaks symbol layer (see changleog) 2016-02-05 16:22:21 +02:00
Jack Humbert
51964eda0c Merge pull request #126 from fernandodeperto/keymap_nordic
Fix 2 macros in the Nordic keymap
2016-02-04 20:01:57 -05:00