alvierahman90/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,670 Commits 48 Branches 349 Tags 167 MiB
200ae0c519
Commit Graph

4670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zay950
2366ebfbbd Merge branch 'master' into to_push 2017-03-29 12:00:38 -07: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
Jack Humbert
c948404739 Merge pull request #1180 from mattdibi/master 
Italian layout for ergodox keyboard
 2017-03-28 09:14:03 -04:00
Jack Humbert
8a0cf32cf5 Merge pull request #1171 from ishtob/master 
SSD1306 I2C OLED display support for let's split
 2017-03-28 09:13:41 -04:00
Jack Humbert
0f986a1951 Merge pull request #1168 from newsboytko/newsboytko/frosty-flake 
Support Frosty Flake Controller (CM Storm QFR)
 2017-03-28 09:10:55 -04:00
Jack Humbert
a7811781c5 Merge pull request #1178 from cheesemacfly/master 
XD60 different layout
 2017-03-28 09:10:02 -04:00
Jack Humbert
417202109b Merge pull request #1163 from jprMesh/atreus62_KC_KEYMAP 
Added KC_KEYMAP macro for old style keymaps in Atreus62
 2017-03-28 09:09:35 -04:00
Jack Humbert
ee6fbaaad8 Merge pull request #1177 from exiva/bluetooth_refactor 
Refactor Bluetooth Handling
 2017-03-28 09:08:10 -04:00
mattdibi
2104900030 Removed images from ergodox ez italian layout 2017-03-28 10:19:25 +02:00
mattdibi
221b27c508 Fixed layout title in ergodox ez italian keymap 2017-03-28 10:15:18 +02:00
mattdibi
b9b9a59f22 Fixed italian kymap readme 2017-03-28 10:13:29 +02:00
mattdibi
512eb5e1d5 Updated readme 2017-03-28 10:10:24 +02:00
mattdibi
b6b85ed413 Added italian layout 2017-03-28 09:56:07 +02:00
Nicolas Guelpa
a32436d5a1 Create README.md 2017-03-26 15:20:44 -04:00
Nicolas Guelpa
a89ee25db8 Add files via upload 2017-03-26 15:16:55 -04:00
Nicolas Guelpa
c0a6c5f806 fixing layout 2017-03-26 15:07:19 -04:00
Nicolas Guelpa
739249ff0d Adding different layer 2017-03-24 20:18:59 -04:00
Travis La Marr
43eee52cba Add BLE and EZKey module defines. 
Also restored serial init back to original location. Was getting junk data.
 2017-03-24 17:14:57 -04:00
Travis La Marr
b4ac0598fa Readd bluetooth output direction on standard key input. 2017-03-24 15:55:02 -04:00
Hugh Enxing
25f2295ba8 Swapped placement of Ctrl and Alt keys to match Technomancy's 
default layout
 2017-03-24 14:31:02 -04:00
Travis La Marr
ddc036b69e Refactor Bluetooth Handling 
Refactored Bluetooth support to make adding new Bluetooth modules
easier in the future.

* Remove `OUT_BLE` key from QMK's keymap. `OUT_BT` is all we need now
as there's no difference anymore.
* Made BLUETOOTH_ENABLE build option legacy as not to break existing
keymaps (Falls back to existing EZ Key support if on)
* Removed `ADAFRUIT_BLE_ENABLE` build option
* Created new build option `BLUETOOTH` with module option (Currently
`AdafruitEZKey` & `AdafruitBLE`)
* Moved all LUFA bluetooth key/mouse events under `BLUETOOTH_ENABLE`
ifdef with selected modules output.
 2017-03-24 12:53:55 -04:00
Danny Nguyen
8775a13658 Add RGB support 2017-03-23 14:46:58 -04:00