locker98/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,943 Commits 1 Branch 0 Tags 293 MiB
93da70a43a
Commit Graph

1943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wojciech Siewierski
4dce7258d1 Cleanup after merge 
- remove a superfluous parenthesis
- wrap lines longer than 80 characters
- add const specifiers where appropriate
- remove unnecessary casts
 2016-04-02 19:29:01 +02:00
Wojciech Siewierski
97cc44e063 Merge branch 'modifier-release-fix' of https://github.com/eltang/qmk_firmware into modifier-release-fix 2016-04-02 19:25:10 +02:00
eltang
5a9091689c Update action.c 2016-04-02 10:00:31 -07:00
eltang
6c8e374d57 Update action.c 2016-04-02 09:59:53 -07:00
eltang
f4f592910c Update action.c 2016-04-02 09:34:01 -07:00
eltang
da101b8866 Update action.c 2016-04-02 09:29:32 -07:00
eltang
fddccc95fe Update action.c 2016-04-02 09:13:13 -07:00
eltang
680301e3e3 Update action.c 2016-04-02 06:48:44 -07: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
Eric-L-T
f5365d1c1c Update action.c 2016-04-01 20:04:13 -07:00
Eric-L-T
307f1dee21 Update action.c 2016-04-01 19:54:02 -07:00
Eric-L-T
420fc8620b Update action.c 2016-04-01 18:26:43 -07: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
Eric-L-T
9a35f01c55 Update action.c 2016-04-01 13:49:03 -07:00
Eric-L-T
cd8dd1b6d6 Update action.h 2016-04-01 13:45:01 -07:00
Eric-L-T
317455178d Update action.c 2016-04-01 13:43:49 -07: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
IBNobody
12cb69cdb2 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-04-01 00:10:47 -05:00
IBNobody
c12be71d11 Added Error Checking to Setup.bat #2 
Added check for the MinGW directory. Fixed a bug with script exiting out
of a CMD window. Fixed a bug with script dropping user into MinGW
directory. Fixed a bug with RD not deleting temp. Fixed a bug with
PNPUtil.exe not being present in the path.
 2016-04-01 00:10:21 -05: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