Commit Graph

6078 Commits (6e2cae4cda122cfe58dc88dc181632d7b9521740)
 

Author SHA1 Message Date
coderkun 605c4129cc Merge branch 'master' into coderkun_neo2 8 years ago
Jack Humbert 3448d5d487 Merge pull request #1132 from akatrevorjay/pr/dfu-serial
Allow to specify serial to dfu-util flash
8 years ago
Jack Humbert ec35fea264 Merge pull request #1190 from osamuaoki/master
Fix typo
8 years ago
Jack Humbert 2b4efaba53 Merge pull request #1189 from Zay950/to_push
Unicode input_mode presistance
8 years ago
Osamu Aoki caab4d7e45 Fix typo 8 years ago
nielsenz d1e66e2e07 Worked around some new Makefile issues. 8 years ago
nielsenz 7e54332890 Pulling and pushing troubles 8 years ago
Callum Oakley b9225a28f2 changed hotkey cluster to accomodate awkward software... again 8 years ago
Callum Oakley 200ae0c519 changed hotkey cluster to accomodate awkward software 8 years ago
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.
8 years ago
Osamu Aoki ccbdf90f02 Update to match QMK keymap 8 years ago
Osamu Aoki 3a1ee48cda Typo fix 8 years ago
Osamu Aoki d029e23260 Updated Home (markdown) 8 years ago
Osamu Aoki f39bad2a7d Updated Key Functions (markdown) 8 years ago
Osamu Aoki 46977da417 Updated Home (markdown) 8 years ago
Osamu Aoki 1a675efc4f Updated Keycodes (markdown) 8 years ago
Osamu Aoki 3627a50e63 Updated Home (markdown) 8 years ago
Osamu Aoki 97d6184ed0 Updated Keymap (markdown) 8 years ago
Osamu Aoki 5fb058eb34 Updated Home (markdown) 8 years ago
Jack Humbert b441468795 Merge pull request #1188 from hot-leaf-juice/master
changed hotkey cluster to accomodate awkward software... again
8 years ago
Callum Oakley 3f3f208113 changed hotkey cluster to accomodate awkward software... again 8 years ago
Osamu Aoki 32c511c918 Rename back to right name 8 years ago
Jack Humbert 8994fca4ee Merge pull request #1187 from hot-leaf-juice/master
changed hotkey cluster to acommodate awkward software
8 years ago
Jack Humbert d359b55520 Merge pull request #1185 from exiva/rn42_bluetooth
Add RN42 Bluetooth module support
8 years ago
Jack Humbert 338edcabd7 Merge pull request #1184 from osamuaoki/master
Update keymap.md to QMK
8 years ago
Callum Oakley d145a1192f changed hotkey cluster to accomodate awkward software 8 years ago
Erez Zukerman 923d32a0ef Updated Key Functions (markdown) 8 years ago
Xyverz 571f39da66 Tidied up keymaps, Makefiles that actually work, Clueboard make v1.0 8 years ago
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.
8 years ago
Zay950 2366ebfbbd Merge branch 'master' into to_push 8 years ago
Osamu Aoki c782b269b6 Update to match QMK keymap 8 years ago
Osamu Aoki 4d2be0281c Typo fix 8 years ago
Osamu Aoki 258e2afbbf Typo fixes 8 years ago
Osamu Aoki c3f7df992d Reminding TMK/QMK difference here should be good idea. 8 years ago
Jack Humbert 942f2ccee4 Merge pull request #1183 from Rovanion/real-master
Added instructions for how to build and flash the firmware with teensy_cli
8 years ago
Rovanion Luckey d6e51d2008 Added link to the teensy linux page. 8 years ago
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
8 years ago
Jack Humbert b83ae5ae5c Merge pull request #1182 from henxing/default_atreus_layout
Default atreus layout
8 years ago
Jack Humbert 49f547dd8e Merge pull request #1139 from Swoy/master
Satan Board "Admiral Strokers" keymap and config
8 years ago
Ole Anders 6de7e5d8dc typo removed {3 ... 8 years ago
Ole Anders 85cac39529 fixed capitalization issue (checkTime => checktime) 8 years ago
Hugh Enxing 3fdc45b4e9 Merge branch 'master' into default_atreus_layout 8 years ago
Ole Anders 411cd4fae2 moved checktime out of function 8 years ago
Ole Anders f504082f7f declaring checktime before the function it is used in. 8 years ago
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.
8 years ago
Ole Anders 1b821eca66 removed varable trace option from makefile 8 years ago
Ole Anders 37b7539af3 slight cleanup as per recommendation 8 years ago
Ole Anders c72ca58528 Moved key_timer out of function. 8 years ago
Ole Anders 48dfc77718 removed a carriage return 8 years ago
Ole Anders 62faa20ef6 Merge remote-tracking branch 'refs/remotes/qmk/master' 8 years ago