summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-29Merge pull request #1183 from Rovanion/real-masterJack Humbert
Added instructions for how to build and flash the firmware with teensy_cli
2017-03-29Added link to the teensy linux page.Rovanion Luckey
2017-03-28Clarify the quantum license (#1042)skullydazed
* 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-28Merge pull request #1182 from henxing/default_atreus_layoutJack Humbert
Default atreus layout
2017-03-28Merge pull request #1139 from Swoy/masterJack Humbert
Satan Board "Admiral Strokers" keymap and config
2017-03-28typo removed {3 ...Ole Anders
2017-03-28fixed capitalization issue (checkTime => checktime)Ole Anders
2017-03-28Merge branch 'master' into default_atreus_layoutHugh Enxing
2017-03-28moved checktime out of functionOle Anders
2017-03-28declaring checktime before the function it is used in.Ole Anders
2017-03-28fixed function to not accept any arguments.Ole Anders
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-28removed varable trace option from makefileOle Anders
2017-03-28slight cleanup as per recommendationOle Anders
2017-03-28Moved key_timer out of function.Ole Anders
2017-03-28removed a carriage returnOle Anders
2017-03-28Merge remote-tracking branch 'refs/remotes/qmk/master'Ole Anders
2017-03-28fixed #1139 issuesOle Anders
A fix described by jackhumbert has been sorted out now.
2017-03-28Merge pull request #1174 from nooges/atreus50Jack Humbert
Add Atreus50 keyboard
2017-03-28Merge pull request #1112 from newsboytko/newsboytko/midi-keycodesJack Humbert
Flesh out MIDI support
2017-03-28Merge pull request #1098 from lambdalisue/tapping-force-holdJack Humbert
Add TAPPING_FORCE_HOLD to regulate behaviour
2017-03-28Merge pull request #1167 from smt/smt/satanJack Humbert
Add smt keymap for Satan 'GH60'
2017-03-28Merge pull request #1162 from Khord/masterJack Humbert
My customized keymap + some tunes for the song list
2017-03-28Move Atreus50 to hardwired directory and update READMEDanny Nguyen
2017-03-28Merge pull request #1172 from nooges/hexwire-fixesJack Humbert
Let's Split hexwire keymap fixes
2017-03-28Merge pull request #1157 from jtbarrett/tada68_defaultJack Humbert
Update readme and default layout for TADA68
2017-03-28Merge pull request #1180 from mattdibi/masterJack Humbert
Italian layout for ergodox keyboard
2017-03-28Merge pull request #1171 from ishtob/masterJack Humbert
SSD1306 I2C OLED display support for let's split
2017-03-28Merge pull request #1168 from newsboytko/newsboytko/frosty-flakeJack Humbert
Support Frosty Flake Controller (CM Storm QFR)
2017-03-28Merge pull request #1178 from cheesemacfly/masterJack Humbert
XD60 different layout
2017-03-28Merge pull request #1163 from jprMesh/atreus62_KC_KEYMAPJack Humbert
Added KC_KEYMAP macro for old style keymaps in Atreus62
2017-03-28Merge pull request #1177 from exiva/bluetooth_refactorJack Humbert
Refactor Bluetooth Handling
2017-03-28Removed images from ergodox ez italian layoutmattdibi
2017-03-28Fixed layout title in ergodox ez italian keymapmattdibi
2017-03-28Fixed italian kymap readmemattdibi
2017-03-28Updated readmemattdibi
2017-03-28Added italian layoutmattdibi
2017-03-26Create README.mdNicolas Guelpa
2017-03-26Add files via uploadNicolas Guelpa
2017-03-26fixing layoutNicolas Guelpa
2017-03-24Adding different layerNicolas Guelpa
2017-03-24Add BLE and EZKey module defines.Travis La Marr
Also restored serial init back to original location. Was getting junk data.
2017-03-24Readd bluetooth output direction on standard key input.Travis La Marr
2017-03-24Swapped placement of `Ctrl` and `Alt` keys to match Technomancy'sHugh Enxing
default layout
2017-03-24Refactor Bluetooth HandlingTravis La Marr
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-23Add RGB supportDanny Nguyen
2017-03-23Add RGB support for Let’s Split v1Danny Nguyen
2017-03-23Cleanup keymapDanny Nguyen
2017-03-23Initial commit for Atreus50 with working audioDanny Nguyen
2017-03-23Move keymap into config fileDanny Nguyen
2017-03-23Add Makefile in keymap dirDanny Nguyen