summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'minidox' of https://github.com/That-Canadian/qmk_firmware into ↵That-Canadian2017-07-141-0/+4
|\ | | | | | | minidox
| * Fixed RGB being enabled by default, now it must be turned on at the keymap levelThat-Canadian2017-07-102-2/+3
| |
| * cleaned up that_canadian keymap commentsThat-Canadian2017-07-101-3/+3
| |
| * Merge branch 'master' into minidoxThat-Canadian2017-07-1059-2980/+898
| |\
| * | Updated minidox rev1 config, and readme. Also updated that_canadian keymap ↵That-Canadian2017-07-105-12/+45
| | | | | | | | | | | | to include RGB
| * | Added MiniDox keyboard folder / configs / and some keymapsThat-Canadian2017-07-1021-0/+1831
| | |
* | | Updated i2c and serial files to most recent from the lets split firmware. ↵That-Canadian2017-07-147-7/+31
| | | | | | | | | | | | Also updated that_canadian keymap
* | | Merge remote-tracking branch 'upstream/master'That-Canadian2017-07-1023-0/+1865
|\ \ \ | |_|/ |/| |
| * | Adds Minidox Keyboard (#1487)That-Canadian2017-07-1023-0/+1865
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge * line ending stuff * Added MiniDox keyboard folder / configs / and some keymaps * Updated minidox rev1 config, and readme. Also updated that_canadian keymap to include RGB * cleaned up that_canadian keymap comments * Fixed RGB being enabled by default, now it must be turned on at the keymap level
* | | Merge remote-tracking branch 'upstream/master'That-Canadian2017-07-1059-2980/+898
|\| | | |/ |/|
| * Update README.mdJack Humbert2017-07-101-1/+1
| |
| * Start mvoing hardware drivers to /drivers/ (#1433)Jack Humbert2017-07-1019-1582/+13
| | | | | | | | | | | | | | | | | | | | | | | | * start driver isolation * update nyquist and orthodox boards * update atreus62 * move drivers to avr * update avr conditional
| * Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-07-1040-1397/+884
| |\
| | * Fix uninitialized backlight_level in the VisualizerFred Sundvik2017-07-101-0/+4
| | |
| | * Add template board filesFred Sundvik2017-07-102-0/+223
| | |
| | * Rename board files to lowercaseFred Sundvik2017-07-105-2/+2
| | |
| | * Make it easier to use driversFred Sundvik2017-07-1015-45/+58
| | |
| | * Shared default animationsFred Sundvik2017-07-1010-171/+35
| | |
| | * Clarify naming between LCD_BACKLIGHT and LED_BACKLIGHTFred Sundvik2017-07-109-73/+73
| | |
| | * Shared gfxconfFred Sundvik2017-07-104-598/+330
| | |
| | * Define visualizer thread priority by defaultFred Sundvik2017-07-103-6/+3
| | |
| | * Fixup mixed tabs/spacesFred Sundvik2017-07-105-154/+154
| | |
| | * Remove ergodox from gdisp driver namesFred Sundvik2017-07-1013-11/+11
| | |
| | * Move GDISP drivers to /drivers/ugfxFred Sundvik2017-07-1017-360/+10
| | |
| | * Fix Makefile error_occured output for unit testsFred Sundvik2017-07-101-0/+2
| | |
| | * Don't search for TEENSY_LOADER_CLI if it's already definedFred Sundvik2017-07-101-5/+7
| | |
| | * Don't run dfu-programmer unless specified as a targetFred Sundvik2017-07-101-10/+10
| | | | | | | | | | | | | | | | | | This introduces a grep dependency, which I believe we didn't have before, but it should be available and installed by default on all the supported systems.
| * | Merge commit '8858438a770c1c982f33b296447ca77176c751f7'Jack Humbert2017-07-096-407/+407
| |\ \ | | |/ | |/|
| | * Squashed 'lib/lufa/' changes from f2bd51f4e..bbdc9ac40Jack Humbert2017-07-09108-7742/+7742
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbdc9ac40 Merge pull request #1 from fredizzimo/fix_line_endings 75ba27b8d Fix xml file line endings 7a8237259 Merge commit '5a3397d17ec917c7be5d5109e01a3a84a355cb1b' 713c65b5b Merge commit 'cedfbfcb1a9ad9cf93816f1952fc4bf7c55fbb61' 00e20c453 delete old lufa git-subtree-dir: lib/lufa git-subtree-split: bbdc9ac40c2ff543bbaf3870d407d0a96c945c1a
* | | line ending stuffThat-Canadian2017-07-102-77/+77
| | |
* | | mergeThat-Canadian2017-07-104-330/+330
|/ /
* | more crlf issuesskullY2017-07-0866-4416/+4416
| |
* | Reference issue #1478 from the unit testsFred Sundvik2017-07-081-0/+1
| |
* | Reference issue #1477 from the unit testsFred Sundvik2017-07-081-0/+2
| |
* | Reference issue #524 from the unit testsFred Sundvik2017-07-081-0/+3
| |
* | Reference issue #1476 from the unit testsFred Sundvik2017-07-081-0/+4
| |
* | Configure vscode file associations, use hpp instead of hFred Sundvik2017-07-0811-11/+17
| |
* | Fix keymap formattingFred Sundvik2017-07-081-10/+10
| |
* | Add tests for macrosFred Sundvik2017-07-082-1/+109
| |
* | Add wait support for testsFred Sundvik2017-07-082-3/+9
| |
* | Rename tests to start with test_Fred Sundvik2017-07-082-0/+0
| |
* | Add basic timing support, and SFT_T testsFred Sundvik2017-07-089-27/+157
| | | | | | | | Also expose some bugs...
* | Add test for a combo keyFred Sundvik2017-07-082-5/+44
| |
* | Add simple modifier testFred Sundvik2017-07-083-8/+32
| |
* | Improve the tests a bitFred Sundvik2017-07-081-1/+10
| |
* | A bigger test matrix, and test for unmapped keysFred Sundvik2017-07-083-5/+18
| |
* | Rename test.cpp to keypress.cppFred Sundvik2017-07-081-0/+0
| |
* | Build all cpp files in test directoriesFred Sundvik2017-07-081-1/+2
| |
* | Move test keymap to keymap.cFred Sundvik2017-07-083-7/+25
| |
* | Exclude .build and .hex from Visual Studio codeFred Sundvik2017-07-082-1/+11
| |