aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Keymap: Update personal keymap (#3855)Matthew Treadwell2018-09-052-42/+24
| | | | | | * Updated personal keymap * simplified keymap based on suggestions
* Keymap: mitosis/datagrok: bug fix (#3854)Michael F. Lamb2018-09-051-1/+1
| | | | I don't know how this slipped past the test suite in the last merge, but this syntax I tried is invalid and doesn't compile. Fixed.
* Keyboard: Add IBM 122-key Terminal keyboard and my Ergodox EZ keymap ↵Luke Stanley2018-09-0516-0/+1896
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Programmer's Dvorak + Gaming/QWERTY layer) (#3850) * added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers) * updated ergodox_ez keymap and initial commit for IBM Model M 122 key * added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers) * updated ergodox_ez keymap and initial commit for IBM Model M 122 key * Add keyboard information and separated my custom layout from the default * Add readme to Lukaus' Ergodox EZ keymap * added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers) * updated ergodox_ez keymap and initial commit for IBM Model M 122 key * added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers) * updated ergodox_ez keymap and initial commit for IBM Model M 122 key * Add keyboard information and separated my custom layout from the default * Add readme to Lukaus' Ergodox EZ keymap * added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers) * updated ergodox_ez keymap and initial commit for IBM Model M 122 key * Fix merge conflict again? * updated ergodox_ez keymap and initial commit for IBM Model M 122 key * Add keyboard information and separated my custom layout from the default * Add readme to Lukaus' Ergodox EZ keymap * added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers) * added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers) * updated ergodox_ez keymap and initial commit for IBM Model M 122 key * updated ergodox_ez keymap and initial commit for IBM Model M 122 key * Add keyboard information and separated my custom layout from the default * update keymap * Update rules.mk to remove redundant commented line * Fix missing key on default layout for IBM Model M 122 key * Fix issues identified by drashna and noroadsleft * Update readme for IBM 122 key
* Keymap: Add am keymap (#3843)antonio miranda2018-09-054-0/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add am keymap * Add configuration to play nice with stuck modifiers This is in particular useful with emacs since its easy to get ctrl stuck * Deactivate mouse keys and backlight * Add control/esc and shift/enter taps * Remove DVORAK and PLOVER I won't be using this soon, so getting some free space * Raiser and Lower ideas from jeebak * Add cursor and mouse layers * Enable mouse keys * Switch underscore with minus * Disable audio and fix warnings * Update to the upstream changes * VIM line motion symbols on the raise layer * Enable sound and freeup some media keys on layers * Fix whitespace on keymap * Code review changes * Improve keymap documentation * Improve keymap to match to the default one * Restore DEFAULT_FOLDER to the default value * Fix config.h unescaped line
* CTRL and ALT updatespatrickmt2018-09-057-7/+290
| | | | | | | | Added support to enter bootloader from software (bootloader version must be newer than "v2.18Jun 22 2018 17:28:08" until workaround for older is created). Updated CTRL and ALT keymaps for entering bootloader with Fn+b held for >500ms. Added basic MacOS keymap for ALT. USB sleep LED indicator now turns off after 1 second. Slowed down debug LED code printing.
* Add the ability to disable the USB startup check for Chibiosyiancar2018-09-052-0/+11
| | | | | | - Added support for NO_USB_STARTUP_CHECK. This allows the keyboard do function and not get stuck in a SUSPENDED state loop in case of no USB connection. - Added support for WAIT_FOR_USB. In LUFA no keyboard has this flag enable therefor no keyboard waits for usb to be active. - Added documentation for both configuration flags as they were missing.
* Keyboard: formatting changes for readme and enable bootmagic (#3851)MechMerlin2018-09-042-2/+3
|
* mitosis:datagrok add layer select, more layouts (#3835)Michael F. Lamb2018-09-046-163/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mitosis:datagrok: fix typo'd inconsistent brace arrangement (thank you @cari66ean) * mitosis:datagrok: add makefile argument MITOSIS_DATAGROK_SLOWUART * mitosis:datagrok: return backspace to opposite space, use TT(), more - move backspace back to its position opposite space - move del to red+backspace - move tab back to tap-leftshift - move printscreen/scrolllock/pause to blue+left pinky column - use TT() instead of MO() to stick a layer on if wanted - indentation that my text editor wants - default to no audio; i can enable it at compile time. * mitosis:datagrok: modularize features, add default layer rotator key * mitosis: add MITOSIS_DATAGROK_BOTTOMSPACE makefile argument * mitosis:datagrok: README improvements; document new features * mitosis:datagrok: dot. not "number pad dot." in numbers layer * mitosis:datagrok remove unnecessary _user audio code * mitosis:datagrok: return to MO() for red/blue, keep TT() for purple in this way, the LED still updates quickly when red or blue is pressed, but we can still lock the purple layer on for 10-key numpad operation with red+tapping blue. * mitosis:datagrok: add colemak and dvorak default layers * mitosis:datagrok update readme re: available default layouts * mitosis: remove unneeded code that was overriding led_set_user also, add some comments * mitosis:datagrok: updated led setting code for new layers also, place into led_set_user where it belongs, not matrix_scan_user. * mitosis:datagrok: update LEDs when setting the default layer maybe this should go into default_layer_set? * mitosis:datagrok update readme with new imgur links + other improvements * mitosis:datagrok fix typo in image urls * mitosis:datagrok remove useless #include (ty @drashna) * mitosis:datagrok undo unnecessary change to quantum/quantum.h i can put the extern float definition in my own keymap code. (ty @drashna) * mitosis:datagrok move customized layout to my keymap no need to modify keyboard-level mitosis.h. (ty @drashna) * mitosis:datagrok update comment describing my led indicator logic * datagrok:mitosis update readme to document LED indicator.
* Keymap: Create ISO HHKB keymapping for GH60 (#3832)Emīls Delle2018-09-041-0/+51
| | | | | | | | * Create ISO HHKB keymapping for GH60 * Add media controls to Fn layer * Use M(x) instead of F(x), add Copyright text
* Keymap: Added a keymap like a JIS keyboard for JJ 40. (#3847)marksard2018-09-043-0/+254
|
* fix mousekey callJack Humbert2018-09-031-6/+11
|
* Keymap: Massdrop CTRL: add basic MacOS support (#3842)Elisiano Petrini2018-09-031-0/+203
| | | | | | | | * swap KC_LALT with KC_LGUI * replace KC_RALT with KC_RGUI This makes the keyboard more mac friendly out of the box (I'm aware this that this could partially be done in software with the preferences but hey, where's the fun in that).
* Keymap: Updates to xyverz keymaps (#3841)Xyverz2018-09-034-34/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixing ortho_4x12 configs * Using upstream/master version instead * Additions and Corrections Corrected the Kinesis/Stapelberg's .c file to allow LEDs to work Removed excess cruft from my Kinesis keymap to reflect this change Other minor tweaks and adjustments to my ortho_4x12 and 5x12 layouts * Rules for vitamins_included Added a section to disable RGB underglow for the Let's Split Vitamins Included board. * fixing ortho_4x12 configs * Using upstream/master version instead * Additions and Corrections Corrected the Kinesis/Stapelberg's .c file to allow LEDs to work Removed excess cruft from my Kinesis keymap to reflect this change Other minor tweaks and adjustments to my ortho_4x12 and 5x12 layouts * Creating my own userspace * Added Rorschach keymap * renamed userspace folder I renamed my userspace folder since I'm not ready to start using it just yet, and I want to get my keyboards programmed. This is a temporary thing and will be fixed later as I get time. * adding files in "new" folder * Disabling LEDs on Pro Micro * Modifications to Kinesis keymap * More kinesis tweaks * removed userspace from master Created a new branch for my userspace stuff. I'll work on it there. * Moved keymap to separate branch Moved the Rorschach keymap I was working on to a separate branch for development purposes. Not ready to push it up to upstream master.
* Keymap: Fix missing braces around initializer error on older gcc (#3840)Xin-Xin Wang2018-09-031-2/+2
|
* Keymap: xtonhasvim Levinson (#3837)Christon DeWan2018-09-034-0/+286
| | | | | | | | | | * pulled in levinson from staging. * simplified trilayer handling and some other linting that bit me in the last code review * formatting
* Keyboard: Add support for Diverge TM2 (#3829)Christon DeWan2018-09-0313-0/+684
| | | | | | | | | | | | | | | | | | | | * pulling in diverge tm2 from staging branch * cleaned up comments, docs, licenses * refactored apparent grid to make 2u spacebars more obvious * various delinting from noroadsleft review * most of drashna's feedback responded to - lots of lint swept - used more modern tri-layer functions - still need to adopt modern split support. * switch to common split code. remove comment cruft * tapping force hold makes LT way more usable for rapid , sequences
* Keyboard: Improvement of crkbd communication functions (based on ↵marksard2018-09-0331-233/+580
| | | | | | | | | | | | | | | helix-keyboard) (#3798) * improvement of crkbd communication functions (based on helix-keyboard) * Removed unnecessary code. * Changed read restriction from #define to #pragma once. * Changed from sizeof to defined size. * moved lib folder to crkbdroot. removed warning of ws2812.d
* Enable mouse keys in register_code and unregister_codeSteven Liu2018-09-031-0/+6
| | | | This allows for macros to be assigned to press two mouse directions at same time, which allows for one key diagonals.
* Keymap: share my ortho_4x12 layout symbolic (#3833)leico2018-09-023-0/+288
| | | | | | | | | | | | | | * add ortho_4x12 symbolic layout * delete trash * modify little bit * fixed doesn't requires replace `#ifndef ... #endif` to `#pragma ones` in config.h delete `QMK_KEYBOARD_CONFIG_H` in config.h delete `action_layer.h` and `eeconfig.h` in keymap.c
* Keymap: Added personal layout for FC660C (#3834)Damien2018-09-021-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * - Fixed DK60 version in config.h * - Updated dk60 readme with new QMK rules * - Fixed wording in readme * Added dbroqua layout for DZ60 I've also updated dz60.h to add "true HHKD" keymap definition (6U spacebar). With the default HHKB definition r_alt was not mapped and when I pressed r_menu it was r_alt. Regards * Updated dbroqua layout for HHKB keyboard Added default configuration and alternate (swap gui/alt keys). Save user choice in keyboard memory (like plank, thanks for this feature!). * Added dbroqua layout for Iris keyboard * Updated layout and fixed includes * Added personal layout for FC660C
* Fix bad key label in ascii art (#3830)Travis Carr2018-09-021-1/+1
| | | Just fixed a key that was wrong in the Tokyo60 ASCII art
* Keymap: new planck keymap (#3809)Pranav Singh2018-09-014-0/+275
| | | | | | | | | | | | | | | | * Add files via upload * new planck keymap * new planck keymap * readme file updated * deleted files from qmkfirmware folder * re-added readme file to /qmk_firmware * Fix main readme (hopefully)
* Keymap: added keys to broswen keymap (#3825)Brad2018-09-011-3/+3
| | | | | | * added PGUP and PGDN to my keymap * added VOLU VOLD and MUTE to keymap
* Keymap: add yshrsmz keymaps (#3770)Yasuhiro Shimizu2018-09-0113-0/+1384
| | | | | | | | | | | | | | | * add ergo42 keymap * add helix keymap * add keymap for lets_split * Add keymap for nyquist * update keymaps to address review comments - remove unneeded include - use `#pragma once`
* Keymap: Nojjan atreus (#3822)Jon Olsson2018-09-012-0/+71
| | | | | | | | | | | | | * Add support for my Falbatech Atreus This is currently the default Atreus keyboard layout, but I will eventually customize it to match my Ergodox layout. * Address review comments * More review comments fixed * More review comments fixed
* Keymap: Cleaned up Rorschach keymap (#3823)Salt-Peanuts2018-09-011-41/+0
|
* Keyboard: Rename alt67 to alt (#3824)patrickmt2018-09-0112-9/+8
| | | | | Renamed keyboard alt67 to alt and adjusted necessary files where alt67 appeared. CTRL keymap fixed enum structure name. usb2422 removed stray define no longer used.
* Keymap: Merlin Learns to QMK (#3820)MechMerlin2018-08-3113-63/+68
| | | | | | | | | | | | | | | | | | | | | | * Fix up my keymaps to use more QMK features * update 60_ansi readme * add the start of my userspace * begin to use my new userspace * use more of my userspace * spread userspace love to my clueboard * spread userspace love to 75 layout * add a fairly vanilla readme * put the FNX into a userspace incase I ever want to use it for something else * respond to drashna's code review comments
* Keyboard: Add Tragicforce 68 (#3807)Danny2018-08-317-0/+223
| | | | | | | | | | * Fork MF68 to Tragicforce 68 * Set pinouts and key layout * Reformat keymap, update comments/notes * Cleanup rules.mk
* Keymap: Adding adnw_puq-Layout for Ergodox (#3723)rschardt2018-08-314-0/+395
| | | | | | | | | | | | | | * added adnw_p_u_q-Layout * changed link * 3723 - outsource definitions to config.h * added TAPPING_TERM * changed defines and added colors * removed debug- and action_layer-Header
* Keymap: I got my intern a KBParadise V60 Type R... (#3813)Christon DeWan2018-08-318-10/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * new mode for v60 xtonhasvim. still working on it: - need to get indicator lights going - and fun layer properly fleshed out. * status lighting, proper fun layer copied fun layout from keycaps to maximize accessibility * enable power return * support brightness adjustment for indicators * refined brightness setting. is saved in eeprom now * readme. and fixed tilde * more modifiers fall through fun layer * i mean, this kinda works.. * much more reliable way of restoring lights * responded to feedback
* Keyboard: Adding Z-150 PCB firmware (#3793)blindassassin1112018-08-316-0/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding the AT101 PCB firmware * Fixed AT101 keymap error * Fixing AT101 firmware * More Fixes for AT101 firmware * Rename AT101_Blackheart.c to at101_blackheart.c * Rename AT101_Blackheart.h to at101_blackheart.h * Update readme.md * Renaming AT101 folder pt1 * Renaming AT101 folder pt2 * Fixing AT101 LED function name * Redoing AT101 folder naming pt2 Last round had issues, should be the last rename. * Fixing missing comma in at101_blackheart.h * Adding Z-150 PCB * Adding Z-150 readme file * Fixing Z-150 firmware errors * Fixing Z-150 layout error * Fixing Z-150 firmware errors * Fixing Z-150 Issues Still unsure where the extra "\" is that through the error. * Fixing more Z-150 errors * Finally fixing the Z-150 error * Fixed Z-150 layout naming * Removed Z-150 layout fillers
* Keymap: Add backlight controls for Planck Light in dshields keymap (#3801)Daniel Shields2018-08-312-6/+20
|
* Keyboard: CTRL and ALT keyboard json fix (#3816)patrickmt2018-08-312-2/+2
| | | Fixed incorrect layout names
* Fix emulated EEPROM start address on STM32F303 (#3819)ishtob2018-08-311-1/+1
| | | MCU has 254 flash, changed 250 to 254. tested working on a planck rev6
* Keymap: Updated keymap with the "pretty" layout (#3812)Salt-Peanuts2018-08-303-422/+295
|
* Keyboard: CTRL and ALT updates (#3810)patrickmt2018-08-305-11/+181
| | | Update to CTRL and ALT keyboard files
* Docs: Tabulate Modifier & Mod-Tap keycode listings in advanced keycodes docs ↵fauxpark2018-08-302-49/+69
| | | | (#3799)
* Keymap: Wanleg updates (#3794)wanleg2018-08-3014-11/+132
| | | | | | | | | | | | | | | | | | * various edits and minor additions * updates * updates * updates * lets_split LEDs off instructions * lets_split LEDs off instructions * turn off lets_split LEDs in userspace * one-hand setup for right side
* Keymap: Added new tada68 keymap (#3788)Lars Herbach2018-08-304-0/+71
| | | | | | * Initial Commit * Removed duplicate lines
* Tweak the wording in "Becoming a QMK Collaborator"fauxpark2018-08-301-4/+6
|
* Docs: add process_terminal() and update links to other functions (#3778)arlenk2018-08-291-24/+29
| | | | | | | | * add process_terminal() and update links to other functions * convert links to permalinks and add a few missing process_* functions * update links in main text as well
* Keymap: Update keymap including LAYOUT_planck_grid (#3779)Sascha Grunert2018-08-291-15/+14
| | | | | | * Update keymap including LAYOUT_planck_grid * Change include
* Keyboard: remove old comment from keyboards/helix/rules.mk (#3795)Takeshi ISHII2018-08-291-3/+0
| | | | | | | | | | | | | | | | | remove 2 lines from keyboards/helix/rules.mk | -# if firmware size over limit, try this option | -# CFLAGS += -flto | - see keyboards/helix/[rev2|pico]/keymaps/EACH_MAP/rules.mk: | Link_Time_Optimization = no # if firmware size over limit, try this option : : : | ifeq ($(strip $(Link_Time_Optimization)),yes) | EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization | endif
* Keyboard: Update CTRL and ALT keyboard readme (#3796)patrickmt2018-08-292-2/+12
| | | | | | | | | | * Massdrop keyboards readme update Massdrop keyboards readme update for flashing instructions * ctrl and alt keyboard readme update Updating make command in Massdrop CTRL and ALT keyboard readme files to reflect directory change
* Mask off keycode/layer/mod where possible in LT(), MT(), etc. (#3430)fauxpark2018-08-292-50/+48
| | | | | | | | * Mask off keycode/layer/mod where possible in LT(), MT(), etc. * Don't need these parentheses * Put back parentheses for order of operations
* Autodetect lack of screen presenceTerryMathews2018-08-292-4/+16
| | | | | | | | | | | | | | This is the simplest, most efficient way I could come up with to silence the "Failed to start write 60" error that occurs when QMK tries to talk to a screen that doesn't exist. iota_gfx_init passes a success boolean. We catch that into a global bool (we could rewrite multiple functions to pass this as an argument, but given the number of keyboards using this code it seemed less disruptive this way) and then use that as a conditional on running the iota_gfx_task in matrix_scan_user. Tl;dr: if the screen doesn't init, the screen write code doesn't run.
* Massdrop keyboards readme update (#3791)patrickmt2018-08-292-0/+10
| | | Massdrop keyboards readme update for flashing instructions
* move massdrop boards into its own directory for configurator visibilitymechmerlin2018-08-2918-0/+0
|
* STM32 EEPROM Emulation (#3741)yiancar2018-08-299-1/+1035
| | | | | | | | | | | | * STM32 EEPROM Emulation - Added EEPROM emulation libaries from libmaple and Arduino_STM32. https://github.com/rogerclarkmelbourne/Arduino_STM32 and https://github.com/leaflabs/libmaple. - Renamed teensy EEPROM library and added conditional selection of library. - Remapped EEPROM memory map for 16 byte blocks (as is with STM32f3xx MCUs). - Added EEPROM initialization in main.c of Chibios. - Added EEPROM format to clear the emulated pages when EEPROM is marked as invalid. * Fixed ifdef