summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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
2018-05-09QMK Configurator Support for Paladin64 PCB (#2926)MechMerlin4-7/+106
2018-05-09update doc optionsJack Humbert2-2/+2
2018-05-09Add effect speed support for RGB Matrix *No EEPROM yet* (#2922)yiancar8-3/+70
* 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 * Add effect speed support for RGB Matrix *No eeprom yet* Keycodes RGB_SPI and RGB_SPD have been added to increase and decrease effect speed. Speed is not saved in EEPROM yet as per Jack's request. * Update rgb_matrix.c * RGB Matrix speed fix rgblight.h * More fixes for rgb speed. Speed functions declared but not used in rgblight * More travis fixes.. * Another one for travis..
2018-05-09Alf X2 Layout Fixes (#2923)MechMerlin5-55/+61
* Move the microswitches to the top of the keyboard like how it is physically Format change to make things pretty * Fix keymap to match the new layouts * stopping point at new info.json file * Update readme * Finish up QMK Configurator fixes for info.json
2018-05-09Add Teensy ++ 2.0 bootloader supportDrashna Jaelre1-1/+6
2018-05-09small update to default keymap (#2902)Pim Ostendorf1-1/+1
* changed behaviour of the spacebars in game mode to better support games
2018-05-09QMK Configurator Support for bananasplit (#2882)MechMerlin14-63/+74
* Change KEYMAP to LAYOUT refactor * Add info.json for QMK Configurator Support * Change LAYOUT_ansi to LAYOUT_60_ansi * removed talljoe's placeholder keymaps * change LAYOUT to LAYOUT_base
2018-05-09more fixes for configurator (#2920)Hannes Egler1-4/+4
2018-05-09Configurator updates for Atreus62 (#2913)noroadsleft8-284/+295
* c10r: Atreus62 * Removed bootloader flag from info.json
2018-05-09enable eeprom for rgb matrixJack Humbert1-1/+1
2018-05-08Merge branch 'master' of github.com:qmk/qmk_firmwareJack Humbert18-251/+29
2018-05-08updated music maskJack Humbert5-14/+54
2018-05-08switch to the vue theme and add searchskullY1-1/+10
2018-05-08Fix Atom47 KeyboardDrashna Jaelre17-250/+19
2018-05-08Adds IS31FL3731 RGB Matrix Implementation (#2910)Jack Humbert19-19/+2336
* adds is31fl3731 rgb matrix implementation * fix build script for force pushes * allow bootloader size to be overwritten * adds planck light implementation * split led config into 2 arrays * idk * betterize register handling * update planck implementation * update planck * refine rgb interface * cleanup names, rgb matrix * start documentation * finish up docs * add effects list * clean-up merge * add RGB_MATRIX_SKIP_FRAMES * add support for at90usb1286 to bootloader options
2018-05-08kbd75 fixes for the configurator (#2908)Hannes Egler1-89/+90
fixed the info.json
2018-05-08KBD8X QMK Support (#2915)MechMerlin9-0/+504
* initial commit * add row/column and pin info * Add first part of switch matrix * documentation and additional config items * map out the non confusing part of the matrix * map out the top row * ok I think I got it * fix some stupid compile errors * put in a default keymap * rename LAYOUT to LAYOUT_all * add a standard layout and info.json file * Fix up readme for default keymap * Add toggle key LED functionality * changes based on review feedback
2018-05-08Some more tweaks to make everything look niceskullY4-8/+7
2018-05-08Fix up info boxes.skullY11-91/+119
2018-05-08Use docsfy to replace gitbookskullY5-6/+1005
2018-05-07added additional configurator support (#2905)Hannes Egler6-147/+550
* added additional configurator support Added support for choosing between 5 configurator options: Layout (supports all keys) Layout_ansi_1u Layout_iso_1u Layout_ansi Layout_iso * confirming to conventions replaced .h filenames with QMK_KEYBOARD_H
2018-05-07Thanks to talljoe, 1up60 actually only has 16, not 20 RGB LEDs (#2906)MechMerlin1-1/+1
2018-05-05Fixed hdbx keymaps (#2899)hdbx2-35/+35
* 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.
2018-05-05Added Tanuki Keyboard (#2894)Pim Ostendorf6-0/+340
* added tanuki * updated definitions to new qmk standard * complying with suggestions made by drashna * update rulesfile * used qmk template for readme file
2018-05-05infinite emoji (#2898)Nick Choi1-81/+66