summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* DO NOT USE Merge branch 'master' into debounce_refactorAlex Ong2019-01-261320-13367/+28758
|\ | | | | | | | | | | Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce. # Conflicts: # quantum/matrix.c
| * Merge branch 'master' of https://github.com/qmk/qmk_firmwareAlex Ong2019-01-261320-13415/+28757
| |\
| | * Circular animation (#4796)Drashna Jaelre2019-01-252-6/+18
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ability to animate arm_atsam led matrix from the center of a circle * Make arm_atsam led matrix circular animation circular rather than obloid * Fix indentation in tmk_core led_matrix.c
| | | * Fix indentation in tmk_core led_matrix.cIan O'Dea2019-01-071-9/+9
| | | |
| | | * Make arm_atsam led matrix circular animation circular rather than obloidIan O'Dea2019-01-072-1/+4
| | | |
| | | * Add ability to animate arm_atsam led matrix from the center of a circleIan O'Dea2019-01-072-6/+15
| | | |
| | * | [Keyboard] Support for Wheat Field Peripherals blocked 65% PCB (#4763)walkerstop2019-01-258-0/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Basic Fanoe support (no LED yet) * Enable RGB lights * Backlighting support * Change to reflect Wheat Field brand of Fanoe PCB * Hot swap variant * Fix review comment issues * Fix review issues * Corrected rules.mk * Change naming to avoid using possibly copyrighted names * Added info.json * Corrected manufacturer name in info.json * Keymap updates * Add layout for use with ws2812b and such * Fixes based on code review
| | * | move `#include "rgb.h"` from quantum.h to quantum.cmtei2019-01-252-3/+5
| | | | | | | | | | | | | | | | I think `quantum.h` should contain only API declarations that `quantum.c` provides externally. `rgb.h` contains function weak definitions. This should not be in `quantum.h`.
| | * | Add C(), A() and G() to match already existing S() (#4673)fauxpark2019-01-2512-62/+64
| | | |
| | * | Add MOD_MASK_* macros to core code (#4337)Konstantin Đorđević2019-01-251-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | * Add MOD_MASK_* macros to core code * MOD_MASK_ALL → MOD_MASK_CSAG
| | * | rs: code friendly keymap for preonic, iris and my preonic clone (#4303)Olivier Poitrey2019-01-2520-0/+1030
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I worked on those keymap to simplify the use of 60% keyboards for coders. Instead of trying to mimic planck, this keymap remove raise/lower layer complexity and keep some important sign keys for coder in the upper right side pretty much the same way as they are on a full keyboard. A karabiner configuration is also provided to mimic most of the keymap features on the macbook internal keyboard for when you are forced to use it.
| | * | Fix process_combo which assign -1 to uint16_t (#3697)Drashna Jaelre2019-01-252-9/+10
| | |\ \
| | | * | Fix process_combo which assign -1 to uint16_tShihpin Tseng2018-08-202-9/+10
| | | | |
| | * | | Fix oneshot_time wrong type (#3696)Shihpin Tseng2019-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix oneshot_time wrong type * Fix oneshot_time_layer wrong type
| | * | | Fix problem that MAGIC_SWAP_ALT_GUI will not be effective when OSM(mod) is usedMakotoKurauchi2019-01-251-1/+1
| | | | |
| | * | | Adding documentation for the LM layer modifier. (#3617)Dave Brown2019-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding documentation for the LM layer modifier. This will hopefully clear up some of the confusion around adding this layer modifier. I struggled with this a bit as well at first. * Removing duplicate table. * Changed section title to `Changing Layers` * Retain name
| | * | | Add support for RETRO_TAPPING to LT(layer, kc)lambda_sakura2019-01-252-1/+10
| | | | |
| | * | | [Keymap] New kbd67/hotswap keymap for writing both code and math (#4933)zunger-humu2019-01-254-0/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Custom keymap. * Fix magic layer, enable Unicode. * Update README. * Make Unicode config change keymap-local. * Move magic to AltGr, simplifying layout. * Changes per Drashna. * Fix magic+esc = backtick! * Change reset implementation per Drashna's suggestion. * Add a few more symbols so long as the commit is open - √ℜℂℤ⊙ℚℕ and the like. * Typo fix. * Slight simplification, drop an extra variable.
| | * | | Add support for Clueboard 66% rev4skullY2019-01-248-0/+1465
| | | | |
| | * | | Fix a typo in link to the Pro Micro ISP firmwareBalz Guenat2019-01-241-1/+1
| | | | |
| | * | | [Keyboard] Remove hadron ver0 as it is no longer required (#4921)zvecr2019-01-244-40/+0
| | | | |
| | * | | Remove unused fn_actions[] and action_function() in default keymaps (#4829)fauxpark2019-01-2418-153/+18
| | | | |
| | * | | [Keyboard] KBD67: enable bootmagic lite by default (#4931)MechMerlin2019-01-233-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * enable bootmagic lite by default * add a second layer with a reset key
| | * | | [Keymap] Adding keymap for Nyquist (#4918)shovelpaw2019-01-233-0/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added busby222 config * Fixed bug with leftover colemak and dvorak layouts * Fixing dumb mistake * Minor tweaks to layout. Need to use at work tomorrow to make more adjustments * Added mouse controls for raised layer * Update keymap.c * Update keymap.c * Update keymap.c * Update keymap.c * Update keymap.c * Update config.h Added mouse specific settings for smoother mouse movement (default is sort of hard to use) * config.h cleanup * Lowering max mouse speed (personal preference) * Update keymap.c * Update keymap.c * Update keymap.c * Update keymap.c * Update keymap.c * Update config.h * Update rules.mk * Added MIDI layer * Switched the Adjust layer to an MO call * Update keymap.c * Fixing bugs related to midi layer * Changed "Caps Lock" ctrl to RCTRL for use in VirtualBox * Added shovelpaw keyamp * Removed deprecated QUANTUM_DIR code block * Switched midi layer to be only active when held * Addressing requested changes * Removed unnecessary include statement
| | * | | Optimize/Update the new_project script (#4920)MechMerlin2019-01-232-42/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * use pragma once in our templates * template.h is present in both avr/ps2avrgb options so we moved it to base. In addition we now use pragma once
| | * | | Remove lfkeyboards parent rules.mk as its only required for mini1800zvecr2019-01-232-1/+2
| | | | |
| | * | | [Keyboard] Add BDN9 (#4919)Danny2019-01-237-0/+216
| | | | |
| | * | | [Keyboard] Add KBD67 Hotswap Support (#4916)MechMerlin2019-01-2319-8/+544
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial commit * move the original kbd67 stuff into its own directory, rev1 * get rid of vanilla cookie cutter code * put in the switch matrix pins, backlight pin, and rgb underglow pin. Number of underglow LEDs is questionable. * switch matrix created for hotswap * create a basic keymap for testing * make info.json for QMK Configurator support * rename kbd67 due to compile error * kbd67 generic readme file * fix make instructions for the new rev1 * comment out unneeded rgb light #defines * Update keyboards/kbd67/readme.md Add an extra space for proper markdown rendering Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update keyboards/kbd67/hotswap/hotswap.h Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update keyboards/kbd67/hotswap/keymaps/default/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * use pragma once * proper format of MechMerlin
| | * | | Fixup the clueboard 66 info.jsonskullY2019-01-234-11/+15
| | | | |
| | * | | Clueboard refresh (#4902)skullydazed2019-01-23101-4094/+583
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |