summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-05-19fix broken links in readme.md for bigseries (#2997)Joe Burchett1-1/+1
2018-05-19Updating my maps in upstream master (#2987)Xyverz37-572/+2067
* Adding Rama M10-A Macropad * ch-ch-ch changes... * Major overhaul based on SMT's keymap. * more changes. * Moved the FKeys to the ADJUST layer. * More rearranging. * Alias in Atreus62 keymap to make it more legible Added config.h to fix tapping_term issue for Caps Lock key in OSX * Added OrthoDox layout. * More layout changes. * Fixing things with the keyboard. * Finishing touches. Set left-hand master in config.h Embedded the arrow keys in keymap.c * Revised keymap making this easier to use. * additions and changes. * changes to various keymaps. * Minor adjustments to OrthoDox layout. * Added Eco keymap. Updated Let's Split keymap. * Added gherkin * Removed my M10A keymap * Planck Keymap Updates Updated my Planck keymap and created a simple keymap for Seph's Preonic. * Added readme * readme fixes * Update readme.md more clarification * Keymap Tweaks Removed the Power button setting from the keymap. It was in a horrible location. I'll work on getting it setup somewhere else sometime later. * Added Readme I finally got around to adding a readme to this keymap. I've also added minor changes to the layout. * Fixed Keymap Error * Fixed Readme * adding iris and levinson keymaps * Tweaks to keymap * added youngJZ keymap * Changes to keymap Added a readme.md * Levinson changes Added the readme.md and rules.mk files. Configured RGB underglow and backlighting. * fixed readme * changes to keymaps * Updated keymap * Updated readme.md * Updated Readme (again) * Updated Readme Fixed formatting. Again. * Updated readme This is the last readme update for this keyboard update. I hope. * Added Contra keymap * Kinesis Keymap Update * Updated Keymaps I've updated my Kinesis (Stapelberg) layout and my Clueboard 66 layout. I've also updated my Kinesis Readme. * Clueboard Keymap update Added media keys to my Clueboard 66 Rev2 layout. * Added keymap Added Minidox keymap & rules. Added user function to Let's Split keymap that turns off the red LEDs on the Pro Micros. * New Zen keymap Added Zen keyboard to my list of keyboards, so had to generate a new keymap for it. Also adding some changes to my MiniDox keymap and config.h, as well as my Levinson's config.h. The config.h file changes enable ee_hands. * A few changes for useability I made a few changes to the Minidox keymap to see if I can't make it more useable. I'm also working on streamlining the Zen keyboard keymap to reduce layers. * Re-vamped Iris keymap. * changes * minor keymap change This was a minor keymap change to use mod_tap for the backspace key: ALT when held, BSPC when tapped. * Added Fourier keymap * Keymap Cleanup Moved KC_ESC to KC_CAPS, and changed KC_ESC to KC_GRV This is because of muscle memory, I kept hitting ESC when trying to hit TAB. * Keymap Adjustments Swapped Caps/Esc, put Caps in Raise/Lower layers, put Grv in normal Esc position. Adjusted the readme.md to reflect these changes. * minor tweaks Added code to disable red ProMicro LEDs after flashing. * Clean-up * Corrections to keymap. Fixed a foul-up in the Zen keymap where the lctrl was where the LOWER should have been. * Changes to make this fall in line with the new Layout features * Moving to LAYOUTs for 4x12 boards * fixed config.h file * standardization changes * Reverted Atreus62 keymap to LAYOUT format * Switch Preonic and Nyquist to ortho_5x12 * Corrections to config.h * config.h file tweaks * config.h file tweaks
2018-05-18Add Contra layout & cleanup a few things (#2998)Harley Laue9-12/+153
* Have Del become backspace on the bottom layer for grid layouts * Fix modtap for ESC * Add sleep to Adjust layer
2018-05-18trigger api updateskullY0-0/+0
2018-05-18remove a KC-NO in row 1 (#2994)MechMerlin1-2/+2
2018-05-18Add QMK Configurator support and remove Layouts definitions (#2977)MechMerlin6-6/+36
* Add QMK Configurator support and remove userspace definitions * fix that build breakage * Unsupport community layouts but use standard layouts
2018-05-17Add copy of knops/mini default keymap with comments for new user (#2989)GreenShadowMaker3-0/+521
2018-05-17Fixed sprintf overflowM1K3L081-1/+1
2018-05-16Make sure new features (RGB Matrix) are actually listedDrashna Jaelre2-0/+3
2018-05-16Fix Orthodox Info.json filesDrashna Jaelre3-24/+51
2018-05-16Yet another update to drashna keymaps and userspace (EEPROM, RGB indicators) ↵Drashna Jaelre12-251/+275
(#2959) * More Iris Tweaks * Mess with iris arrow keys * Massive layout overhaul to make everything more OLKB * Additional tweaks * Cleanup Userspace Remove unused layer code, and properly set userspace eeprom structure. * EEPROM stuff * Only use indicators if layer indication is enabled * Iris and Orthodox Tweaks (Status Indicators) * Additional tweaks to finish tri layer conversion * Disable ProMicro ligths globally * Add Pro Micro hacking info * Successfully get mod indication working on thumb clusters * Enable printing when console is enabled * Make Modifier Indicator lights more modular * Keymap cleanup * Tapping test changes * Cleanup and minor tweaks
2018-05-16Add default to LEADER_TIMEOUT in case it's not defined (#2818)Drashna Jaelre2-3/+6
* Add default to LEADER_TIMEOUT in case it's not defined * Update Leader Timeout default
2018-05-15Addition of HS60 ISO keyboard (#2972)yiancar7-0/+660
* 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 * HS60 initial rgb port porting HS60 to master rgb code * HS60 fixes * Hs60 rgb changes * Cleanup for HS60 ISO * More HS60 cleanup * Update config.h * More Cleanup for HS60 * HS60 modifications to work with configurator * More HS60 cleanup * Remove userspace layouts on HS60 * Update rules.mk * HS60 bootloader change
2018-05-15Update info.json for Iris to more closely match physical layout (#2973)Danny1-1/+12
2018-05-15Added Olivia's HHKB-ish layout to CA66 (#2974)Wilba65821-0/+36
* Added Olivia's HHKB-ish layout.
2018-05-14Help Barry get pk60 Configurator files fixed (#2971)MechMerlin3-14/+84
2018-05-14Added YMD75 support (#2968)WarmCat15-0/+1538
* Adding ymd75 files * Added YMD75 support, inc layout json * Added YMD75 support
2018-05-14override hamburger placementChris Fung2-0/+11
2018-05-14Fix Ortho Compile issueDrashna Jaelre1-2/+2
2018-05-14Orthodox info.json changesDrashna Jaelre10-95/+54
2018-05-14Add rgblight set at commandsDrashna Jaelre1-0/+40
2018-05-14List all Tap Dancing functions (#2945)Drashna Jaelre1-0/+2
* List all Tap Dancing functions * Spelling, which drashna can't do apparently
2018-05-14Rgb matrix fixes, I2C library can now retry if it has failed (#2943)yiancar7-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
2018-05-14Add support for Swap Hands feature to Orthodox and Iris (#2933)Drashna Jaelre10-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
2018-05-14Reformat 40% Ortho boards to work with Layouts feature (#2804)Drashna Jaelre53-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?
2018-05-14Allow one-shot modifiers to be chainedGergely Nagy1-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>
2018-05-14Update my keymap (#2965)Sascha Grunert2-15/+24
* Add my personal keymap * Improve layout * Update keymap * Set Linux input mode
2018-05-14Fix/update XD75 default layout (#2963)Lawrence Ng2-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
2018-05-14Xton has a dz60 (#2952)xton5-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
2018-05-14update template copyrights to 2018 (#2962)MechMerlin7-8/+8
2018-05-14info.json update to pk60 (#2961)Barry Huang2-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
2018-05-14Default layout for the Redox keyboard (#2954)Mattia Dal Ben7-16/+180
* Improved default layout for Redox keyboard, renamed old layout * Corrected copyright note
2018-05-13Play Keyboard60 PCB upload (#2953)Barry Huang7-0/+208
* Play Keyboard60 PCB pk60 PCB files upload * Add readme files for pk60 * error solving * uneeded question marks removed
2018-05-13Add standard layout 60% support for QMK Configurator and user space (#2950)MechMerlin3-1/+22
2018-05-13xtonhasvim cleanup (#2947)xton2-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.
2018-05-12More work on Talljoe layout including adding layout support for HHKB and ↵Joe Wasson26-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.
2018-05-12edit readmes for layout for 60_ansi (#2944)MechMerlin2-2/+66
2018-05-12Added bootmagic_lite() (#2942)Wilba65821-0/+29
2018-05-12Xton's first keymap! (#2941)xton10-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
2018-05-12Fix syntax, add laylock with backlight toggle on locked layer (#2940)akrob1-18/+88
* Create config.h * Create rules.mk * Create keymap.c * fix syntax and add latest
2018-05-12FaceW Keyboard Support (#2939)MechMerlin13-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
2018-05-11Updated Ergo42 hdbx keymap (#2927)Hide3-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
2018-05-10Fix up info.json file for Iris (#2935)Danny1-1/+1
2018-05-10Backlight and RGB now working for JJ50 (#2929)WarmCat13-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.
2018-05-10Move ckeys workshop to its own directory (#2928)MechMerlin17-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
2018-05-10Support both AVR and ps2avrGB targets for new_project script (#2811)MechMerlin18-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
2018-05-10General RGB matrix fixes (#2931)yiancar3-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 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
2018-05-10gcc 8.10 compilation fix (#2914)sameehj2-2/+2
* Use memmove instead of memcpy gcc 8.1 gives the following error: lib/lufa/LUFA/Drivers/USB/Class/Common/HIDParser.c:93:5: error: 'memcpy' accessing 42 bytes at offsets 28 and 0 overlaps 14 bytes at offset 28 [-Werror=restrict] This patch resolve this by using memmove instead Signed-off-by: Sameeh <Sameeh Jubran> * Remove ATTR_CONST from a void returning function gcc 8.10 gives the following error when attempting to compile lib/lufa/LUFA/Drivers/USB/Core/Events.h:334:5: error: 'const' attribute on function returning 'void' [-Werror=attributes] Signed-off-by: Sameeh <Sameeh Jubran>
2018-05-09Added propper support for Lets split vitamins (#2559)Mikkel Jeppesen23-3/+1684
* Added support for the upcomming Lets_split vitamins included * Updated readme * Corrected header of readme * Enabled RGB * Broke everything * broke some more shit * Revert "broke some more shit" This reverts commit 6ad68e6269cc0d04c16564ce9598dfd3db1e23c1. * Revert "Broke everything" This reverts commit feeee4e40db15a726f2292b6a9406ef45c1e54a7. * Fixed USB detection, and RGB on slave * started modifying readme, to use msys2 * Added support for the upcomming Lets_split vitamins included * Updated readme * Corrected header of readme * Enabled RGB * Broke everything * broke some more shit * Revert "broke some more shit" This reverts commit 6ad68e6269cc0d04c16564ce9598dfd3db1e23c1. * Revert "Broke everything" This reverts commit feeee4e40db15a726f2292b6a9406ef45c1e54a7. * Fixed USB detection, and RGB on slave * started modifying readme, to use msys2 * Updated readme to reflect use of msys2 Added avrdude to msys path * added avrdude option to msys installer * Removed extra installation of avrdude * Renamed to vitamins_included and implemented drashnas changes * Fixed include guard * Fixed some includes, and added avrdude target to docs. * Fixed default keyboard
2018-05-09Add standard layout to XD60 (#2925)MechMerlin17-62/+82
* add new layout and fix formatting * Add 60_ansi layout so I can use my user space defined layouts * Make QMK_KEYBOARD_H and LAYOUT renames * update info.json file