summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-15Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydoxJack Humbert
2018-05-15Update info.json for Iris to more closely match physical layout (#2973)Danny
2018-05-15Added Olivia's HHKB-ish layout to CA66 (#2974)Wilba6582
* Added Olivia's HHKB-ish layout.
2018-05-15Merge branch 'master' into hf/shinydoxErez Zukerman
2018-05-14Help Barry get pk60 Configurator files fixed (#2971)MechMerlin
2018-05-14Added YMD75 support (#2968)WarmCat
* Adding ymd75 files * Added YMD75 support, inc layout json * Added YMD75 support
2018-05-14override hamburger placementChris Fung
2018-05-14Fix Ortho Compile issueDrashna Jaelre
2018-05-14Orthodox info.json changesDrashna Jaelre
2018-05-14Add rgblight set at commandsDrashna Jaelre
2018-05-14List all Tap Dancing functions (#2945)Drashna Jaelre
* 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)yiancar
* 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 Jaelre
* 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 Jaelre
* 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 Nagy
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 Grunert
* Add my personal keymap * Improve layout * Update keymap * Set Linux input mode
2018-05-14Fix/update XD75 default layout (#2963)Lawrence Ng
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-13Xton has a dz60 (#2952)xton
* 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-13update template copyrights to 2018 (#2962)MechMerlin
2018-05-13info.json update to pk60 (#2961)Barry Huang
* 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-13Default layout for the Redox keyboard (#2954)Mattia Dal Ben
* Improved default layout for Redox keyboard, renamed old layout * Corrected copyright note
2018-05-13Play Keyboard60 PCB upload (#2953)Barry Huang
* Play Keyboard60 PCB pk60 PCB files upload * Add readme files for pk60 * error solving * uneeded question marks removed
2018-05-12Add standard layout 60% support for QMK Configurator and user space (#2950)MechMerlin
2018-05-12xtonhasvim cleanup (#2947)xton
* 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 Wasson
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)MechMerlin
2018-05-12Added bootmagic_lite() (#2942)Wilba6582
2018-05-12Xton's first keymap! (#2941)xton
* 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)akrob
* Create config.h * Create rules.mk * Create keymap.c * fix syntax and add latest
2018-05-12FaceW Keyboard Support (#2939)MechMerlin
* 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)Hide
* 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)Danny
2018-05-10Backlight and RGB now working for JJ50 (#2929)WarmCat
* 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)MechMerlin
* 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)MechMerlin
* 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)yiancar
* 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-09gcc 8.10 compilation fix (#2914)sameehj
* 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-09turn it onJack Humbert
2018-05-09Added propper support for Lets split vitamins (#2559)Mikkel Jeppesen
* 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)MechMerlin
* 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)MechMerlin
2018-05-09disables RGB Matrix for nowErez Zukerman
just to see if that's why the board doesn't work. And it is... With this, the board works.
2018-05-09a quick attemptErez Zukerman
2018-05-09update doc optionsJack Humbert
2018-05-08Add effect speed support for RGB Matrix *No EEPROM yet* (#2922)yiancar
* 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-08Alf X2 Layout Fixes (#2923)MechMerlin
* 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-08Add Teensy ++ 2.0 bootloader supportDrashna Jaelre
2018-05-08small update to default keymap (#2902)Pim Ostendorf
* changed behaviour of the spacebars in game mode to better support games
2018-05-08QMK Configurator Support for bananasplit (#2882)MechMerlin
* 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-08more fixes for configurator (#2920)Hannes Egler
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 16:45:23 +0000