summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update IS_COMMAND definitions to use MOD_MASK_SHIFT (#6348)Konstantin Đorđević2019-07-205-37/+37
| | | | | | | | | | | | * Update IS_COMMAND definition in templates to use MOD_MASK_SHIFT * Update IS_COMMAND in docs * Update IS_COMMAND default definition in tmk_core * Update table in Command docs based on suggestion Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Merge pull request #6264 from zvecr/split_master_checkDanny2019-07-201-0/+1
|\ | | | | Allow board to override split keyboard master check
| * Small fix to allow board to override split keyboard master checkzvecr2019-07-051-0/+1
| |
* | Fix Numbrero Handwired make example in readme (#6379)Danny2019-07-201-1/+1
|\ \ | | | | | | Fix Numbrero Handwired make example in readme
| * | Fix Numbrero Handwired make example in readmenoroadsleft2019-07-201-1/+1
|/ /
* | [Docs] Clarify Zadig usage in FAQ Docs (#6360)Drashna Jaelre2019-07-191-6/+4
| | | | | | | | | | | | | | | | * Rewrite Zadig section to be more clear * Wordsmithing Co-Authored-By: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
* | Melody96 Configurator updates and minor refactoring (#6365)noroadsleft2019-07-196-9/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Configurator layout data for LAYOUT_hotswap * Add LAYOUT_std60_split_num0 Requested by 李小安#9728 on QMK Discord. Standard 60% ANSI layout for the alphanumeric region, with a split-0 Numpad. Includes a sample keymap. * Update Docs links on readme * Change melody96.h to use #pragma once include guard * Change config.h to use #pragma once include guard * Add readme for default_std60_split_num0 keymap
* | Change xprintf() calls in rgblight.c to dprintf() (#6363)Konstantin Đorđević2019-07-191-18/+11
| |
* | Tidy up ALF X1.1 (#6367)fauxpark2019-07-184-205/+174
| | | | | | | | | | | | | | | | | | | | * Tidy up ALF X1.1 * Correct x positions * 4 spaces * Remove a stray TRNS key
* | simple readme fixmechmerlin2019-07-181-1/+4
| |
* | Print Screen and Pause placement swap (#5981)trinity15612019-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update x11.h The original json file that was given by the designer was incorrect. The Print Screen and Pause button is swapped. * Update space65.c Fixing the Caps Lock LED. * Revert "Update space65.c" This reverts commit 1f5de1abaefadd2e54259999a29bab501da5f67a.
* | Jotix (#6355)jotix2019-07-184-12/+228
| | | | | | | | | | | | | | | | * add unicode_map * add unicode_map * numpad change
* | [Keyboard] Add 6macro keyboard (#6362)Joao Maia2019-07-1812-0/+408
| | | | | | | | | | | | | | | | * Initial commit for 6macro firmware * Updated layout documentation * Removed unused commented code
* | Add more layouts for the ergodash (#6336)Fred Silberberg2019-07-182-49/+487
| |
* | Correct backlight on state docs (#6358)fauxpark2019-07-181-2/+4
| | | | | | | | | | | | * Correct backlight on state docs * Reword to make it less confusing
* | Add prime_e keymap (#6350)Ethan Madden2019-07-181-0/+79
| |
* | Allow userspace the opportunity to handle keycodesjshuf2019-07-171-1/+1
| |
* | cleanup and start sound (#6353)dsanchezseco2019-07-172-51/+1
| |
* | Extend maximum number of backlight levels to 31 (#6351)fauxpark2019-07-162-4/+5
| |
* | Add model01 keymap. Change kinesis keeymap.Daniel Schindler2019-07-165-19/+93
| |
* | Remove unnecessary IS_COMMAND definitions from a couple of boardsKonstantin Đorđević2019-07-165-29/+0
| |
* | Use led_set_kb instead of led_set_user in melody96.cKonstantin Đorđević2019-07-161-3/+4
| |
* | Remove more commented out MCUsfauxpark2019-07-162-3/+1
| |
* | [Keyboard] Add keyboard Naked48 (#6330)Salicylic-acid32019-07-1643-0/+3609
| | | | | | | | | | | | * Add Naked48 * Comment reflected
* | Fix Preprocessor check for Leader KeysDrashna Jaelre2019-07-161-3/+1
| |
* | Remove the need to specify NUM_OF_ENCODERS for the Encoder feature (#6328)Drashna Jaelre2019-07-1620-31/+11
| | | | | | | | | | | | | | | | | | | | | | | | * Remove the need to set NUM_OF_ENCODERS Instead, calculate the size of the array, and use that instead * Add hack for split common support * Remove NUM_OF_ENCODERS from keyboard config Can be reverted, if needed
* | [Keymap] Fix advanced keymap readme and macro function (#6342)Sidney Bovet2019-07-162-4/+2
| |
* | Allow Combo feature to be enabled/disabled live (#6318)Drashna Jaelre2019-07-164-10/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ability to enable/disable combos * Update documentation for Combo feature * Change keycodes for appeasement * Simplify combo_toggle function * Update names * Update combo docs to use tables
* | Align ARM i2c_readReg with AVR (#6314)Joel Challis2019-07-163-5/+5
| | | | | | | | | | | | * Align arm i2c_readReg with avr * Align arm i2c_readReg with avr - fix cannonkeys
* | Add ARM I2Cv1 support to i2c_master (#6262)Joel Challis2019-07-163-25/+70
| | | | | | | | | | | | * Add ARM I2Cv1 support to i2c_master * Add I2Cv1 docs
* | Expand bootloader target to support most AVR boards (#6255)Drashna Jaelre2019-07-162-8/+12
| | | | | | | | | | | | | | | | * Update the :bootloader target to pass along correct hardware info * Update make scripts to properly grab the settings (a big thanks to @yanfali) * Remove LUFA debug warnings
* | Make Caps Lock delay more reasonable (#6199)Drashna Jaelre2019-07-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make Caps Lock delay more reasonable * Update documentation * Update docs/config_options.md Co-Authored-By: Konstantin Đorđević <vomindoraan@gmail.com> * Update docs/config_options.md Co-Authored-By: Konstantin Đorđević <vomindoraan@gmail.com>
* | Configure Vagrant to use qmk_base_container (#6194)Joel Challis2019-07-164-15/+107
| | | | | | | | | | | | | | | | | | | | * Initial conversion of vagrant to use qmkfm/base_container * Fix vagrant when using docker provider * Workaround for VirtualBox VM restarts * Generalise Vagrant docs slightly and add FAQ
* | Store backlight breathing state in EEPROM (#6105)fauxpark2019-07-165-8/+82
| | | | | | | | | | | | | | | | | | | | | | | | * Store backlight breathing state in EEPROM * Reduce backlight_config.level from 6 bits to 4 (max 15 "on" levels) * Error out if BACKLIGHT_LEVELS is > 15 * Remove mention of default backlight pin in rules.mk template * Remove pointless comment
* | Adding rgb matrix speed into eeprom storage. (#5965)XScorpion22019-07-165-65/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Zeroing out spd in eeconfig_init_quantum Switched to block read & update Update tmk_core/common/eeconfig.h Co-Authored-By: Drashna Jaelre <drashna@live.com> Fixing init compile error Update eeconfig.c Dead / Missing API cleanup alignment
* | shell.nix: Downgrade gcc-arm-embedded (#5913)Roman Volosatovs2019-07-161-1/+4
| | | | | | Temporary fix for https://github.com/qmk/qmk_firmware/issues/5868
* | Enable Mousekeys on Corne Keyboard by default (#5893)Drashna Jaelre2019-07-162-25/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Enable Mousekeys on Corne Keyboard by default For Tessachka and Configurator support * ENable for default image too * Remove most of rules.mk for default keymap * make sure rgblight is enabled by default from default keymap
* | Remove commented out MCUs in rules.mk (#5884)fauxpark2019-07-16188-268/+34
| |
* | Add out of bound check for Leader Key sequence array (#5840)Drashna Jaelre2019-07-151-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add out of bound check for Leader Key sequence array * A shot at advanced C stuff for Leader Key optimization * Revert most changes * Change default back * Include string.h if compiling for ARM * Use sizeof instead of a number
* | Add sendstring LUTs for French keymap (#5830)fauxpark2019-07-151-0/+97
| |
* | [Docs] Add dedicated page for Split Keyboard information (#5802)Drashna Jaelre2019-07-153-0/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Docs] Add dedicated page for Split Keyboard information * Apply suggestions from code review Co-Authored-By: drashna <drashna@live.com> * Fix Typos Co-Authored-By: drashna <drashna@live.com> * Fix some formatting issues * Add Additional RGB info * Fix Bulletted formatting * Apply suggestions from code review Co-Authored-By: drashna <drashna@live.com> * Fix line wrapping * Additional fixes and expansion * Reword warning/note Co-Authored-By: drashna <drashna@live.com> * add i2c/serial coexistance info * i2c markdown * Change i2c wiring text Co-Authored-By: drashna <drashna@live.com>
* | Skip unsupported firmware check message in silent mode (#5765)Drashna Jaelre2019-07-151-1/+1
| |
* | Sendstring LUT improvements (#5727)fauxpark2019-07-1512-291/+511
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Align sendstring LUTs to 9 characters wide * Replace 0 with XXXXXXX * Use decimal 128 for LUT size * Align heading comments * Add ASCII table comments * Add missing AltGr LUTs and adjust keycode LUTs accordingly * Use pragma once * Correct a couple more keycodes * Capitalise "BÉPO" * Also clean up the default tables * Tidy up Belgian and Norman LUTs
* | Remove lock LED example in quantum.c (#5636)fauxpark2019-07-151-17/+0
| | | | | | | | | | | | | | | | * Use GPIO helper defines in backlighting * While I'm here, fix up the lock LED example too * Remove the example altogether, it's already documented
* | Remove/migrate action_get_macro()s from default keymaps (#5625)fauxpark2019-07-15119-1860/+286
| | | | | | | | | | | | * Remove/migrate action_get_macro()s from default keymaps * Leave these breaks alone
* | Add user-overridable callback for cancelling UCIS input (#5564)Aapo Saaristo2019-07-151-0/+5
| | | | | | | | | | | | | | | | | | | | * Add user-overridable callback for cancelling UCIS input To clean up things from qk_ucis_start_user() for instance. * restore lost newline to quantum/process_keycode/process_ucis.c Co-Authored-By: shinmai <aapo.saaristo@gmail.com>
* | add 'objs-size' target into tmk_core/avr.mk (#5490)Takeshi ISHII2019-07-152-0/+4
| |
* | Usbasploader bootloader option addition (#6304)yiancar2019-07-156-37/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added USBasp bootloader option for USBasploader * author comment * ifdef fix :) * Add usbasp target * Update docs/flashing.md Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update docs/flashing.md Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update docs/flashing.md Co-Authored-By: fauxpark <fauxpark@gmail.com>
* | Fix compiling json files. (#6340)skullydazed2019-07-153-8/+8
| |
* | QMK CLI and JSON keymap support (#6176)skullydazed2019-07-1534-83/+1988
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Script to generate keymap.c from JSON file. * Support for keymap.json * Add a warning about the keymap.c getting overwritten. * Fix keymap generating * Install the python deps * Flesh out more of the python environment * Remove defunct json2keymap * Style everything with yapf * Polish up python support * Hide json keymap.c into the .build dir * Polish up qmk-compile-json * Make milc work with positional arguments * Fix a couple small things * Fix some errors and make the CLI more understandable * Make the qmk wrapper more robust * Add basic QMK Doctor * Clean up docstrings and flesh them out as needed * remove unused compile_firmware() function