summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Massdrop keyboard support (#3780)patrickmt2018-08-29194-1/+73324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Massdrop SAMD51 Massdrop SAMD51 keyboards initial project upload * Removing relocated files Removing files that were relocated and not deleted from previous location * LED queue fix and cleaning Cleaned some white space or comments. Fix for LED I2C command queue. Cleaned up interrupts. Added debug function for printing numbers to scope through m15 line. * Factory programmed serial usage Ability to use factory programmed serial in hub and keyboard usb descriptors * USB serial number and bugfix Added support for factory programmed serial and usage. Incorporated bootloader's conditional compiling to align project closer. Fixed issue when USB device attempted to send before enabled. General white space and comment cleanup. * Project cleanup Cleaned up project in terms of white space, commented code, and unecessary files. NKRO keyboard is now using correct setreport although KBD was fine to use. Fixed broken linkage to __xprintf for serial debug statements. * Fix for extra keys Fixed possible USB hang on extra keys report set missing * I2C cleanup I2C cleanup and file renames necessary for master branch merge * Boot tracing and clocks cleanup Added optional boot debug trace mode through debug LED codes. General clock code cleanup. * Relocate ARM/Atmel headers Moved ARM/Atmel header folder from drivers to lib and made necessary makefile changes. * Pull request changes Pull request changes * Keymap and compile flag fix Keymap fix for momentary layer. Potential compile flag fix for Travis CI failure. * va_list include fix Fix for va_list compile failure * Include file case fixes Fixes for include files with incorrect case * ctrl and alt67 keyboard readme Added ctrl and alt67 keyboard readme files
* Keymap: Add german layout for redox keyboard (#3695)frederik-h2018-08-294-0/+150
| | | | | | | | | | | | | | | | | | | | | | | * Add german layout for redox keyboard A german layout for the redox keyboard which tries to stay close to the default english redox layout while acommodating the umlauts at their usual position. * Fix keycodes in german redox keymap The keycode for Y was wrong. * Minor changes * Remove #ifdef include guard by #pragma once * Remove unnecessary include from rules.mk * Review changes Remove unnecessary code fragments that were pointed out in the review of PR #3695 by @drashna.
* Keyboard: Adding the AT101 PCB (#3785)blindassassin1112018-08-296-0/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Updated templates for use by new_project.sh (#3783)noroadsleft2018-08-296-44/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * template.h file cleanup Reformatted the pre-macro comments as block comments. Updated the ps2avrgb template comment to match the avr template's comment, which was more informative. Deleted the line about the macro representing the Planck MIT layout, because the macro doesn't represent that layout anymore. * base template keymap.c refactor Deleted the deprecated TMK macro functions. Defined two custom keycodes for use as macros by process_record_user. process_record_user is now after the keymap and before matrix_init_user, where the deleted TMK functions were. * Removed an extra " from macro command per @drashna * Added BOOTLOADER rule to avr/rules.mk per @drashna * Updated Bootloader sections per @drashna * Updated links to docs at the bottom of both avr and ps2avrgb template readme.md files Corrected the links to the Build Environment Setup and the Make Instructions docs. Added direct link to the QMK Complete Newbs Guide.
* Fixed bootloader targetJumail2018-08-291-6/+6
| | | | | Fixed matching grep matches (for PRODUCT in particular) Fixed " Bootloader" concatenation for WSL (windows line-endings)
* Yet another update to drashna keymaps and userspace (#3787)Drashna Jaelre2018-08-2919-222/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make tap function inline * Use better makefile keyboard detection * Remove Copy-Paste macro * Add F11/F12 to Iris * Minor tweaks to userspace config * Set audio clicky randomness to 1.5 * Set NO_DEBUG to only be set if console is not enabled * Move NO_MUSIC_MODE to userspace config.h * Reduce Ergodox Debounce * Add Planck Light config * Use OSM for ortho 4x12 * Music Mode changes for planck light * Cleanup do to shutdown user and other fixes in Master * Add and use 'shutdown_user' fzunction * Remove global NO_MUSIC_MODE define * Add NO_MUSIC_MODE to individual keymaps * Change layer colors * Remove NO_PRINT and NO_DEBUG from userspace config.h Since these are automatically disabled if the console isn't enabled. * Remove backlight code if backlight isn't enabled * Remove Twinkle from Ergodox * Disable RGB twinkling and enable PSM * Clean up RGB matrix code * Clean up planck light indicators * Clean up tap code * Rules cleanup for ortho 4x12 * Fix up userspace template * Revert "Clean up tap code" This reverts commit 09f64d6d67aa021c3b5ac86a9a739a5ca2b9c1ec. * Organize includes * userspace cleanup * Fix modifier spelling error * Fix userspace rules * Disable Permissive Hold again * Minor clean up * Fix Tap stuff * Viterbi Updates for file size
* Keymap: Boy_314's Preonic and XD75 Layouts (#3781)Boy_3142018-08-289-1/+427
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixed arrow keys and left control * added right shift * latest version * reverted arrow keys * edited readme * added osu layer * updated osu layout * updated osu layout * added full arrow keys to osu layout * in case i mess up creating macros * added the best meme key in the world * added plover steno layer * updated boy314 layout * removed unused layers * added boy314 xd75 layout, inspired by preonic layout * added boy314 xd75 layout, inspired by preonic layout * version 2 of boy314's xd75 layout * added readme notes * updated readme for boy314 xd75 layout * qwerty support, brackets on bottom row, caps lock underglow * fixed readme/ * small changes to allow merging * minor changes to format * fixed up default readme
* Docs: Add docs for the `LAYOUT_*` macro to layouts (#3772)Evan Travers2018-08-281-0/+6
| | | | | | | When moving my planck layout to my let's split, I ran into this issue because I had copied my planck layout from the default layout which just used the `{}` array form for the keymap layers. I checked the docs, but this bit wasn't clear to me. I'm sure @ishtob or @drashna helped me on discord, but this seemed to be the logical place to add a helpful hint.
* Keyboard: xealous (#3731)Alex Ong2018-08-2812-0/+1030
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Keyboard: HandWired/XeaL60 * Updated rules.mk * Mapping for layout was flipped * Figured out how to re-map bad pins. * Updated Keymap * Enabled audio, Forced NKRO * Added QMK_KEYS_PER_SCAN * Removed more unnecessary files, since split_keyboards are in main QMK branch already. * Simplified rules.mk in rev1 * Removed i2c from matrix.c * Re-formatted to 4 spaces per tab, * Changed note for NUMPAD * Added I2C support back! * Fixed keyboard mappings. Both sides work * Moved i2c configuration from keymaps/default/config.h to config.h * Changed SCL_CLOCK to 400000L * Added DEBUG_MATRIX_SCAN_RATE for future optimization efforts * Removed row2col code to clean up matrix.c * Scan rate from 2100 -> 4200 by using Nop instead of waiting 30us between columns. * Further optimized column reading via optimized_col_reader. * Immediate key-recognition * Switched back to own implementation of SPLIT_KEYBOARD. Will optimize so that slave interrupts master. * Moved scanrate debug messages to another file. * Made matrix_scanrate.c compile if CONSOLE_ENABLE is off. Updated to latest i2c.c * Latest i2c uses a few bytes for lighting information * Optimizations in i2c.h to determine buffer size. * Disabled a whole bunch of features. TODO: Test that keyboard still works fine. * Minimum #define NO_ACTION's with still working keyboard * Fixed matrix not working due to offsets not being respected * Added numlock button for keymap. * Use I2C_KEYMAP_START offset * Removed serial, Backlight and RGB support * Removed need for split_flags. * Added audio on and off for numlock. * Renamed from xeal60 to xealous, simplified build system. * Used more shared split_common code. * Updated audio code. * moved tone_qwerty and tone_numpad to config.h. Removed keymaps/default/config.h * Added more shortcut keys in _FN layer. Increased debounce to 6ms due to fencepost error. * DF used with incorrect argument. Custom_keycodes no longer required. * Fixed bug in update_debounce_counters which was resulting in no debouncing! * Removed unnecessary #include
* Keyboard: Dactyl - Only initialize relevant variables (#3771)Daniel Burkholder2018-08-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This small change prevents an unused variable from being initialized, throwing a warning during compilation, thus ending fatally. [07:47:10] [Daniels-MacBook-Pro-3] [dburkhol] [ /Users/dburkhol/git/qmk_firmware ] [develop ] : make handwired/dactyl:default QMK Firmware 0.6.97 Making handwired/dactyl with keymap default avr-gcc (GCC) 7.3.0 Copyright (C) 2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Size before: text data bss dec hex filename 0 19972 0 19972 4e04 .build/handwired_dactyl_default.hex Compiling: keyboards/handwired/dactyl/twimaster.c [OK] Compiling: keyboards/handwired/dactyl/matrix.c keyboards/handwired/dactyl/matrix.c:52:22: error: 'expander_col_pins' defined but not used [-Werror=unused-const-variable=] static const uint8_t expander_col_pins[MATRIX_COLS] = MATRIX_EXPANDER_COL_PINS; ^~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors [ERRORS] | | | make[1]: *** [.build/obj_handwired_dactyl_default/matrix.o] Error 1 make: *** [handwired/dactyl:default] Error 1 Make finished with errors
* Keymap: xtonhasvim updates (#3768)xton2018-08-289-108/+398
| | | | | | | | | | | | * cherrypicking file changes just for updates * removed unused heat foo * avoid defining own min/max * add license * formatting
* Keymap: Adding keymap to the XD60 (#3767)Eduardo Lourenço Pinto Neto2018-08-282-0/+55
| | | | | | * Created keymap based on Default base layer and GK64 function layer * Update readme.md
* Putting my ducks in a row: Eagle/Viper V2 into Duck directory (#3766)MechMerlin2018-08-2818-16/+5
| | | | | | | | * mv eagle_viper into duck * delete files * remove eagle_viper .c and .h
* Putting my ducks in a row: Octagon V1/V2 (#3765)MechMerlin2018-08-2827-91/+35
| | | | | | | | | | * Move octagon directory into duck diretory and fix as many compile issues as I can * fix formatting * fix layout75 matrix * edit readme for build instructions
* Keymap: Bocaj - Create Userspace and Ergodox Layout (#3750)Jacob Jerrell2018-08-2813-471/+611
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |