darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4692 commits 52 branches 1475 tags 279 MiB
Commit graph

4692 commits

This branch
This branch
All branches
Author SHA1 Message Date
coderkun
049f906b5e Fix keymap “coderkun_neo” to use LALT instead of RALT 2017-04-01 12:17:41 +02:00
coderkun
021edb6ec6 Add several Unicode symbols to keymap “coderkun_neo2” 2017-04-01 12:06:27 +02:00
coderkun
c74f47555c Add keymap diagrams to readme of keymap “coderkun_neo2” 2017-04-01 11:15:20 +02:00
coderkun
605c4129cc Merge branch 'master' into coderkun_neo2 2017-04-01 10:56:29 +02:00
Jack Humbert
3448d5d487 Merge pull request #1132 from akatrevorjay/pr/dfu-serial 
Allow to specify serial to dfu-util flash
 2017-03-31 18:28:26 -04:00
Jack Humbert
ec35fea264 Merge pull request #1190 from osamuaoki/master 
Fix typo
 2017-03-31 18:28:14 -04:00
Jack Humbert
2b4efaba53 Merge pull request #1189 from Zay950/to_push 
Unicode input_mode presistance
 2017-03-31 18:27:44 -04:00
Osamu Aoki
caab4d7e45 Fix typo 2017-04-01 01:39:00 +09:00
nielsenz
d1e66e2e07 Worked around some new Makefile issues. 2017-03-30 20:10:34 -07:00
nielsenz
7e54332890 Pulling and pushing troubles 2017-03-30 19:15:43 -07:00
Callum Oakley
b9225a28f2 changed hotkey cluster to accomodate awkward software... again 2017-03-30 19:08:15 -07:00
Callum Oakley
200ae0c519 changed hotkey cluster to accomodate awkward software 2017-03-30 19:08:15 -07:00
Travis La Marr
eedb767279 Add RN42 Bluetooth module support 
Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS.
 2017-03-30 19:08:15 -07:00
Osamu Aoki
ccbdf90f02 Update to match QMK keymap 2017-03-30 19:08:15 -07:00
Osamu Aoki
3a1ee48cda Typo fix 2017-03-30 19:08:15 -07:00
Jack Humbert
b441468795 Merge pull request #1188 from hot-leaf-juice/master 
changed hotkey cluster to accomodate awkward software... again
 2017-03-30 10:24:37 -04:00
Callum Oakley
3f3f208113 changed hotkey cluster to accomodate awkward software... again 2017-03-30 14:20:18 +01:00
Jack Humbert
8994fca4ee Merge pull request #1187 from hot-leaf-juice/master 
changed hotkey cluster to acommodate awkward software
 2017-03-30 08:46:55 -04:00
Jack Humbert
d359b55520 Merge pull request #1185 from exiva/rn42_bluetooth 
Add RN42 Bluetooth module support
 2017-03-30 08:46:38 -04:00
Jack Humbert
338edcabd7 Merge pull request #1184 from osamuaoki/master 
Update keymap.md to QMK
 2017-03-30 08:45:56 -04:00
Callum Oakley
d145a1192f changed hotkey cluster to accomodate awkward software 2017-03-30 13:22:16 +01:00
Travis La Marr
71da013995 Add RN42 Bluetooth module support 
Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS.
 2017-03-29 23:03:04 -04:00
Zay950
2366ebfbbd Merge branch 'master' into to_push 2017-03-29 12:00:38 -07:00
Osamu Aoki
c782b269b6 Update to match QMK keymap 2017-03-30 01:03:49 +09:00
Osamu Aoki
4d2be0281c Typo fix 2017-03-30 00:19:44 +09:00
Jack Humbert
942f2ccee4 Merge pull request #1183 from Rovanion/real-master 
Added instructions for how to build and flash the firmware with teensy_cli
 2017-03-29 09:45:22 -04:00
Rovanion Luckey
d6e51d2008 Added link to the teensy linux page. 2017-03-29 09:34:20 +02:00
skullydazed
23839b8c6d Clarify the quantum license (#1042) 
* Clarify the license for files we have signoff on

* Update against the currently signed off files

* Remove unused and not clearly licensed headers

* Replace an #endif I accidentally removed while resolving merge conflicts
 2017-03-28 15:20:36 -07:00
Jack Humbert
b83ae5ae5c Merge pull request #1182 from henxing/default_atreus_layout 
Default atreus layout
 2017-03-28 14:12:41 -04:00
Jack Humbert
49f547dd8e Merge pull request #1139 from Swoy/master 
Satan Board "Admiral Strokers" keymap and config
 2017-03-28 14:12:21 -04:00
Ole Anders
6de7e5d8dc typo removed {3 ... 2017-03-28 18:45:26 +02:00
Ole Anders
85cac39529 fixed capitalization issue (checkTime => checktime) 2017-03-28 18:41:04 +02:00
Hugh Enxing
3fdc45b4e9 Merge branch 'master' into default_atreus_layout 2017-03-28 12:11:49 -04:00
Ole Anders
411cd4fae2 moved checktime out of function 2017-03-28 17:30:15 +02:00
Ole Anders
f504082f7f declaring checktime before the function it is used in. 2017-03-28 17:17:08 +02:00
Ole Anders
256abc64d5 fixed function to not accept any arguments. 
As per Pramod's comment on stack overflow:

In C int foo() and int foo(void) are different functions. int foo()
accepts an arbitrary number of arguments, while int foo(void) accepts 0
arguments. In C++ they mean the same thing. I suggest that you use void
consistently when you mean no arguments.
 2017-03-28 17:08:01 +02:00
Ole Anders
1b821eca66 removed varable trace option from makefile 2017-03-28 16:55:25 +02:00
Ole Anders
37b7539af3 slight cleanup as per recommendation 2017-03-28 16:52:56 +02:00
Ole Anders
c72ca58528 Moved key_timer out of function. 2017-03-28 16:50:44 +02:00
Ole Anders
48dfc77718 removed a carriage return 2017-03-28 15:58:46 +02:00
Ole Anders
62faa20ef6 Merge remote-tracking branch 'refs/remotes/qmk/master' 2017-03-28 15:55:33 +02:00
Ole Anders
d5ee0194ab fixed #1139 issues 
A fix described by jackhumbert has been sorted out now.
 2017-03-28 15:43:04 +02:00
Jack Humbert
5e4daf1c6d Merge pull request #1174 from nooges/atreus50 
Add Atreus50 keyboard
 2017-03-28 09:34:26 -04:00
Jack Humbert
7e37daa2ce Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes 
Flesh out MIDI support
 2017-03-28 09:26:54 -04:00
Jack Humbert
216f669276 Merge pull request #1098 from lambdalisue/tapping-force-hold 
Add TAPPING_FORCE_HOLD to regulate behaviour
 2017-03-28 09:24:22 -04:00
Jack Humbert
cc2fb56ed8 Merge pull request #1167 from smt/smt/satan 
Add smt keymap for Satan 'GH60'
 2017-03-28 09:18:55 -04:00
Jack Humbert
fa09189195 Merge pull request #1162 from Khord/master 
My customized keymap + some tunes for the song list
 2017-03-28 09:17:16 -04:00
Danny Nguyen
71857ebc3f Move Atreus50 to hardwired directory and update README 2017-03-28 09:17:09 -04:00
Jack Humbert
6e688ad5c2 Merge pull request #1172 from nooges/hexwire-fixes 
Let's Split hexwire keymap fixes
 2017-03-28 09:16:47 -04:00
Jack Humbert
99b7b50130 Merge pull request #1157 from jtbarrett/tada68_default 
Update readme and default layout for TADA68
 2017-03-28 09:15:57 -04:00