Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge pull request #2 from jackhumbert/master | Joshua Colbeck | 2016-07-12 | 82 | -786/+2969 | |
| |\ | | | | | | | Pull from upstream | |||||
| * \ | Merge branch 'master' of https://github.com/Skrymir/qmk_firmware | Josh Colbeck | 2016-07-06 | 2 | -0/+213 | |
| |\ \ | ||||||
| | * \ | Merge pull request #1 from Skrymir/patch-1 | Joshua Colbeck | 2016-07-06 | 12 | -244/+495 | |
| | |\ \ | | | | | | | | | | | add ergodox layout | |||||
| | | * | | Changed layer switching to momentary | Josh Colbeck | 2016-07-06 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | corrected macro | |||||
| | | * | | Merge remote-tracking branch 'jackhumbert/master' into patch-1 | Josh Colbeck | 2016-07-04 | 2 | -14/+14 | |
| | | |\ \ | ||||||
| | | * \ \ | Merge remote-tracking branch 'jackhumbert/master' into patch-1 | Josh Colbeck | 2016-07-04 | 8 | -230/+268 | |
| | | |\ \ \ | ||||||
| | | * | | | | Added macro and readme | Josh Colbeck | 2016-07-04 | 2 | -18/+40 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | macros to for often used eclipse shortcuts | |||||
| | | * | | | | Added new keymap | Josh Colbeck | 2016-07-04 | 1 | -0/+191 | |
| | | | | | | | ||||||
| | | * | | | | Revert "Changed layout of left hand main layer" | Josh Colbeck | 2016-07-03 | 1 | -12/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8149924399cf3d31d80444a10477a29f53a4990e. | |||||
| | | * | | | | Changed layout of left hand main layer | Joshua Colbeck | 2016-07-03 | 1 | -12/+12 | |
| | |/ / / / | ||||||
* | | | | | | Merge pull request #515 from pvinis/reset-function | Jack Humbert | 2016-07-14 | 2 | -10/+16 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | extract reset keyboard into a function | |||||
| * | | | | | extract reset keyboard into a function | Pavlos Vinieratos | 2016-07-13 | 2 | -10/+16 | |
|/ / / / / | | | | | | | | | | | | | | | | that makes it easy to call reset_keyboard() from a function in a keymap | |||||
* | | | | | Merge pull request #477 from Smilliam/master | Jack Humbert | 2016-07-11 | 3 | -1/+19 | |
|\ \ \ \ \ | | | | | | | | | | | | | Canceling Space Cadet state with opposite shift key | |||||
| * | | | | | amended extraneous file edits | Smilliam | 2016-07-10 | 2 | -7/+1 | |
| | | | | | | ||||||
| * | | | | | Made rollover behavior for space cadet optional | Smilliam | 2016-07-10 | 4 | -10/+26 | |
| | | | | | | ||||||
| * | | | | | fixed indentation. | Smilliam | 2016-07-04 | 1 | -8/+8 | |
| | | | | | | ||||||
| * | | | | | Allow Space Cadet state to be canceled by alternate Shift key | Smilliam | 2016-07-04 | 1 | -0/+8 | |
| | |_|_|/ | |/| | | | | | | | | | | | | | Allows you to press RSHIFT to cancel the insertion of a "(" when holding down LSHIFT. Alternatively, allows you to press LSHIFT to cancel the insertion of a ")" when holding down RSHIFT. This change enables you to renege from outputting a character should you press a shift key erroneously. | |||||
* | | | | | Merge pull request #506 from stanleylai/master | Jack Humbert | 2016-07-11 | 2 | -0/+104 | |
|\ \ \ \ \ | | | | | | | | | | | | | Added my custom keymap for Satan | |||||
| * | | | | | Added my custom keymap for Satan | Stanley Lai | 2016-07-10 | 2 | -0/+104 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #507 from ruiqimao/master | skullydazed | 2016-07-11 | 4 | -17/+33 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | fixed clueboard LED pin assignments and matrix documentation | |||||
| * | | | | | fixed clueboard LED pin assignments and matrix documentation | Ruiqi Mao | 2016-07-11 | 4 | -17/+33 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #505 from fredizzimo/documentation_fix | Jack Humbert | 2016-07-10 | 1 | -3/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove out of place documentation, caused by ChibiOS merge | |||||
| * | | | | | Remove out of place documentation, caused by ChibiOS merge | Fred Sundvik | 2016-07-10 | 1 | -3/+0 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #502 from robotmaxtron/master | Jack Humbert | 2016-07-09 | 5 | -0/+544 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Adding robotmaxtron's GH60 Keymap | |||||
| * | | | | | | Update keymap.c | Max Whittingham | 2016-07-09 | 1 | -3/+1 | |
| | | | | | | | ||||||
| * | | | | | | Cleaning up repo | Max Whittingham | 2016-07-09 | 5 | -0/+546 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #500 from TerryMathews/master | Jack Humbert | 2016-07-09 | 1 | -0/+116 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Establish Poker clone keymap for Satan | |||||
| * \ \ \ \ \ | Merge pull request #1 from jackhumbert/master | TerryMathews | 2016-07-09 | 10 | -47/+267 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Catch up with jack's master | |||||
* | | | | | | | Documents tap dance | Erez Zukerman | 2016-07-08 | 1 | -0/+75 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #498 from fredizzimo/fix_make_dependencies | Jack Humbert | 2016-07-08 | 1 | -10/+12 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix make dependencies | |||||
| * | | | | | | Use order only prerequisites to avoid re-linking | Fred Sundvik | 2016-07-08 | 1 | -9/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prerequisites at the start of the build process are order-only so that the trget don't link again. Also added as a dependency to the compilation to force the messages to be printed at the start | |||||
| * | | | | | | Fix name of makefile dep files | Fred Sundvik | 2016-07-08 | 1 | -1/+1 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files can't start with a .dot, as the wildcard function wont find them. So this is fixed by removing the BUILD_DIR from the name. | |||||
* | | | | | | Merge pull request #496 from fredizzimo/makefile_optimization | Jack Humbert | 2016-07-08 | 2 | -39/+22 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Makefile optimization | |||||
| * | | | | | | Fix the link target | Fred Sundvik | 2016-07-08 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Don't run git describe for ever file that is built | Fred Sundvik | 2016-07-08 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Speed up compilation by not using recusive make | Fred Sundvik | 2016-07-08 | 1 | -38/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cleaning is done outside the targets, by checking the requested target name. | |||||
* | | | | | | | Merge pull request #494 from robbiegill/master | Jack Humbert | 2016-07-08 | 7 | -1/+161 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Port support for hhkb-jp from tmk | |||||
| * | | | | | | | port missing support for hhkb-jp from tmk | Robbie Gill | 2016-07-07 | 7 | -1/+161 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #493 from TerryMathews/master | Jack Humbert | 2016-07-08 | 12 | -595/+92 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Create keycodes for RGB control functions | |||||
| | | * | | | | Establish Poker clone keymap for Satan | TerryMathews | 2016-07-09 | 1 | -0/+116 | |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Maps all of the side-print legends on the stock Poker II keycaps that are feasible (doesn't support repeat rate toggling, Pmode recording). | |||||
| * | | | | | Fix a function mismatch that was causing LEDs to not properly initialize | TerryMathews | 2016-07-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #430. Name of function being called at init was updated to led_init_ports(), but the call itself wasn't renamed. | |||||
| * | | | | | Move return out of event if block | TerryMathews | 2016-07-08 | 1 | -26/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to Jack, this makes the return case not be processed. Doesn't break anything in the firmware. | |||||
| * | | | | | Fix cluepad and planck | TerryMathews | 2016-07-07 | 2 | -5/+5 | |
| | | | | | | ||||||
| * | | | | | Fix compile error on Clueboard | TerryMathews | 2016-07-07 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Create keycodes for RGB control functions | TerryMathews | 2016-07-07 | 11 | -586/+83 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | |||||
* | | | | | Merge pull request #491 from fredizzimo/keycode_fixes | Jack Humbert | 2016-07-07 | 4 | -9/+7 | |
|\ \ \ \ \ | | | | | | | | | | | | | Some fixes for keycode processing | |||||
| * | | | | | Fix IS_CONSUMER macro | Fred Sundvik | 2016-07-07 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Remove unhandled KC_BTLD, RESET should be used instead | Fred Sundvik | 2016-07-07 | 3 | -7/+5 | |
| | | | | | | ||||||
| * | | | | | Fix the range for consumer keys | Fred Sundvik | 2016-07-07 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | fixes quantum template (actually) | Jack Humbert | 2016-07-07 | 1 | -1/+1 | |
| | | | | |