Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-28 | 1 | -10/+8 |
|\ | |||||
| * | remove unnecessary includes | Seth Chandler | 2016-07-27 | 1 | -2/+0 |
| | | |||||
| * | fix numerous errors in bone2planck keymap | Seth Chandler | 2016-07-27 | 1 | -10/+10 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-26 | 1 | -2/+2 |
|\| | |||||
| * | disable midi by default | Jack Humbert | 2016-07-26 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-25 | 2 | -75/+121 |
|\| | |||||
| * | Fixes midi functionality | Jack Humbert | 2016-07-24 | 1 | -1/+1 |
| | | |||||
| * | fixed include paths | Jason Janse van Rensburg | 2016-07-20 | 1 | -16/+16 |
| | | |||||
| * | reformat | Jason Janse van Rensburg | 2016-07-20 | 1 | -16/+16 |
| | | |||||
| * | updated bone2planck | Jason Janse van Rensburg | 2016-07-20 | 1 | -65/+111 |
| | | |||||
* | | Notes about changes | Christopher Browne | 2016-07-18 | 1 | -8/+8 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-12 | 6 | -74/+89 |
|\| | |||||
| * | Fix cluepad and planck | TerryMathews | 2016-07-07 | 1 | -3/+3 |
| | | |||||
| * | Create keycodes for RGB control functions | TerryMathews | 2016-07-07 | 1 | -59/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Moves RGB controls out of the macro function and assigns them their own keycodes: RGB_TOG (toggle on/off) RGB_MOD (mode step) RGB_HUI (increase hue) RGB_HUD (decrease hue) RGB_SAI (increase saturation) RGB_SAD (decrease saturation) RGB_VAI (increase brightness) RGB_VAD (decrease brightness) | ||||
| * | updates rgblight implementation, makes non-timer stuff compatible with audio | Jack Humbert | 2016-07-07 | 5 | -13/+84 |
| | | |||||
* | | I did not like Space Cadet paren; it jumps in in way too many extra cases | Christopher Browne | 2016-07-12 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-07 | 1 | -8/+8 |
|\| | |||||
| * | correct break/return order for planck and preonic defaults | Jack Humbert | 2016-07-04 | 1 | -8/+8 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-30 | 3 | -23/+45 |
|\| | |||||
| * | updates planck experimental, width of color output | Jack Humbert | 2016-06-29 | 1 | -21/+30 |
| | | |||||
| * | adds random base64 character generator | Jack Humbert | 2016-06-29 | 1 | -2/+13 |
| | | |||||
| * | Implements subprojects and updates projects for this (#459) | Jack Humbert | 2016-06-29 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * non-working commit * working * subprojects implemented for planck * pass a subproject variable through to c * consolidates clueboard revisions * thanks for letting me know about conflicts.. * turn off audio for yang's * corrects starting paths for subprojects * messing around with travis * semicolon * travis script * travis script * script for travis * correct directory (probably), amend files to commit * remove origin before adding * git pull, correct syntax * git checkout * git pull origin branch * where are we? * where are we? * merging * force things to happen * adds commit message, adds add * rebase, no commit message * rebase branch * idk! * try just pull * fetch - merge * specify repo branch * checkout * goddammit * merge? idk * pls * after all * don't split up keyboards * syntax * adds quick for all-keyboards * trying out new script * script update * lowercase * all keyboards * stop replacing compiled.hex automatically * adds if statement * skip automated build branches * forces push to automated build branch * throw an add in there * upstream? * adds AUTOGEN * ignore all .hex files again * testing out new repo * global ident * generate script, keyboard_keymap.hex * skip generation for now, print pandoc info, submodule update * try trusty * and sudo * try generate * updates subprojects to keyboards * no idea * updates to keyboards * cleans up clueboard stuff * setup to use local readme * updates cluepad, planck experimental * remove extra led.c [ci skip] * disable power up for now * config files updates * makefile updates * .h file updates, config tuning * disable audio for yang | ||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-28 | 4 | -116/+208 |
|\| | |||||
| * | zoom and undo keys for ab's planck keymap (#446) | Anand Babu (AB) Periasamy | 2016-06-27 | 3 | -43/+58 |
| | | |||||
| * | updates preonic default layout | Jack Humbert | 2016-06-26 | 1 | -11/+13 |
| | | |||||
| * | updates planck macros to keycodes, prototype fn_actions | Jack Humbert | 2016-06-26 | 1 | -31/+27 |
| | | |||||
| * | Swap up and down on ab's layout to match default (#441) | Anand Babu (AB) Periasamy | 2016-06-24 | 3 | -54/+133 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-24 | 39 | -39902/+158 |
|\| | |||||
| * | Backlight abstraction and other changes (#439) | Jack Humbert | 2016-06-23 | 38 | -39917/+101 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * redoes matrix pins, abstracts backlight code for B5,6,7 * slimming down keyboard stuff, backlight breathing implemented * don't call backlight init when no pin * cleans up user/kb/quantum calls, keyboard files * fix pvc atomic * replaces CHANNEL with correct var in breathing * removes .hexs, updates readmes, updates template * cleans-up clueboards, readmes to lowercase * updates readme | ||||
| * | Add OS specific layers that can be switched with macros (#436) | Peter | 2016-06-23 | 2 | -1153/+1225 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-23 | 7 | -0/+1443 |
|\| | |||||
| * | AB's practical planck keymap (#435) | Anand Babu (AB) Periasamy | 2016-06-22 | 7 | -0/+1443 |
| | | |||||
* | | Use Space Cadet parens on LSFT | Christopher Browne | 2016-06-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-22 | 3 | -7/+28 |
|/ | |||||
* | Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432) | Jack Humbert | 2016-06-21 | 98 | -0/+43126 |
* fixes from tmk's repo * rename keyboard to keyboards |