summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydoxJack Humbert2018-05-152-1/+48
|\
| * Update info.json for Iris to more closely match physical layout (#2973)Danny2018-05-151-1/+12
| |
| * Added Olivia's HHKB-ish layout to CA66 (#2974)Wilba65822018-05-151-0/+36
| | | | | | | | * Added Olivia's HHKB-ish layout.
* | Merge branch 'master' into hf/shinydoxErez Zukerman2018-05-15277-1427/+8885
|\|
| * Help Barry get pk60 Configurator files fixed (#2971)MechMerlin2018-05-143-14/+84
| |
| * Added YMD75 support (#2968)WarmCat2018-05-1415-0/+1538
| | | | | | | | | | | | | | | | * Adding ymd75 files * Added YMD75 support, inc layout json * Added YMD75 support
| * override hamburger placementChris Fung2018-05-142-0/+11
| |
| * Fix Ortho Compile issueDrashna Jaelre2018-05-141-2/+2
| |
| * Orthodox info.json changesDrashna Jaelre2018-05-1410-95/+54
| |
| * Add rgblight set at commandsDrashna Jaelre2018-05-141-0/+40
| |
| * List all Tap Dancing functions (#2945)Drashna Jaelre2018-05-141-0/+2
| | | | | | | | | | | | * List all Tap Dancing functions * Spelling, which drashna can't do apparently
| * Rgb matrix fixes, I2C library can now retry if it has failed (#2943)yiancar2018-05-147-344/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added Modular keyboards L,R and NUM Created code modules for the 3 modules of the modular keyboard. Original idea by MechboardsUK. Uses i2c implementation similar to lets split * Remove modular from master This is to fix incorrect branching * General fixes for RGB_matrix - Complited speed support for all effects - Fixed raindrop effects to initialized after toggle - Fixed raindrop effects to use all available LEDs - Fixed effect step reverse function - Moved RGB_MATRIX_SOLID_REACTIVE under correct flag * Documentation update for RGBmatrix * More doc updates * I2C library can now retry if it has failed - Replaced the original TWIlib by LFKeyboard's modified version - Allows for an extra argument on TWITransmitData, if blocking is set to 1 function will retry to transmit on failure. Good for noisy boards. * RGB Matrix, use alternative I2C library TWIlib seems to be hanging for me sometimes probably due to ISR routine. I have used i2c_master as a good alternative. Note: this commit is for Wilba6582 to verify before merge * Update rgb_matrix.c * RGB matrix cleanup - Remove TWIlib
| * Add support for Swap Hands feature to Orthodox and Iris (#2933)Drashna Jaelre2018-05-1410-8/+113
| | | | | | | | | | | | | | | | | | | | * Add support for Swap Hands feature to Orthodox and Iris * Fix hag's iris keymap to use LAYOUT properly * Fix Swedish's Iris Keymap * Fix Drashna's Orthodox keymaps, because he's an idiot
| * Reformat 40% Ortho boards to work with Layouts feature (#2804)Drashna Jaelre2018-05-1453-620/+319
| | | | | | | | | | | | | | | | | | | | | | | | * Reformat 40% Ortho boards to work with Layouts feature * Fix krusli keymap to compile properly * Fix mt40 compile errors * Fix layouts * fix RGB?
| * Allow one-shot modifiers to be chainedGergely Nagy2018-05-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many a times one would want to use multiple modifiers with the same key, preferably without having to hold anything, like `Ctrl+Shift+C` or `Ctrl+Shift+V` to copy/paste in GNOME Terminal. To make this possible, we need to be able to chain one-shot modifiers, so that we can have multiple of them active at the same time. The easiest way to accomplish this is that whenever we activate a one-shot modifier, we apply it on top of the existing set, instead of re-setting the state. When deactivating, either due to an interrupt, or due to a timeout, we deactivate all oneshots anyway, so the clearing part is covered. When we turn the one-shot modifier into a toggle, that will also clear all one-shot modifiers first, so we covered that case too. Fixes #2796, #1580, and #856. Signed-off-by: Gergely Nagy <qmk@gergo.csillger.hu>
| * Update my keymap (#2965)Sascha Grunert2018-05-142-15/+24
| | | | | | | | | | | | | | | | | | | | * Add my personal keymap * Improve layout * Update keymap * Set Linux input mode
| * Fix/update XD75 default layout (#2963)Lawrence Ng2018-05-142-15/+15
| | | | | | | | | | Fix layout to match current official default layout: http://www.keyboard-layout-editor.com/#/gists/ac341208e023e4a4d982bccf711ae38f Also add LED controls on FN layer
| * Xton has a dz60 (#2952)xton2018-05-135-12/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * FORK! * WIP - just how i like it * empty * more movement * mouse keys * more vimminess * append/insert shift * WIP - vim macros * blocked out layer below in cmd mode. also, about to restart my cmd approach. * WIP - new vim layer ripoff of the ergodox one, but rewritten as a state machine. * debugged some, got key repeat working * moooar coverage * moooar coverage * regular vis mode * basically done with basics. * some refactoring - common movement sequences into helper function - added some rgb controls * modkey passthru feature * stdized on cmd-left/right instead of ctrl-a/e sadly. as there's no reliable shift-ctrl-e * indicator lights * moved vim layer into userspace * cleaned up some yanking edge cases * docs and some tweaks to layerescapes * updated/added license strings * updated comments * moved config changes to keymap * spurious changes removed * cleanup pass, HT drashna for suggestions - used _keymap() pattern to better modularize event processing in userspace - made some static things static - removed unused function - improved reset. * dz60 started. keymaps done. * bugfixes: missing state change in d-, lspace should toggle vim mode. * Caps lock indicator -> vim indicator. And adjusted mousekey settings. * don't actually need the second move trigger and it makes typing less responsive. * some oppurtunistic bugfixing from my other keyboard (sorry) * added readme for my dz60 keymap. * bugfixing and comments updated (niu_mini) * cleanup as suggested from review
| * update template copyrights to 2018 (#2962)MechMerlin2018-05-137-8/+8
| |
| * info.json update to pk60 (#2961)Barry Huang2018-05-132-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Play Keyboard60 PCB pk60 PCB files upload * Add readme files for pk60 * error solving * uneeded question marks removed * Update readme.md * Layouts update Including ANSI, ISO, 2 kinds of arrows, minila and ALL layouts. * info.json and redme.md fix * uppercase fix to lowercase
| * Default layout for the Redox keyboard (#2954)Mattia Dal Ben2018-05-137-16/+180
| | | | | | | | | | | | * Improved default layout for Redox keyboard, renamed old layout * Corrected copyright note
| * Play Keyboard60 PCB upload (#2953)Barry Huang2018-05-137-0/+208
| | | | | | | | | | | | | | | | | | | | | | | | * Play Keyboard60 PCB pk60 PCB files upload * Add readme files for pk60 * error solving * uneeded question marks removed
| * Add standard layout 60% support for QMK Configurator and user space (#2950)MechMerlin2018-05-123-1/+22
| |
| * xtonhasvim cleanup (#2947)xton2018-05-122-28/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * FORK! * WIP - just how i like it * empty * more movement * mouse keys * more vimminess * append/insert shift * WIP - vim macros * blocked out layer below in cmd mode. also, about to restart my cmd approach. * WIP - new vim layer ripoff of the ergodox one, but rewritten as a state machine. * debugged some, got key repeat working * moooar coverage * moooar coverage * regular vis mode * basically done with basics. * some refactoring - common movement sequences into helper function - added some rgb controls * modkey passthru feature * stdized on cmd-left/right instead of ctrl-a/e sadly. as there's no reliable shift-ctrl-e * indicator lights * moved vim layer into userspace * cleaned up some yanking edge cases * docs and some tweaks to layerescapes * updated/added license strings * updated comments * moved config changes to keymap * spurious changes removed * cleanup pass, HT drashna for suggestions - used _keymap() pattern to better modularize event processing in userspace - made some static things static - removed unused function - improved reset.
| * More work on Talljoe layout including adding layout support for HHKB and ↵Joe Wasson2018-05-1226-28/+407
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TKL. (#2946) * Add tap-dancing semicolon. * Infinity60 was running out of USB space. * Rename common layout variable so it doesn't collide with some keyboards. * Godspeed!!! * Patch the number of LEDs for 1up60rgb * Don't light up if rgblight is off. * Add HHKB layout. * Add HHKB to Talljoe's layout. * Bring back bananasplit keymap. * info.json * Userspace config.h doesn't seem to be setting PREVENT_STUCK_MODIFIERS * Remove 1uprgb workaround * Add TKL to talljoe keymap. Also introduces the tkl layout.
| * edit readmes for layout for 60_ansi (#2944)MechMerlin2018-05-122-2/+66
| |
| * Added bootmagic_lite() (#2942)Wilba65822018-05-121-0/+29
| |
| * Xton's first keymap! (#2941)xton2018-05-1210-1/+952
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * FORK! * WIP - just how i like it * empty * more movement * mouse keys * more vimminess * append/insert shift * WIP - vim macros * blocked out layer below in cmd mode. also, about to restart my cmd approach. * WIP - new vim layer ripoff of the ergodox one, but rewritten as a state machine. * debugged some, got key repeat working * moooar coverage * moooar coverage * regular vis mode * basically done with basics. * some refactoring - common movement sequences into helper function - added some rgb controls * modkey passthru feature * stdized on cmd-left/right instead of ctrl-a/e sadly. as there's no reliable shift-ctrl-e * indicator lights * moved vim layer into userspace * cleaned up some yanking edge cases * docs and some tweaks to layerescapes * updated/added license strings * updated comments * moved config changes to keymap * spurious changes removed
| * Fix syntax, add laylock with backlight toggle on locked layer (#2940)akrob2018-05-121-18/+88
| | | | | | | | | | | | | | | | | | | | * Create config.h * Create rules.mk * Create keymap.c * fix syntax and add latest
| * FaceW Keyboard Support (#2939)MechMerlin2018-05-1213-0/+1011
| | | | | | | | | | | | | | | | | | | | * preliminary checkin for facew keyboard * Update readme file * put the standard 60 ansi layout in * update rules to have LAYOUT_60_ansi to use my userspace layouts
| * Updated Ergo42 hdbx keymap (#2927)Hide2018-05-113-106/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add * Revert "Add" This reverts commit 4b10fef88712a63f4a91410410b4c99346fa1b24. * Add Ergo42 keymaps for JIS layout * Fix hdbx keymap for Ergo42 Changed some keys layout and add description. * Updated hdbx keymaps for Ergo42 Now using update_tri_layer_state. Underglow color sync layer-switching. * Fixed hdbx keymap Deleted rgb define line (now using master) and fixed some issues pointed out. * update ignore * fixed
| * Fix up info.json file for Iris (#2935)Danny2018-05-101-1/+1
| |
| * Backlight and RGB now working for JJ50 (#2929)WarmCat2018-05-1013-46/+525
| | | | | | | | | | | | | | | | | | | | * Added support for JJ50 from KPRepublic, no rgb or backlight control yet. Added as a layout of ymd96 at the moment (same microprocessor). Basic keymap with three layers to get started. * Added support for JJ50 * Tidied up jj50 code, backlight and RGB is now working. * Renaming "KEYMAP" to "LAYOUT" to adhere to the new QMK standards.
| * Move ckeys workshop to its own directory (#2928)MechMerlin2018-05-1017-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | * move obelus and nakey to ckeys directory * delete the originals * short readme about ckeys * edit readmes to reflect new changes * add build guide info..and here's me trying to retrigger the build job
| * Support both AVR and ps2avrGB targets for new_project script (#2811)MechMerlin2018-05-1018-5/+812
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Stopping point at creating targets for new_project script * Add second argument for target * Add the ps2avrgb target * consider the case where the firmware type target is not valid * fix template files to be more generic * Code cleanup * Change variable name to be more descriptive * make avr the default * forgot to put the template files in * Take out useless comments * add usage info
| * General RGB matrix fixes (#2931)yiancar2018-05-103-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added Modular keyboards L,R and NUM Created code modules for the 3 modules of the modular keyboard. Original idea by MechboardsUK. Uses i2c implementation similar to lets split * Remove modular from master This is to fix incorrect branching * General fixes for RGB_matrix - Complited speed support for all ef