aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Kira 75 QMK Support (#3003)MechMerlin2018-05-209-0/+473
| | | | | | | | | | | | | | | | * preliminary check in of Kira75 * Layout done * make an appropriate keymap and fix layout commas * formatting changes and housekeeping * add info.json contents for QMK Configurator support * add RGB underglow support * add support for caps and num lock leds
* qwerty_code_friendly: correct typos (#3002)Campbell Barton2018-05-202-30/+34
| | | | | | | | * qwerty_code_friendly: correct typos * qwerty_code_friendly: right thumb for media keys Allows for single handed media control.
* Merlin community layouts (#3004)MechMerlin2018-05-2023-158/+24
| | | | | | | | | | | | * community layout support for eagle_viper v2 and remove mechmerlin keymap dir * community layout support for eagle_viper v2 and remove mechmerlin keymap dir * Change to QMK_KEYBOARD_H and remove merlin keymap in favor of cmmunity layouts * community layout support 60_ansi * community layout support for 60_ansi
* Renamed jd40's LAYOUT to LAYOUT_kc (#3000)MechMerlin2018-05-182-7/+19
| | | Made a new LAYOUT without all the KC_##
* checking in xxinophobia's changes to get ISO enter working correctly (#2999)MechMerlin2018-05-181-2/+1
|
* change do60 config (#2996)sennin322018-05-185-23/+55
| | | | | | | | | | * add do60 support * DO60 on market config v0.2.8 * remove do60x * Changes for matching new naming rule
* fix broken links in readme.md for bigseries (#2997)Joe Burchett2018-05-181-1/+1
|
* Updating my maps in upstream master (#2987)Xyverz2018-05-1837-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
* Add Contra layout & cleanup a few things (#2998)Harley Laue2018-05-189-12/+153
| | | | | * Have Del become backspace on the bottom layer for grid layouts * Fix modtap for ESC * Add sleep to Adjust layer
* trigger api updateskullY2018-05-180-0/+0
|
* remove a KC-NO in row 1 (#2994)MechMerlin2018-05-181-2/+2
|
* Add QMK Configurator support and remove Layouts definitions (#2977)MechMerlin2018-05-176-6/+36
| | | | | | | | * Add QMK Configurator support and remove userspace definitions * fix that build breakage * Unsupport community layouts but use standard layouts
* Add copy of knops/mini default keymap with comments for new user (#2989)GreenShadowMaker2018-05-173-0/+521
|
* Fixed sprintf overflowM1K3L082018-05-161-1/+1
|
* Make sure new features (RGB Matrix) are actually listedDrashna Jaelre2018-05-152-0/+3
|
* Fix Orthodox Info.json filesDrashna Jaelre2018-05-153-24/+51
|
* Yet another update to drashna keymaps and userspace (EEPROM, RGB indicators) ↵Drashna Jaelre2018-05-1512-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
* Add default to LEADER_TIMEOUT in case it's not defined (#2818)Drashna Jaelre2018-05-152-3/+6
| | | | | | * Add default to LEADER_TIMEOUT in case it's not defined * Update Leader Timeout default
* Addition of HS60 ISO keyboard (#2972)yiancar2018-05-157-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
* 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.
* 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 09:11:13 +0000