Alex Johnstone
1facc53a26
Merge pull request #5 from jackhumbert/master
...
Sync with upstream
2016-04-05 07:44:37 -07:00
Jack Humbert
931b0a79fc
updates to noise
2016-04-05 09:44:01 -04:00
Jack Humbert
e1020672ac
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
2016-04-05 09:21:49 -04:00
Jack Humbert
976d0a327b
add silent notes
2016-04-05 09:21:44 -04:00
Erez Zukerman
0cdf5d292c
Merge pull request #235 from mbarkhau/master
...
add indent to generated keymap
2016-04-04 08:04:31 +03:00
Jack Humbert
a90d68739a
music mode file
2016-04-03 16:00:10 -04:00
Manuel Barkhau
22691de580
add indent to generated keymap
2016-04-03 21:46:32 +02:00
Erez Zukerman
8d39263d24
Merge pull request #213 from mbarkhau/master
...
Add manuneo layout
2016-04-03 08:56:08 +03:00
Erez Zukerman
ddd122c0f0
Merge pull request #234 from sboesebeck/master
...
several iterations later
2016-04-03 08:46:14 +03:00
Manuel Barkhau
381a9fd553
use action function for unicode
2016-04-02 23:12:38 +02:00
Stephan Bösebeck
f0424a0c0f
Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware
2016-04-02 15:15:21 +02:00
Stephan Bösebeck
71cdfe1168
new keymap
2016-04-02 15:14:14 +02:00
Stephan Bösebeck
aee8715815
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-04-01 23:54:16 +02:00
Stephan Bösebeck
c274699085
minor tweaks at the keymap, new png for documentation
2016-04-01 23:53:09 +02:00
Jack Humbert
de904af360
Merge pull request #233 from tak3over/patch-1
...
Create tak3over.c
2016-04-01 16:31:18 -04:00
tak3over
ad3ec12fb6
Create tak3over.c
...
Custom keymap with an additional function layer for numpad, pgup, pgdn, del, ins, home, end, and additional arrow keys.
2016-04-01 15:26:09 -05:00
Jack Humbert
54b0a2bf76
adding files is always smart
2016-04-01 14:44:08 -04:00
Erez Zukerman
8e72455608
Merge pull request #226 from squisher/dvorak_intl_squisher
...
Squisher's international dvorak variant for ergodox ez
2016-04-01 12:11:17 +03:00
Stephan Bösebeck
dbd4ab3457
fixed de_osx prefix in keymap include to avoid conflicts
2016-03-31 23:15:59 +02:00
Jack Humbert
5a290a42b0
Merge pull request #230 from IBNobody/master
...
Fixed Setup Script
2016-03-31 12:09:05 -04:00
IBNobody
a3ed432273
Drastically rewrote the path script to handle Explorer's stubborn grasp of EnvVars. Tested on Win7.
2016-03-30 16:31:46 -05:00
David Mohr
5fae86849a
Also add compiled hex file
2016-03-30 09:47:34 -06:00
David Mohr
fe6c3e4f0f
Squisher's international dvorak variant for ergodox ez
...
See README.md
2016-03-30 09:47:34 -06:00
Jack Humbert
ae47275bf3
Merge pull request #229 from NoahAndrews/patch-5
...
The readme was also wrong about the conflict between audio and RGB
2016-03-30 11:40:22 -04:00
Noah Andrews
ac3f3a85d5
Update README.md
2016-03-30 11:36:35 -04:00
Jack Humbert
6186de5828
Merge pull request #227 from NoahAndrews/patch-4
...
Fixed minor issues with Preonic readme
2016-03-30 11:07:00 -04:00
Jack Humbert
c3c4012417
Merge pull request #228 from mrfoto/fix-planck-diagram
...
Tiny fix of Planck diagrams
2016-03-30 11:06:07 -04:00
Miha Rekar
3b703eff33
Tiny fix of Planck diagrams
2016-03-30 17:03:03 +02:00
Noah Andrews
09d567045c
Fixed minor issues with Preonic readme
2016-03-30 09:17:06 -04:00
Jack Humbert
47b537c87f
preonic readme
2016-03-30 00:46:45 -04:00
Jack Humbert
e7377dc24b
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
2016-03-30 00:45:48 -04:00
Jack Humbert
b8ac509570
.hex files
2016-03-30 00:45:37 -04:00
Jack Humbert
ac0729787f
preonic update
2016-03-30 00:43:07 -04:00
Jack Humbert
4a676746a6
Merge pull request #224 from NoahAndrews/make-keymap-names-consistent
...
Make keymap names more consistent
2016-03-29 22:37:20 -04:00
Noah Andrews
95fba250ef
Updated several keyboard folders to use new keymap naming scheme
2016-03-29 21:53:36 -04:00
Noah Andrews
e28334017c
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
2016-03-29 20:03:22 -04:00
Jack Humbert
26513b497b
Merge pull request #223 from NoahAndrews/patch-3
...
Fix #198
2016-03-29 16:38:31 -04:00
Noah Andrews
8f1ea16ad5
Fix #198
2016-03-29 16:35:06 -04:00
mbarkhau
77fa2b0056
Update compile_keymap.py
2016-03-29 18:35:47 +02:00
Jack Humbert
49bde5b5c1
Merge pull request #222 from NoahAndrews/patch-2
...
Fix error in Planck makefile comment
2016-03-29 12:30:00 -04:00
Noah Andrews
2ae44470e0
Fix error in Planck makefile comment
...
[This comment](https://www.reddit.com/r/olkb/comments/428umx/rgb_underglow/czaivbc ) states that because both audio output and RGB support require the user of timer 3, they can't be enabled at the same time. That makes sense, I can see where audio.c uses timer 3. But this comment in the code states that the incompatibility is with MIDI support, which doesn't make sense based on what I see in the code. Please enlighten me if I'm mistaken.
2016-03-29 12:06:32 -04:00
Stephan Bösebeck
ac22d1c185
added CTL_Shift / Hash macro
2016-03-29 13:02:14 +02:00
Stephan Bösebeck
f7f4f1725e
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-03-29 07:49:54 +02:00
Jack Humbert
8bbc1dcf4f
Merge pull request #219 from IBNobody/master
...
Master
2016-03-28 23:17:16 -04:00
Jack Humbert
1f86e8da09
Merge pull request #220 from NoahAndrews/improve-buildguide
...
Added clarifying steps to Windows section of build guide
2016-03-28 23:16:36 -04:00
Noah Andrews
60570f3e37
Added clarifying steps to Windows section of build guide
2016-03-28 22:02:52 -04:00
IBNobody
1d13aa933b
Minor Tweaks and Documentation
...
Fixed compiler warning by including bootloader.h in keymap_common.c.
Changed FORCE_NKRO to only be applied if NKRO_ENABLE is defined.
Added extra documentation to the template config.h
2016-03-28 19:45:20 -05:00
Noah Andrews
535daad3cd
Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide
2016-03-28 18:37:39 -04:00
Manuel Barkhau
a2d3c0bd93
add hex file
2016-03-28 23:42:55 +02:00
Manuel Barkhau
295036d4e3
Merge remote-tracking branch 'origin/master'
2016-03-28 21:36:02 +00:00
