summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Adjusted Atreus KEYMAP() function.Joshua T2016-07-191-5/+5
| | | | | | This change adjusts the KEYMAP() function to provide a more visual representation of the key positions on the keyboard. Previously, keymaps have been defined directly using arrays for the Atreus keyboard. While this works, it doesn't utilize the helpful KEYMAP() function at all to allow the user to visually position the key codes for ease of editing. See the Ergodox-EZ KEYMAP() function and layouts for a great example of how this can work. This change should not break any existing Atreus layouts. At the time of this commit, there are two existing layouts for the Atreus board, and neither use the KEYMAP() function.
* Added Gaming layer and removed DvorakJoshua T2016-07-191-23/+23
| | | | Also added tap/hold functions on central keys
* Added default layer switch QWERTY to ColemakJoshua T2016-07-151-3/+5
|
* Fixed a merge conflictJoshua T2016-07-151-9/+0
|
* Merge remote-tracking branch 'upstream/master'Joshua T2016-07-152-0/+213
|\
| * Merge pull request #2 from jackhumbert/masterJoshua Colbeck2016-07-1262-663/+2675
| |\ | | | | | | Pull from upstream
| * \ Merge branch 'master' of https://github.com/Skrymir/qmk_firmwareJosh Colbeck2016-07-062-0/+213
| |\ \
| | * | 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-042-11/+5
| | |\ \ \
| | * | | | 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
| | | | | |
* | | | | | Corrected merge conflictJoshua T2016-07-131-0/+7
|\ \ \ \ \ \
| * | | | | | Created replicaJunction keymaps.Joshua T2016-07-112-0/+489
| | |_|_|_|/ | |/| | | |
* / | | | | Created replicaJunction keymaps.Joshua T2016-07-132-0/+503
|/ / / / /
* | | | | Merge pull request #477 from Smilliam/masterJack Humbert2016-07-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Canceling Space Cadet state with opposite shift key
| * | | | | amended extraneous file editsSmilliam2016-07-102-7/+1
| | | | | |
| * | | | | Made rollover behavior for space cadet optionalSmilliam2016-07-102-2/+8
| | |_|_|/ | |/| | |
* | | | | 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
| | | | | |
* | | | | | fixed clueboard LED pin assignments and matrix documentationRuiqi Mao2016-07-114-17/+33
|/ / / / /
* | | | | Update keymap.cMax Whittingham2016-07-091-3/+1
| | | | |
* | | | | Cleaning up repoMax Whittingham2016-07-095-0/+546
| | | | |
* | | | | Merge pull request #1 from jackhumbert/masterTerryMathews2016-07-097-1/+161
|\ \ \ \ \ | | | | | | | | | | | | Catch up with jack's master
| * \ \ \ \ 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
| | | |/ / / | | |/| | |
* | / | | | 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.
* | | | | Fix cluepad and planckTerryMathews2016-07-072-5/+5
| | | | |
* | | | | Fix compile error on ClueboardTerryMathews2016-07-071-2/+2
| | | | |
* | | | | Create keycodes for RGB control functionsTerryMathews2016-07-079-586/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | | Remove unhandled KC_BTLD, RESET should be used insteadFred Sundvik2016-07-072-2/+5
| | | | |
* | | | | updates rgblight implementation, makes non-timer stuff compatible with audioJack Humbert2016-07-0713-49/+113
| | | | |
* | | | | Merge pull request #490 from fredizzimo/integrate_visualizerJack Humbert2016-07-0717-0/+1568
|\ \ \ \ \ | |/ / / / |/| | | | Integrate visualizer for ChibiOS and Infinity Ergodox
| * | | | Move the visualizer_user file to keymap folderFred Sundvik2016-07-071-0/+0
| | | | | | | | | | | | | | | | | | | | Also rename it to visualizer.c
| * | | | Delete lcd_backlight_hal.cFred Sundvik2016-07-072-84/+65
| | | | | | | | | | | | | | | | | | | | | | | | | The functionality can now be found in the infinity_erogodox.c file instead.
| * | | | Makefile fixes and update of VisualizerFred Sundvik2016-07-071-0/+9
| | | | |
| * | | | Add Infinity Ergodox display driversFred Sundvik2016-07-0713-0/+992
| | | | |
| * | | | Makefile changes and files to compile VisualizerFred Sundvik2016-07-074-0/+586
| | | | |
* | | | | default keymap, reset sorted out for now, added serial to makefileJack Humbert2016-07-066-41/+203
| | | | |
* | | | | Merge branch 'master' into lets-split-supportJack Humbert2016-07-063-0/+23
|\| | | |
| * | | | Add serial_link compilation to Infinity ErgodoxFred Sundvik2016-07-062-0/+11
| | | | |
| * | | | fix/annotate wait_us linesJack Humbert2016-07-061-0/+12
| | | | |
* | | | | adds eep, removes usbconfig.hJack Humbert2016-07-063-377/+4
| | | | |
* | | | | remove uno_slave for now, even though it's freakin coolJack Humbert2016-07-055-448/+0
| | | | |
* | | | | add options to config.hJack Humbert2016-07-051-2/+5
| | | | |
* | | | | Merge branch 'master' into lets-split-supportJack Humbert2016-07-0512-0/+1863
|\| | | |
| * | | | Merge pull request #480 from fredizzimo/add_infinity_ergodoxJack Humbert2016-07-0512-0/+1863
| |\ \ \ \ | | | | | | | | | | | | Add infinity ergodox