summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-12-03Merge pull request #916 from wez/ble_4Jack Humbert1-11/+71
Connect the adafruit ble code to the lufa main loop
2016-12-03Connect the adafruit ble code to the lufa main loopWez Furlong1-11/+71
There are now 3 potential locations to send HID reports: 1. USB 2. The bluefruit easy key 3. Adafruit BLE Generally speaking, if USB is connected then we should prefer to send the reports there; it is generally the best channel for this. The bluefruit module has no feedback about bluetooth connectivity so the code must speculatively send reports over both USB and bluetooth. The BLE module has connectivity feedback. In general we want to prefer to send HID reports over USB while connected there, even if BLE is connected. Except that it is convenient to force them over BLE while testing the implementation. This policy has been extracted out into a where_to_send function which returns a bitmask of which of the channels should be used.
2016-12-02Merge pull request #930 from cbbrowne/masterJack Humbert13-9/+47
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929
2016-12-02Merge pull request #929 from jackhumbert/hf/size-warningsJack Humbert4-4/+12
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size
2016-12-02Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929cbbrowne13-9/+47
2016-12-02adds warnings to 4 keymapsJack Humbert4-4/+12
2016-12-02Merge pull request #881 from NoahAndrews/patch-1Jack Humbert1-9/+9
Recommend WSL on Windows 10 [Discussion]
2016-12-02Merge pull request #915 from wez/ble_3Jack Humbert5-1/+940
Add support for Adafruit BLE modules
2016-12-02Merge pull request #914 from wez/ble_2Jack Humbert1-0/+37
Add arduino-alike GPIO pin control helpers
2016-12-02Merge pull request #913 from wez/ble_1Jack Humbert2-34/+28
Tidy up atomicity in timer.c and ring_buffer.h
2016-12-02Merge pull request #924 from cbbrowne/masterJack Humbert4-10/+36
Keymapping revs, revisions to documentation on API_SYSEX_ENABLE
2016-12-02Annotates nordicErez Zukerman1-1/+1
2016-12-02Tweaks Kristian's layout againErez Zukerman1-1/+1
2016-12-02Kristian's keymapErez Zukerman1-0/+79
2016-12-02I also want page-down/page-up on UPPER layercbbrowne1-1/+1
2016-12-02I want page-down/page-up - put those on LOWER-Left/Right near bottom cornercbbrowne1-1/+2
2016-12-01Improve docs on memory usagecbbrowne1-0/+7
2016-12-01Improve docs on SYSEX bitcbbrowne1-1/+1
2016-12-01More notes on .hex size protectioncbbrowne1-3/+16
2016-12-01Make my builds smallercbbrowne2-3/+7
2016-12-01Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne1-50/+71
2016-12-01Better layoutErez Zukerman1-50/+71
2016-11-29Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne71-346/+2112
2016-11-29Merge pull request #919 from jackhumbert/hf/robot_test_layoutJack Humbert4-0/+143
Test layout for ErgoDox EZ manufacturing robot
2016-11-29Test layout for ErgoDox EZ manufacturing robotErez Zukerman4-0/+143
2016-11-29Merge pull request #918 from jackhumbert/wu5y7Erez Zukerman65-204/+1761
Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API
2016-11-29Merge pull request #917 from gid0/masterErez Zukerman4-142/+208
keyboards/ergodox/keymaps/bepo : merge from author
2016-11-29guess i didnt pullJack Humbert1-11/+0
2016-11-29Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert4-14/+20
2016-11-29enable rgblight by default for ezJack Humbert2-0/+12
2016-11-29enable api sysex for ezJack Humbert1-0/+1
2016-11-29Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert22-56/+1415
2016-11-28Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne18-82/+1340
2016-11-28Add the AZERTY compatibility layer.Olivier2-7/+122
2016-11-28Change layer names (cosmetic change) and reorder them so that the "shift" ↵Olivier1-62/+62
layer can be accessed from the "alt" layer when in QWERTY compat mode.
2016-11-28Tweaks position of TOG not to conflict with MOErez Zukerman1-3/+3
2016-11-28A little cleanup, add some comments, change others.Olivier1-26/+16
2016-11-28Tweaks EZ MakefileErez Zukerman1-1/+6
2016-11-28Pulls LED config into common config for EZErez Zukerman2-10/+11
2016-11-28Adjust comment.Olivier1-1/+1
2016-11-28Reorganize the numeric keypad layer more like a traditional numeric keypad.Olivier2-12/+12
2016-11-28Add support for Adafruit BLE modulesWez Furlong5-1/+940
This implements some helper functions that allow sending key reports to an SPI based Bluetooth Low Energy module, such as the Adafruit Feather 32u4 Bluefruit LE. There is some plumbing required in lufa.c to enable this; that is in a follow-on commit.
2016-11-28Add arduino-alike GPIO pin control helpersWez Furlong1-0/+37
Unlike the arduino functions, these don't take abstract pin numbers, they take pin labels like `B0`. Also, rather than taking very generic parameter names, these take slightly more descriptive enum values. These improve the clarity of code that would otherwise be inscrutable bit manipulation in tersely named port register names.
2016-11-28Tidy up atomicity in timer.c and ring_buffer.hWez Furlong2-34/+28
Adopt the macros for saving/restoring the interrupt state that are provided by the avr gcc environment. Removing intialization of the timer value; this shaves off a few bytes because globals are default initialized to zero.
2016-11-27Merge https://github.com/jackhumbert/qmk_firmwareOlivier537-12552/+32657
2016-11-26separated into api files/folderJack Humbert15-283/+303
2016-11-26Merge pull request #908 from priyadi/promethiumJack Humbert14-0/+1182
My handwired keyboard firmware
2016-11-26update docsPriyadi Iman Nurcahyo1-2/+3
2016-11-26Merge pull request #907 from priyadi/unicode_docsJack Humbert1-1/+27
Update Unicode documentation
2016-11-26Merge pull request #906 from priyadi/unicode_map_fix_warningJack Humbert1-0/+1
fix strict-prototypes warning