summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3 from jackhumbert/masterJoshua Colbeck2016-07-202-10/+16
|\ | | | | pulling in remote changes
| * Merge pull request #489 from Skrymir/masterJack Humbert2016-07-142-0/+213
| |\ | |/ |/| New ergodox-ez layout
* | Merge pull request #2 from jackhumbert/masterJoshua Colbeck2016-07-1282-786/+2969
|\ \ | | | | | | Pull from upstream
* \ \ Merge branch 'master' of https://github.com/Skrymir/qmk_firmwareJosh Colbeck2016-07-062-0/+213
|\ \ \
| * \ \ Merge pull request #1 from Skrymir/patch-1Joshua Colbeck2016-07-0612-244/+495
| |\ \ \ | | | | | | | | | | add ergodox layout
| | * | | Changed layer switching to momentaryJosh Colbeck2016-07-061-6/+6
| | | | | | | | | | | | | | | | | | | | corrected macro
| | * | | Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck2016-07-042-14/+14
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck2016-07-048-230/+268
| | |\ \ \ \
| | * | | | | Added macro and readmeJosh Colbeck2016-07-042-18/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | macros to for often used eclipse shortcuts
| | * | | | | Added new keymapJosh Colbeck2016-07-041-0/+191
| | | | | | |
| | * | | | | Revert "Changed layout of left hand main layer"Josh Colbeck2016-07-031-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8149924399cf3d31d80444a10477a29f53a4990e.
| | * | | | | Changed layout of left hand main layerJoshua Colbeck2016-07-031-12/+12
| |/ / / / /
| | | | | * Merge pull request #515 from pvinis/reset-functionJack Humbert2016-07-142-10/+16
| | | | |/| | | | | | | | | | | | | extract reset keyboard into a function
| | | | | * extract reset keyboard into a functionPavlos Vinieratos2016-07-132-10/+16
| | | | |/ | | | | | | | | | | | | | | | that makes it easy to call reset_keyboard() from a function in a keymap
| | | | * Merge pull request #477 from Smilliam/masterJack Humbert2016-07-113-1/+19
| | | | |\ | | | | | | | | | | | | Canceling Space Cadet state with opposite shift key
| | | | | * amended extraneous file editsSmilliam2016-07-102-7/+1
| | | | | |
| | | | | * Made rollover behavior for space cadet optionalSmilliam2016-07-104-10/+26
| | | | | |
| | | | | * fixed indentation.Smilliam2016-07-041-8/+8
| | | | | |
| | | | | * Allow Space Cadet state to be canceled by alternate Shift keySmilliam2016-07-041-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/masterJack Humbert2016-07-112-0/+104
| | | | |\ | | | | | | | | | | | | Added my custom keymap for Satan
| | | | | * Added my custom keymap for SatanStanley Lai2016-07-102-0/+104
| | | | | |
| | | | * | Merge pull request #507 from ruiqimao/masterskullydazed2016-07-114-17/+33
| | | | |\ \ | | | | | |/ | | | | |/| fixed clueboard LED pin assignments and matrix documentation
| | | | | * fixed clueboard LED pin assignments and matrix documentationRuiqi Mao2016-07-114-17/+33
| | | | |/
| | | | * Merge pull request #505 from fredizzimo/documentation_fixJack Humbert2016-07-101-3/+0
| | | | |\ | | | | | | | | | | | | Remove out of place documentation, caused by ChibiOS merge
| | | | | * Remove out of place documentation, caused by ChibiOS mergeFred Sundvik2016-07-101-3/+0
| | | | | |
| | | | * | Merge pull request #502 from robotmaxtron/masterJack Humbert2016-07-095-0/+544
| | | | |\ \ | | | | | | | | | | | | | | Adding robotmaxtron's GH60 Keymap
| | | | | * | Update keymap.cMax Whittingham2016-07-091-3/+1
| | | | | | |
| | | | | * | Cleaning up repoMax Whittingham2016-07-095-0/+546
| | | | |/ /
| | | | * | Merge pull request #500 from TerryMathews/masterJack Humbert2016-07-091-0/+116
| | | | |\ \ | | | | | | | | | | | | | | Establish Poker clone keymap for Satan
| | | | | * \ Merge pull request #1 from jackhumbert/masterTerryMathews2016-07-0910-47/+267
| | | | | |\ \ | | | | | |/ / | | | | |/| | Catch up with jack's master
| | | | * | | Documents tap danceErez Zukerman2016-07-081-0/+75
| | | | | |/ | | | | |/|
| | | | * | Merge pull request #498 from fredizzimo/fix_make_dependenciesJack Humbert2016-07-081-10/+12
| | | | |\ \ | | | | | | | | | | | | | | Fix make dependencies
| | | | | * | Use order only prerequisites to avoid re-linkingFred Sundvik2016-07-081-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 filesFred Sundvik2016-07-081-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_optimizationJack Humbert2016-07-082-39/+22
| | | | |\ \ | | | | | | | | | | | | | | Makefile optimization
| | | | | * | Fix the link targetFred Sundvik2016-07-081-1/+1
| | | | | | |
| | | | | * | Don't run git describe for ever file that is builtFred Sundvik2016-07-081-1/+1
| | | | | | |
| | | | | * | Speed up compilation by not using recusive makeFred Sundvik2016-07-081-38/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cleaning is done outside the targets, by checking the requested target name.
| | | | * | | Merge pull request #494 from robbiegill/masterJack Humbert2016-07-087-1/+161
| | | | |\ \ \ | | | | | | | | | | | | | | | | Port support for hhkb-jp from tmk
| | | | | * | | port missing support for hhkb-jp from tmkRobbie Gill2016-07-077-1/+161
| |_|_|_|/ / / |/| | | | | |
| | | | * | | Merge pull request #493 from TerryMathews/masterJack Humbert2016-07-0812-595/+92
| | | | |\ \ \ | | | | | |/ / | | | | |/| | Create keycodes for RGB control functions
| | | | | | * Establish Poker clone keymap for SatanTerryMathews2016-07-091-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 initializeTerryMathews2016-07-081-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 blockTerryMathews2016-07-081-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to Jack, this makes the return case not be processed. Doesn't break anything in the firmware.
| | | | | * Fix cluepad and planckTerryMathews2016-07-072-5/+5
| | | | | |
| | | | | * Fix compile error on ClueboardTerryMathews2016-07-071-2/+2
| | | | | |
| | | | | * Create keycodes for RGB control functionsTerryMathews2016-07-0711-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_fixesJack Humbert2016-07-074-9/+7
| | | | |\ | | | | | | | | | | | | Some fixes for keycode processing
| | | | | * Fix IS_CONSUMER macroFred Sundvik2016-07-071-1/+1
| | | | | |
| | | | | * Remove unhandled KC_BTLD, RESET should be used insteadFred Sundvik2016-07-073-7/+5
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 04:28:21 +0000