Skip to content

Commit

Permalink
Merge updated master
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

commit 1a55d84224609c935a5a98d2e824c6773353162f
Author: Maarten Dekkers <maartenwut@gmail.com>
Date:   Sat May 25 03:33:37 2019 +0200

    Add support for LSJ Ares (#5588)

    * Add support for LSJ Ares

    Thanks to the other ports which have made this port possible.

    * Update Ares code per request

    * More changes to Ares

    * Update Ares rules.mk

    Co-Authored-By: Maartenwut <maartenwut@gmail.com>

    * Remove escaping backslashes from Ares default keymap

commit 1da8ad86689ae8fe8c5852201c5914e745f0f38e
Author: Doug Raffle <raffled@gmail.com>
Date:   Fri May 24 18:06:37 2019 -0400

    Added media keys to 1up60rgb:raffle (#5973)

commit 4f1537b879366664c94faaef22190c2828115a26
Author: Mark <cableguy67@gmail.com>
Date:   Sat May 25 00:18:57 2019 +0300

    [Keyboard] Fix formatting on keyboard to micro connection table (#5968)

    * Fix formatting on keyboard to micro connection table

    * Add whitespace to make more readable

commit a1e2d51712385a12bba7d592e391200742be5ad7
Author: AbstractKB <49011872+AbstractKB@users.noreply.github.com>
Date:   Fri May 24 17:10:40 2019 -0400

    [Keyboard] Added Abstract Ellipse Rev1 (#5939)

    * mostly done with first version of Ellipse Rev1 software

    * mostly done, error with backlight breathing

    * more testing and changing default keymaps

    * ready for first release attempt

    * fix newline in readme

    * fix copyright and extraneous declarations and symbols

    * remove more excess backslashes

    * fixed more formatting

commit 362bfc5b15eeacd946f814efb726f4e7fd9a1328
Author: Danny <nooges@users.noreply.github.com>
Date:   Fri May 24 15:14:14 2019 -0400

    Fix cypher iso (#5971)

    * Reformat JSON to look less like AIDS

    * Fix location of ISO Enter

commit 83afae31ed64ba577a4bd0336131598196d3e8c7
Author: Drashna Jaelre <drashna@live.com>
Date:   Thu May 23 17:42:06 2019 -0700

    Fix up Debouncing in AVR Templates (#5964)

commit a37e44b2d7fdb41f01e53e382000f987563d8979
Author: tuesdayjohn <hajimeokuda@gmail.com>
Date:   Thu May 23 20:41:25 2019 -0400

    Added keymap folder matching username; added readme to previous keymap (#5961)

    * Added keymap folder matching username; added readme into previous keymap

    * Update keymap.c

commit f7caca51f60d8b02a7cdcc16acfaa3d794f70bed
Author: Erovia <Erovia@users.noreply.github.com>
Date:   Fri May 24 02:26:15 2019 +0200

    Add support for Dimple (#5963)

    Add support for Dimple, a 40% custom keyboard designed and produced by LazyDesigners.

commit 701a1d94358a72d477326fb475c918823492b22d
Author: Tobias V. Langhoff <tobias@langhoff.no>
Date:   Fri May 24 02:12:17 2019 +0200

    Fix layout comment (#5967)

    Swap the "Cmd" and "Alt" keys in the comment to reflect the actual layout.

    Also change "Cmd" to "Win" for consistency with the default keymap.

commit 03e53dc8a2958c44b03b3863c27ce29b94f81f08
Author: Jarrett Drouillard <jarrett@thestyl.us>
Date:   Thu May 23 00:40:16 2019 -0400

    [Keymap] changes to my userspace and preonic keymap ( spring 2019 ) (#5881)

    * feat-user-kuatsure: abstract symbol row out

    * feat-user-kuatsure: abstract grouped bracket, brace, paren out

    * fix-preonic-kuatsure: remove eol as requested by @drashna

    * feat-user-kuatsure: add KC_MAKE and KC_FLSH

    thanks to @drashna for the help

    * chore-preonic-kuatsure: remove auto shift

    * chore-user-kuatsure: move leader seq's to macro syntax

    * feat-user-kuatsure: add `KC_VRSN` key

    plus use it preonic keymap

    * chore-user-kuatsure: namespace keyboard macros `KB`

    * chore-preonic-kuatsure: move some keyboardy keys around

    * chore-preonic-kuatsure: remove parens, brackets, braces from lower

    * chore-user-kuatsure: move tmux window shifts to dbl press leaders

    * feat-user-kuatsure: add a computer lock leader seq

    * fix-preonic-kuatsure: go back to lower brackets

    * chore-preonic-kuatsure: clear out raise

    * feat-various-kuatsure: add meh + tab mod tap

    * chore-preonic-kuatsure: `raise` eats `game_mod` layer

    * fix-preonic-kuatsure: reverse pg up and pg down

    * chore-user-kuatsure: add double tap to turn off music

    * chore-user-kuatsure: move like seqs together

    * chore-preonic-kuatsure: add a few more items to the num pad on raise

    * feat-user-kuatsure: re-enable td for <> keys

    * chore-user-kuatsure: give a little more grace period for leader

    * fix-user-kuatsure: give lock leader a gui buffer

    no timer or anything, but alfred doesn't boot up as quickly as I would like sometimes

    gui doesn't do anything but gives a little bit of a time bump

    * fix-user-kuatsure: changes from @drashna review

commit 73715bacc26e47e574a5fbefb4d477cb4b7de9e7
Author: tuesdayjohn <hajimeokuda@gmail.com>
Date:   Thu May 23 00:13:55 2019 -0400

    [Keymap] Added personal keymap in Kinesis matching username; updated old readme.md (#5955)

    * Added 'tuesdayjohn' folder; updated old readme.md

    * Update keymap.c

    * Update readme.md

    * Update keymap.c

commit fcb56534111652b9fa19d9d8e7bce635c7a63eb6
Author: Jonathan Rascher <jon@bcat.name>
Date:   Wed May 22 23:08:48 2019 -0500

    [Keymap] Switch Quefrency keymap from I2C back to serial; factor common configs into userspace (#5951)

    * Switch Quefrency from flaky I2C back to serial

    * Lower mouse wheel speed on Quefrency slightly

    * Migrate common settings to userspace

    * Enable Bootmagic Lite for consistent reset to bootloader.

    * Turn off some undesired features across all keyboards.

    * Remove EEPROM reset keybinding from all keyboards since Bootmagic Lite
    also does an EEPROM reset.

    * Set backlight and underglow increments consistently across all
    keyboards since lots of them like to override the deafults.

    * Set mouse keys consistently across all keyboards.

    * Update function layer keymap images

commit d31c54c8aff2645ca7762ad423735d409561ba39
Author: Ben <BenRoe@users.noreply.github.com>
Date:   Thu May 23 06:06:55 2019 +0200

    [Keyboard] Add info.json to O4L5x12 (#5950)

    * [Keyboard] Add info.json to O4L5x12

    * Apply suggestions from code review

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Better formatting

    * Add key_count to all layouts

commit 894010786c4a78b939df7114d1c3e70957a8a300
Author: ymzcdg <49898694+ymzcdg@users.noreply.github.com>
Date:   Thu May 23 05:33:10 2019 +0800

    translate docs into Mandarin Chinese (#5890)

    * translate docs into Mandarin Chinese

    translate
    faq_debug.md
    into Chinese

    * translate faq_build.md into Chinese

    translate faq_build.md into Chinese

    * faq_keymap.md to zh-cn

    faq_keymap.md to zh-cn

commit eb756916c2b1d3b03b1aa26b8bb02e91ce849089
Author: Drashna Jaelre <drashna@live.com>
Date:   Tue May 21 13:40:50 2019 -0700

    [Keyboard] Fix 9key macropad keymap (#5942)

    Fails to compile on the configurator because tapdance is enabled for the entire keyboard

commit fc3965ef70ead4d01209c344f9a5f8e1dcf8a1dd
Author: Jesper Nellemann Jakobsen <jesper.nellemann@gmail.com>
Date:   Tue May 21 20:03:57 2019 +0200

    [Keymap] Update Mouse key settings (#5946)

    Set shorter `MOUSEKEY_INTERVAL` and `MOUSEKEY_TIME_TO_MAX`.
    Move mouse scroll buttons around and update comment to reflect change.

commit fdd8c5c50c4f433da6791a4d410f2ee772ee20c3
Author: dsanchezseco <d.seco@protonmail.com>
Date:   Tue May 21 20:01:29 2019 +0200

    [Keymap] dsanchezseco for planck (#5944)

    * added user keymap

    * updated keymap

    * updated keymap

    * swapped positions of alt and altGr

commit 419f2c3f4048037901e95504ef38104c77bd715e
Author: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue May 21 11:00:32 2019 -0700

    [Keyboard] QMK Configurator support for Diverge TM 2(#5943)

commit a0d5f0722f8d045903670babbdc76ad1c5842b7c
Author: stanrc85 <47038504+stanrc85@users.noreply.github.com>
Date:   Tue May 21 13:59:08 2019 -0400

    [Keymap] Romac added and tweaks to existing keymaps (#5941)

    * Initial keymap for Romac

    * Formatting changes

    * keymap tweaks

    * Add new cycle layer key

    * add cycle layer code

    * initial upload

    * keymap updates

    * keymap updates

    * keymap updates for new layer names

    * new enum layers

    * case added for 4th layer

    * removed extra space for formatting

commit 68501261c3a8dbf04a2f1de7ad23640e8074ab87
Author: Michael Pio <mfmayol@up.edu.ph>
Date:   Wed May 22 01:49:33 2019 +0800

    [Keyboard] Add Ixora keypad (#5931)

    * added ixora files

    * upload ixora

    * update readme

    * Update keyboards/peiorisboards/ixora/ixora.h

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/peiorisboards/ixora/ixora.h

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/peiorisboards/ixora/ixora.h

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/peiorisboards/ixora/keymaps/default/keymap.c

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/peiorisboards/ixora/keymaps/default/keymap.c

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/peiorisboards/ixora/keymaps/wntrmln/keymap.c

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/peiorisboards/ixora/keymaps/wntrmln/keymap.c

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * update files according to suggestions

    * removed unused code

commit 0aece4ddab37e603699cb4ba9e8b72fdaf5a619c
Author: Anthony Leung <anthony@anthonyleung.me>
Date:   Tue May 21 09:03:38 2019 -0400

    add dz60rgb-ansi layout to configurator (#5938)

    * add dz60rgb-ansi layout to configurator

    * fix mekanist's dz60rgb keymap

commit d93c53fc62a15ccb38b94aca9dc09284103564e6
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Mon May 20 15:52:06 2019 -0700

    [Keyboard] fix hhkb bottom layer (#5926)

commit 5904933a3f2266f97cf43a9ed752ceaf9dee1d0c
Author: Jesper Nellemann Jakobsen <jesper.nellemann@gmail.com>
Date:   Tue May 21 00:46:24 2019 +0200

    [Keymap] bingocaller's DZ60 MacOS keymap (#5914)

    * Added customisations and README

    * Tweak keymap: word traversal/deletion

    * Add w and b word traversal/deletion keycodes.
    * Add fine volume control key codes, but don't use them, because they
      conflict with other key codes. `A` somehow got remapped to fine
      volume up.

    * Set mousekey delay to zero

    * Use SAFE_RANGE for key codes.

    * Update keymap and README

    Add new mouse-specific layer 3, activated by pressing and holding space.
    Add brightness controls to layer 4 (previously, layer 3).
    Update README:
      * New keyboard-layout mockup image.
      * Add actual link to kbdfans.cn.
      * Update layer descriptions.

    * Fix indentation in keymap.c

    * Use _______ over KC_TRNS to increase readability

    * Custom keys: use #define over process_record_user

    * Use enum for naming layers

    * Rename README.md -> readme.md

commit 57f5cd3ca7903a8736f79d3d08a7dc6dc75793b3
Author: Kenneth Aloysius <krusli@users.noreply.github.com>
Date:   Tue May 21 05:43:29 2019 +0700

    [Keyboard] YD60MQ support (#5911)

    * Keep ASCII art consistent with keymap

    * Possible fix for xyverz ortho keymap: define RGBLED_NUM

    * Update DZ60 keymap; TODO store old keymap under different directory?

    * Change RGUI to RALT because 7u spacebar is too long

    * Save old bottom row keymap

    * Update Iris keymap: replace backslash with grv

    * Add ortho_4x12 layout

    * Added Delete key to Iris keymap

    * Move delete key

    * Oh look a new keyboard

    * ortho4x12: get an adjust layer back

    * Remove jj40 keymap, add custom power draw #define

    * Set WhiteFox to advertise only 100mA of power draw

    * Update WhiteFox keymap

    * Update WF keymap (2)

    * Remove lets_split keymap, update community krusli keymap

    * Add #define for BACKLIGHT_LEVELS (unused)

    * Update Whitefox keymap

    * Add YD60 from auto-generated kbfirmware files

    * Bring files up to speed with new standards

    * Fix: KEYMAP -> LAYOUT

    * Fix keymap differences (DZ60 -> YD60)

    * Update keymap

    * Update README

    * Fix RShift position

    * Specify that the port is for the YD60MQ variant

    * Update keyboards/iris/keymaps/krusli/keymap.c

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Fix Iris and Let's Split keymaps

    * Remove unused keymap file

    * Use #include QMK_KEYBOARD_H

    * Add atmel-dfu selection to yd60

    * Rename dir to YD60MQ, update definitions

    * Use new convenience macros/functions for led_set_user

    * Use #pragma once

    * Change all ?= to = in rules.mk

    * Use pragma once for yd60mq.h

    * Take out DZ60 and Iris changes

    * Remove now-removed Iris folder

    * Revert adding ortho_4x12

    * Revert on xyverz ortho_4x12 keymap

    * Undo deleting JJ40 keymap files

    * Don't revert beyond upstream jj40 state

    * Extra files from earlier commit is to be deleted

    * Remove WhiteFox keymap not in upstream yet

    * Re-add my Let's Split keymap

    * Revert keymap changes

    * Cleanup: indentation

    * Update keyboards/yd60mq/rules.mk

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/yd60mq/rules.mk

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Cleanup & move kb backlighting code to yd60mq.c

    * Update README, rename to lowercase

    * Update README: rename to lowercase

    * Update README with links and picture of PCB

    * Remove PREVENT_STUCK_MODIFIERS

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

commit 843c67d805b72e9bbfaa14f0ef93f1506c1fcc98
Author: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date:   Mon May 20 15:19:31 2019 -0700

    Plain60: Configurator layout extension (#5929)

    * Add LAYOUT_60_ansi

    * Add LAYOUT_60_iso

    * Add LAYOUT_60_ansi_split_bs_rshift

    * Add LAYOUT_60_iso_split_bs_rshift

    * Enable Community Layout support

    Added:

    - 60_ansi
    - 60_ansi_split_bs_rshift
    - 60_iso

    * Add LAYOUT_60_hhkb and enable its community layout support

commit 566b8c57b1ded327ee462c552563026b0f6fa20e
Author: Danny <nooges@users.noreply.github.com>
Date:   Mon May 20 13:16:40 2019 -0400

    [Keyboard] Fix pinout of Levinson Rev 1 scrap sale boards to use non-jumpered pinout (#5935)

commit cd826e39d27353aa0ba1e5cd53dd957902703e25
Author: jotix <47826561+jotix@users.noreply.github.com>
Date:   Mon May 20 12:22:20 2019 -0300

    vim style cursor keys (#5932)

commit 228e7145c0a8c7415f89b2e6333529381fa3fd77
Author: Jonathan Rascher <jon@bcat.name>
Date:   Sun May 19 19:14:28 2019 -0500

    Remove spurious backslashes from my keymaps (#5927)

    Suggested in #5924.

commit 1435a2ca61f0c00d9784ea2f43fd455c96a295c7
Author: Jonathan Rascher <jon@bcat.name>
Date:   Sun May 19 18:11:18 2019 -0500

    Update my Quefrency/KBD67 keymaps, adding BDN9 macropad keymap as well (#5924)

    * Set Quefrency bootloader correctly for Elite-C

    * Update Quefrency layout to be more like HHKB

    * Update KBD67 layout to be more like HHKB

    * Add keymap for BDN9 macropad

commit c9a7161d934979770792ff1e91ccfcc3508d240b
Author: Ryan Caltabiano <rcalt2vt@gmail.com>
Date:   Sun May 19 08:34:25 2019 -0500

    Reduce rgb matrix firmware size

commit e7af23788fbcff8e5bea896b458fb8da1639e66d
Author: crilith <unrefinedthought@gmail.com>
Date:   Sun May 19 14:12:34 2019 -0500

    [Keymap] Update keymap.c (#5923)

    Corrected formatting and added shortcuts.

    Removed invalid #define

commit e8372692c58c3e731a7ccef58ddeaa45e2e71e9f
Author: Andrew Kannan <andrew.kannan@gmail.com>
Date:   Sun May 19 13:03:06 2019 -0400

    [Keyboard] Instant60 VIA Support (#5909)

    * VIA Support for Instant60

    * Backlighting updates

    * Update default keymap

    * Add Standard layout default VIA supported layout

    * Clean up some backslashes

    * Add info.json

    * Update info json metadata

    * add info.json for practice65

    * Update keyboards/cannonkeys/instant60/info.json

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/cannonkeys/practice65/info.json

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/cannonkeys/instant60/keymaps/via/keymap.c

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Remove unused enum

commit b479eff94013c32b6f3f926a23b7e4a6cf7a3a6e
Author: marksard <38324387+marksard@users.noreply.github.com>
Date:   Mon May 20 02:02:13 2019 +0900

    [Keymap] Add keymap csprt (#5918)

    * Keyboard: add treeadstone48

    * rename layout defines

    * Use of pragma once

    * move common include code

    * fixed info.json

    * change keymap layout from kc to normal

    * fix alpha revision keymap

    * fixed info.json

    * remove USE_Link_Time_Optimization

    * Add center sprit keymap for nomu30

commit 6b8be985551efc5a5f95dfea6dc1554352bc46e0
Merge: 2a8fd5823 89e9785d7
Author: Drashna Jaelre <drashna@live.com>
Date:   Sun May 19 10:01:16 2019 -0700

    [Keymap] Drashna Corne Keyboard updates  (#5903)

    * Re-enable Audio

    And there was much rejoicingmake keebio/iris/rev2:drashna AUDIO_ENABLE=yes!

    * Re-add debounce to ergodox EZ

    * Fix rgb matrix helper function

    * Make sure that RGM Matrix is checked properly

    * Fix merge commit?

    * Disable more RGB matrix modes

    * Increase Debounce for Ergodox EZ

    The performance improvements have made it necessary, actually

    * Consolidate RGB Matrix layer indication function

    And changes to iris

    * Fix lighting issue for gamepad

    * Update Corne Keyboard configuration

    * Update Corne Keyboard layout

    * Update KC_MAKE macro to better handle crkbd split

    * Tweaks to Corne Keyboard Layout

    * Enable RGB Matrix Sleep

    * Update my code to use layer_state_t typedef

commit 2a8fd5823244eb1c7e8906b4118f01d2078c4e28
Author: marksard <38324387+marksard@users.noreply.github.com>
Date:   Mon May 20 02:00:53 2019 +0900

    [Keymap] Add keymap nomu30 likejijs (#5917)

    * Keyboard: add treeadstone48

    * rename layout defines

    * Use of pragma once

    * move common include code

    * fixed info.json

    * change keymap layout from kc to normal

    * fix alpha revision keymap

    * fixed info.json

    * remove USE_Link_Time_Optimization

    * Add like_jis keymap for nomu30

commit 2ce3c5548ae7329a80d4db73a5ce3e7f092332f3
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Sun May 19 09:51:56 2019 -0700

    [Keyboard] E6V2 BMC OE (#5908)

    * rename bmc due to confusion as the bmc from r2 is different

    * update readme

    * Update keyboards/exclusive/e6v2/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

commit d67eb20aed97410e11a17f7f5799d822f98a7558
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Sun May 19 09:50:57 2019 -0700

    [Keyboard] Pearl Refactors (#5907)

    * use pragma once

    * remove custom matrix

    * remove custom i2c code in favor of QMK's i2c_master

    * rename to all lower case readme

    * update readme

    * turn off bootmagic as it doesn't work anyway

    * Update keyboards/pearl/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

commit 11c7cd47aee697ac73bf7ec5704086e2a15d7dca
Author: jotix <47826561+jotix@users.noreply.github.com>
Date:   Sun May 19 13:49:23 2019 -0300

    [Keymap] jotix ortho_4x12_layout tweakings (#5904)

    * jotix ortho_4x12_layout tweakings

    * jotix ortho_4x12_layout tweakings

commit e0ecc53f4e0852796e16b170851fa396ab9ae854
Author: fauxpark <fauxpark@gmail.com>
Date:   Mon May 20 02:46:41 2019 +1000

    Make DEBUG keycode disable as well as enable (#5898)

    * Make DEBUG keycode disable as well as enable

    * print() can always be used regardless of debug_enable state

commit 26203401a1748daf664eb3e811aaf9cf0b3a7b5e
Author: marksard <38324387+marksard@users.noreply.github.com>
Date:   Mon May 20 01:43:58 2019 +0900

    [Keyboard] Add keyboard treadstone32 (#5888)

    * Keyboard: add treeadstone48

    * rename layout defines

    * Use of pragma once

    * move common include code

    * fixed info.json

    * change keymap layout from kc to normal

    * fix alpha revision keymap

    * fixed info.json

    * remove USE_Link_Time_Optimization

    * Added Treadstone32 keyboard.

    * Fixed some code

    * Fixed some codes

    * Fixed config.h

    * modified review point

    * Fixed redundant include

commit 5e7b929717bd6b461816f6800310b2ea90673900
Author: coseyfannitutti <43188488+coseyfannitutti@users.noreply.github.com>
Date:   Sun May 19 12:43:10 2019 -0400

    [Keyboard] Add mullet and mulletpad keyboards (#5878)

    * Added mullet and mulletpad keyboards

    * Added mullet and mulletpad keyboards

    * Update keyboards/coseyfannitutti/mullet/mullet.h

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/coseyfannitutti/mullet/mullet.h

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/coseyfannitutti/mullet/mullet.h

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/coseyfannitutti/mulletpad/mulletpad.h

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/coseyfannitutti/mulletpad/mulletpad.h

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/coseyfannitutti/mulletpad/mulletpad.h

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/coseyfannitutti/mullet/config.h

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mullet/keymaps/alternate/keymap.c

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mullet/keymaps/default/keymap.c

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mullet/mullet.c

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * removed unnecessary slashes from keymaps

    * Update keyboards/coseyfannitutti/mullet/mullet.h

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mullet/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mullet/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mullet/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mullet/rules.mk

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mulletpad/config.h

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update config.h

    * Update keyboards/coseyfannitutti/mulletpad/keymaps/default/keymap.c

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mulletpad/mulletpad.c

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mulletpad/mulletpad.h

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mulletpad/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mulletpad/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mulletpad/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * update config.h

    * Update keyboards/coseyfannitutti/mullet/rules.mk

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/coseyfannitutti/mulletpad/rules.mk

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/coseyfannitutti/mulletpad/mulletpad.h

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/coseyfannitutti/mulletpad/rules.mk

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/coseyfannitutti/mulletpad/keymaps/default/keymap.c

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * update info.json

    * Update readme.md

    update readme.me

    * Update keyboards/coseyfannitutti/mulletpad/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mulletpad/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mulletpad/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mulletpad/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/coseyfannitutti/mulletpad/info.json

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

commit 56930a0174b685676b8b34cb9f6436db8f8569ae
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Sun May 19 11:39:30 2019 -0500

    [Keyboard] Update LED positions to be more physically accurate for Sol rev1 (#5921)

commit 5c7b37bbbde969eb056d531c897c1d5f80beeb58
Author: Ryan Caltabiano <rcalt2vt@gmail.com>
Date:   Wed May 15 22:23:42 2019 -0500

    Added custom center point to rgb matrix

commit 270b39b2eb44247cff75ddd216a8e67f8f264991
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Sun May 19 11:19:46 2019 -0500

    Spirals, Pinwheels, and Documentation....Oh My! RGB Matrix Effects (#5877)

    * Spirals, Pinwheels, and Documentation....Oh My!

    * Spiral effect band thickness adjustments

    * Fixing animation spin directions

commit a0d6c5a1136e2c56aa4a57eac08355c2b5d79ad5
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Sun May 19 11:15:50 2019 -0500

    [Keymap] Update Xulkal user code (#5920)

commit f11fde9bf5898a09201042d612caaff8d4692bb9
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Sun May 19 11:11:08 2019 -0500

    Fixing hsv_to_rgb where s = 0 and v < 255 (#5915)

    * Fixing hsv to rgb where s is 0 and v is < 255

    * Update color.c

commit 0099bbf9a64a0b4df1093f528481bff39af2c80d
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Sun May 19 11:09:06 2019 -0500

    Single Color Band scrolling left to right effects (#5867)

commit ba26736d7e0679e87e34add2445cdae541e2a0b8
Author: Ryan Caltabiano <rcalt2vt@gmail.com>
Date:   Sat May 18 15:12:35 2019 -0500

    Fix bit count calculation for iterating layers

commit 89e9785d7a87e8dbb941dd272c032f34658169fd
Author: Drashna Jaelre <drashna@live.com>
Date:   Fri May 17 15:21:45 2019 -0700

    Update my code to use layer_state_t typedef

commit 356521864e9f49d50131f4779ff9e56dc8b12e8f
Author: Drashna Jaelre <drashna@live.com>
Date:   Tue May 14 23:26:41 2019 -0700

    Enable RGB Matrix Sleep

commit ebfc39cc5083dd7c597f274883621b932ce6c33f
Author: Drashna Jaelre <drashna@live.com>
Date:   Tue May 14 09:11:57 2019 -0700

    Tweaks to Corne Keyboard Layout

commit bcfc24fd13661612b4af3836b174fe02960a13e7
Author: Drashna Jaelre <drashna@live.com>
Date:   Mon May 13 21:03:17 2019 -0700

    Update KC_MAKE macro to better handle crkbd split

commit 05e2baaa49ffaef14f704e5b25763fc1ec967b21
Author: Drashna Jaelre <drashna@live.com>
Date:   Mon May 13 20:58:46 2019 -0700

    Update Corne Keyboard layout

commit ed08787aaac2f4f96f11f7c074af9c825b6e4917
Author: Drashna Jaelre <drashna@live.com>
Date:   Mon May 13 20:55:19 2019 -0700

    Update Corne Keyboard configuration

commit 2a6cb0487656b2f954ff6f01f41628138fed9a58
Author: Drashna Jaelre <drashna@live.com>
Date:   Mon May 13 19:40:19 2019 -0700

    Fix lighting issue for gamepad

commit 6689f900fc0ed9022706af7605d40225a3348f63
Author: Drashna Jaelre <drashna@live.com>
Date:   Mon May 13 14:48:53 2019 -0700

    Consolidate RGB Matrix layer indication function

    And changes to iris

commit f520316124fb789af0981fd6e5381f090c300acb
Author: Drashna Jaelre <drashna@live.com>
Date:   Sun May 12 10:33:10 2019 -0700

    Increase Debounce for Ergodox EZ

    The performance improvements have made it necessary, actually

commit 667b927004641d6352378af5eb19785572dbc341
Author: Drashna Jaelre <drashna@live.com>
Date:   Sat May 11 12:25:59 2019 -0700

    Disable more RGB matrix modes

commit db7c3b9220eb97e3c453e86c461760eda3652700
Author: Drashna Jaelre <drashna@live.com>
Date:   Fri May 10 01:36:07 2019 -0700

    Fix merge commit?

commit 6af0c1e1293cbc50b7d5136c2c8260cec1d1a21b
Author: Drashna Jaelre <drashna@live.com>
Date:   Thu May 9 23:50:30 2019 -0700

    Make sure that RGM Matrix is checked properly

commit 42a6bd2fd4f797a5ef629621cd50ca4ac2a7f835
Author: Drashna Jaelre <drashna@live.com>
Date:   Tue May 7 21:08:41 2019 -0700

    Fix rgb matrix helper function

commit ed6d5d5b7be2e41d184b484c70562651ed1f2f45
Author: Drashna Jaelre <drashna@live.com>
Date:   Tue May 7 14:16:00 2019 -0700

    Re-add debounce to ergodox EZ

commit f06910f5bf4de66b800342a47f24800e2f229b07
Author: Drashna Jaelre <drashna@live.com>
Date:   Tue May 7 00:22:55 2019 -0700

    Re-enable Audio

    And there was much rejoicingmake keebio/iris/rev2:drashna AUDIO_ENABLE=yes!

commit d85110b6ec5fcdf3ef88b41909ce739b017abbea
Author: Josh <josh@visionistinc.com>
Date:   Fri May 17 16:48:53 2019 -0400

    Adds a configurable initial delay to the audio clicky feature (#4286)

    * Adding an AUDIO_CLICKY_DELAY_DURATION configurable value to the AUDIO_CLICKY feature.

    * Tweaking my community keymap to work better with my rev 4 planck.

commit 00d1d7828c63538122d9d3db7336b9a40c9ffe80
Author: Alex Ong <the.onga@gmail.com>
Date:   Sat May 18 06:47:50 2019 +1000

    Typedef'ed layer_state_t to uint32_t (#3637)

    * Typedef'ed layer_state_t to uint32_t.

    This enables future work with layer_state_t to uint8_t for optimization purposes.

    * Removed accidental xeal60 commit

    * Revert to egyptian brackets, added sizeof(layer_state_t) so when layer_state_t is redefined it will automagically work.

    * Add additional typedefs

    * Add checks for setting layer state

    * Update tmk_core/common/action_layer.h

    Co-Authored-By: alex-ong <the.onga@gmail.com>

    * Revert commit.

commit 90a45aac6e8fdbf8d781d711bb6a27574130ff38
Author: Jeremy Bernhardt <jeremythegeek@gmail.com>
Date:   Fri May 17 14:07:38 2019 -0600

    [Keyboard] Butterstick fix (#5900)

    * Working on chording

    * Working on chording

    * Got layouts in order

    * Initial Georgi support

    * forgot to add keymaps

    * Updated readme

    * Update keyboards/georgi/keymaps/template/readme.md

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Update keyboards/georgi/georgi.h

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Update keyboards/georgi/keymaps/default/keymap.c

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Update keyboards/georgi/keymaps/default/keymap.c

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Update keyboards/georgi/rules.mk

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Update keyboards/georgi/rules.mk

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Update keyboards/georgi/matrix.c

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Update keyboards/georgi/georgi.c

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Update keyboards/georgi/georgi.c

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Update keyboards/georgi/rules.mk

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Update keyboards/georgi/keymaps/default/keymap.c

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Update keyboards/georgi/keymaps/template/keymap.c

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Update keyboards/georgi/matrix.c

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Disabled features, updated info

    * Update keyboards/georgi/config.h

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Update keyboards/georgi/config.h

    Co-Authored-By: germ <jeremythegeek@gmail.com>

    * Fixed info.json

    * Split the number button and fixed gaming mode.

    * started work on history feature

    * Working history/multikeyfuckery

    * type

    * inital code reduction refactor

    * Got multikey patched up, optimizing for size

    * Forgot to remove stuff

    * fixed key repeat

    * Key repeat added.

    * Symshift locking

    * Midchord Sym shenanigans.

    * Added only QWERTY mode

    * Split out header

    * Added stickybits, minimal layour

    * Fixing user layout

    * Whitespace fixing

    * Fixing Version name

    * Starting work on BS

    * Fixing default layout and rules

    * Updated Butter fw

    * Copy-paste rebase

    * more fixing from merge. Fuck

    * Forgot to roll version

    * Added revisions as per @mechmerlin

    * Somehow forgot backspace

    * Forgot Backspace?

commit d0c9ad6433d6ed30e8076fd26c8551f579cb08c8
Author: Jeremy Bernhardt <jeremythegeek@gmail.com>
Date:   Fri May 17 14:02:22 2019 -0600

    [Keyboard] Georgi improvements (#5899)

    * Georgi improvements

    * The writing was in the -Wall

commit 7a0174f871792c62fdd1b737f2dc9db753695245
Author: Chris Broekema <broekema-github@fuzzms.nl>
Date:   Fri May 17 21:58:28 2019 +0200

    [Keyboard] keypad enter should not be remapped in Model M default keymap (#5897)

commit b34d2c73fa30d80281d1eab4f354092d25f5a747
Author: kingwangwong <31333140+kingwangwong@users.noreply.github.com>
Date:   Fri May 17 14:57:10 2019 -0500

    [Keymap] Adding my keymap for the minivan/kumo (#5896)

    * adding my keymap for the KUMO

    * edited the readme file

    * edited some more files

    * edited some more files

    * edited files from feedback

    * edited one more files from feedback

    * edited rules

commit 8be32e98d8bd112c24b292d9c25a94f6e2ed71ac
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Fri May 17 12:54:10 2019 -0700

    [Keyboard] New Keyboard: Mars 8.0 TKL  (#5894)

    * fix the things the stupid script broke

    * create an appropriate LAYOUT macro using LAYOUT_tkl_ansi

    * create an appropriate keymap stolen from the phantom default keymap

    * add correct pins used and rgb led numbers

    * change vendor and device name

    * add QMK Configurator support

    * fix up RGB underglow

    * update readme

    * introduce new layout macro tkl_iso

    * add QMK Configurator support for new layout macro

    * enable backlight and add community layout support

commit 49464be64559710318f4d8edc5a92a7a90784734
Author: marksard <38324387+marksard@users.noreply.github.com>
Date:   Sat May 18 04:40:02 2019 +0900

    [Keymap] Add keymap for minivan (#5887)

    * Keyboard: add treeadstone48

    * rename layout defines

    * Use of pragma once

    * move common include code

    * fixed info.json

    * change keymap layout from kc to normal

    * fix alpha revision keymap

    * fixed info.json

    * remove USE_Link_Time_Optimization

    * Added like_jis keymap for minivan/KUMO keyboard.

    * Fixed comments

    * Fixed review

commit 9c7818582d9f82b1378cfbfb654dbb8e9348b268
Author: mogira <7379940+mogira@users.noreply.github.com>
Date:   Sat May 18 04:37:12 2019 +0900

    Fix the modifier of font variable in ssd1306.c (#5880)

commit 48b01446ba6b74d7e0793f972873a10fceef2f62
Author: Drashna Jaelre <drashna@live.com>
Date:   Thu May 16 10:28:06 2019 -0700

    Make delay for Capslock in Hold-Tap functions configurable  (#5497)

    * Increase delay for Hold-Tap register for CAPSLOCK

    Because it seems that the 80ms delay wasn't too much

    * Screw it, make the caps delay a define and make it configurable

commit 5a8e387b774f9af6932a61ce17d5e762b141d884
Author: Jan Christoph Ebersbach <jceb@e-jc.de>
Date:   Thu May 16 18:40:00 2019 +0200

    [Keymap] Signum 3.0 Swap positions (#5892)

commit 63ddad86a92f11725548cd9775f82e7293aef050
Author: ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
Date:   Fri May 17 01:39:06 2019 +0900

    Add a new keyboard Halberd (#5874)

    * Add a new keyboard Halberd.

    * Update default keymap and add new keymap.

    * Use pragma once.

    * Comment out IS_COMMAND macro.

    * Remove unnecessary backslashes.

    * Remove dead code.

    * Change layer defines to enum.

    * Remove DISABLE_JTAG definition.

    * Change BOOTMAGIC_ENABLE to "lite".

    * Remove unnecessary line.

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

commit 1a28906a3da1f14034b81871b90bcce0ed56c286
Author: Pavlos Vinieratos <pvinis@gmail.com>
Date:   Thu May 16 18:38:28 2019 +0200

    [Keymap] Pvinis/update for iris (#5889)

    * add default functions

    * some indenting

    * add ctl and alt

    * maybe?

commit a8af694d265d5d136e81669ec7b30052a8f4de08
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Thu May 16 08:52:38 2019 -0700

    [Keyboard] Leaf60 hotswap and universal pcb (#5882)

    * initial commit

    * copy paste with some fixes the code from fox lab leaf60 repo

    * add 60_ansi and 60_hhkb and community layout support

    * add QMK Configurator support

    * turn bootmagic to lite and turn on rgb and backlights

    * disable some features so firmware isn't too big

    * initial commit for hotswap leaf60

    * add hotswap support

    * edits for consistency

    * add a generic leaf60 readme

    * turn off console and command to save firmware space

    * not enabling sleep led enable

    * not enabling sleep led enable

    * had one extra key in 60_hhkb

    * get rid of limit val define

    * Update keyboards/foxlab/leaf60/hotswap/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/foxlab/leaf60/hotswap/rules.mk

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Update keyboards/foxlab/leaf60/universal/rules.mk

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

commit b541369c45f13369c16de1b887f6ca5b7e589e6d
Author: Pavlos Vinieratos <pvinis@gmail.com>
Date:   Thu May 16 17:21:51 2019 +0200

    [Docs] Fix typo in Userspace doc (#5871)

    * typo

    * Update docs/feature_userspace.md

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

commit fc06975fa3ea31049c8a1dc7a42b78b90db1c89b
Author: zvecr <git@zvecr.com>
Date:   Thu May 16 13:54:43 2019 +0100

    Add Configurator support for ai03/orbit (#5863)

    * Add Configurator support for ai03/orbit

    * Add Configurator support for ai03/orbit - align with documented KLE

commit 6764bb0157d621c63b97831afb9061345159df5a
Author: zvecr <git@zvecr.com>
Date:   Thu May 16 13:53:48 2019 +0100

    Align Configurator support for ai03/lunar (#5864)

commit 670a9b7f83dacf2b0e9fb42756935a77598c6677
Author: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date:   Thu May 16 13:11:28 2019 +0900

    Add effect range to rgblight.c (#5856)

    * add rgblight_set_effect_range()

    * implement effect range

    * Arrange the order of function list in rgblight.h .

    * update docs/feature_rgblight.md

    * fix RGBLIGHT_RAINBOW_SWIRL_RANGE default value

    * add example code about Utility Functions

    * add example code about direct operation functions

    * When RGBLIGHT_SPLIT is defined, the following function has no meaning and is invalidated.

     * rgblight_setrgb_master(r, g, b)
     * rgblight_setrgb_slave(r, g, b)
     * rgblight_sethsv_master(h, s, v)
     * rgblight_sethsv_slave(h, s, v)

    * add temporary test code for rgblight_set_effect_range

    * fix rgblight_effect_knight() bug

    * Test End. Revert "add temporary test code for rgblight_set_effect_range"

    This reverts commit 5680cddd012d68b2db75a532862a7fef250f8973.

commit acd3e79add2d47ab664b831936e5b6e71d3b8e15
Author: yiancar <yiangosyiangou@cytanet.com.cy>
Date:   Thu May 16 05:09:36 2019 +0100

    NK65 Addition (#5865)

    * Nk65 initial commit

    * Minor fix for compatibility

    * Make everything pretty

    * Update keyboards/nk65/config.h

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/nk65/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Chmod Dummy

    * Update getting_started_introduction.md

    * Revert "Update getting_started_introduction.md"

    This reverts commit daf446acf7ae4ae00488b389ce04f2cfca708d44.

commit 8680c50d07604836b0fc7c3f97bd77c7830ea083
Author: Erez Zukerman <bulk@ezuk.org>
Date:   Wed May 15 19:53:45 2019 -0400

    Removes Erez personally from QMK (#5883)

commit 8bcefc92d0b1494b890dae3f41516acf831f539c
Author: zvecr <git@zvecr.com>
Date:   Wed May 15 20:57:35 2019 +0100

    Port 40percentclub nein (#5876)

commit 547eb55553b386e0dfa5bb78badfa001608b7a34
Author: ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
Date:   Thu May 16 00:52:30 2019 +0900

    Add a new keybord Scythe (#5873)

    * Add a new keyboard Scythe.

    * Update info.json.

    * Use pragma once.

    * Comment out IS_COMMAND macro.

    * Remove DISABLE_JTAG definition.

    * Remove unnecessary backslashes.

    * Change layer defines to enum.

    * Remove dead code.

    * Fix typo(RGBLIGHT_SPLIT).

    * Change BOOTMAGIC_ENABLE to "lite".

    * Remove unnecessary keys.

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Fix width.

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Fix hight.

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

commit 7209266ea1bd8b6bce4d468ea016689602499239
Author: Nicholas Shaff <nick@shadedream.com>
Date:   Tue May 14 21:31:36 2019 -0500

    [Keyboard] Added capslock LED support to the Doro67 Multi PCB. (#5875)

commit 4ed474b66a5bcb3ea401c4bc76bd736c7db55e58
Author: Ben <BenRoe@users.noreply.github.com>
Date:   Wed May 15 02:00:31 2019 +0200

    [Keyboard] Add Keycapsss O4L 5x12 keyboard (#5859)

    * [Keyboard] Add Keycapsss O4L 5x12 keyboard

    * Fix layout error in rules.mk

    * Update keyboards/keycapsss/o4l_5x12/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/keycapsss/o4l_5x12/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/keycapsss/o4l_5x12/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/keycapsss/o4l_5x12/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/keycapsss/o4l_5x12/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/keycapsss/o4l_5x12/config.h

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Remove trailing backslashes

    * Add additional infos to the readme

    * Remove remaining backslashes

    * Change 2x2y layout to my needs

    * Update keyboards/keycapsss/o4l_5x12/o4l_5x12.h

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

    * Update keyboards/keycapsss/o4l_5x12/o4l_5x12.h

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

    * Update keyboards/keycapsss/o4l_5x12/o4l_5x12.h

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

    * Update keymaps to use new layout names

    * Update keyboards/keycapsss/o4l_5x12/rules.mk

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

commit 3220b2481967b024ca8c06714578ad35204a0de8
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Tue May 14 17:25:26 2019 -0500

    Update Zen rev2 info.json file with option positions (#5872)

commit fd0ba01d68b03945b87dcf0e95cf85afb99f034d
Author: Markus Dieckmann <markus.dieckmann@posteo.de>
Date:   Tue May 14 21:27:49 2019 +0200

    [Keymap] Correction for DE_Simple keymap readme (#5870)

    Replaced erroneous second QWERTZ keymap with diagramm for 'Lower'
    layer.

commit 7c0f2ae6d1c1d3f168a5919287b6608b092b3dba
Author: Morton Jonuschat <yabawock@gmail.com>
Date:   Tue May 14 12:12:29 2019 -0700

    [Keymap] Neo2 for ErgoDox on MacOS US QWERTY / ABC Extended keymap (#5862)

    This is a Neo2 inspired layout that is meant to be fully usable on
    MacOS when used with the default US QWERTY/ABC Extended keymap.

    Neo2 layers 1-4 have been almost fully implemented in hardware.
    Layers 5 and 6 (greek and mathematical symbols) have been left
    out for now as most of them aren't available on the default
    keymaps.

    Layer toggling for layer 3 on the right hand side utilizes a
    tap-toggle approach that is a combination of MO & LT macros.
    This is required to allow sending Y when tapped, @ when tapped
    while the SHIFT modifier is active and support momentarily
    toggling the layer while the key is held.

commit 93a97ec6e5a8f193bb96bba1636b7f67cd47d3fc
Author: zvecr <git@zvecr.com>
Date:   Tue May 14 20:05:09 2019 +0100

    Fix arch installs as 8.1 is unavailable and #5456 has been merged (#5857)

commit b68d8fe82eac0be9ca8862fdf94ae4bfbbb0735e
Author: Pavlos Vinieratos <pvinis@gmail.com>
Date:   Tue May 14 21:02:22 2019 +0200

    [Keymap] Pvinis master (#5843)

    * trying to make my global keymap

    * refactoring the old keymap using userspace

    * getting there

    * move readme and remove community layout

    * use pragma once instead of ifndefs

    * just make iris work

    * iris decent

    * better naming

    * add some modifiers on the home row

    * use symbol and sysctl layers

    * fix up

    * a bit faster

    * add < and > on symbol layer

    * apparently im not using z all that much..

    * okok

    * fix up stuff

    * led init is back

    * bring back led indicators

    * Update keyboards/ergotravel/keymaps/pvinis/config.h

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * not needed

    * not needed

    * delete these for now, until I use the userspace code

    * remove katamari from here. made a new pr for it

    * lower case

    * drashna suggestion :)

    * move files to correct place

    * fix missing command

commit 4cdb86c730528c8ca5ff90f5b9b01c395d31fc0e
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Tue May 14 13:58:56 2019 -0500

    [Keyboard] Create RGBKB Folder (#5858)

    * Move Sol, Zen, & Zygomorph keyboards to RGBKB folder

    * Updated default keymaps

    * Fixing more areas due too folder moves

    * Fixing Zen layer numbers

    * Fixing zygomorph layer comments

    * Fixing Colmak comments

    * Fixing Sol Colmak readme

    * Macro alignment

    * Zen rev2 configuration json

    * Fixing sol ifdef

    * Fixing Sol info.json

commit e8b27a965d4f6abcc2773022f451bdc7eabebf69
Author: roguepullrequest <roguepullrequest@users.noreply.github.com>
Date:   Mon May 13 16:00:20 2019 +0100

    Roguepullrequest mousepad (#5860)

    * First publish of roguepullreqest programmer dvorak planck layout

    * Removed junk line

    * Update keyboards/planck/keymaps/roguepullrequest/keymap.c

    Co-Authored-By: roguepullrequest <roguepullrequest@users.noreply.github.com>

    * Update keyboards/planck/keymaps/roguepullrequest/keymap.c

    Co-Authored-By: roguepullrequest <roguepullrequest@users.noreply.github.com>

    * Update keyboards/planck/keymaps/roguepullrequest/keymap.c

    Co-Authored-By: roguepullrequest <roguepullrequest@users.noreply.github.com>

    * Update keyboards/planck/keymaps/roguepullrequest/keymap.c

    Co-Authored-By: roguepullrequest <roguepullrequest@users.noreply.github.com>

    * Removed layer songs

    Removed layer songs for cleanliness. Will use them later.

    * Update keyboards/planck/keymaps/roguepullrequest/readme.md

    Co-Authored-By: roguepullrequest <roguepullrequest@users.noreply.github.com>

    * Made basic LSHIFT framework but is not working. Listed other tapdances.

    * Got LSHIFT to work

    * Added working RSHIFT

    * Added working TD_S

    * Cleaned up LEFT and RIGHT [ { ] } on the UPPER layer.

    * Cleaned up layout.

    * Reenabled audio space is not needed right now.

    * Added tap dances and layout image

    * Started dactylmanuform layout

    * Revert "Started dactylmanuform layout"

    This reverts commit 5ef48e4a23de14db9b843d85d3250e1bf4426817.

    * Started mousepad version of BDN9...wont compile for some reason.

    * Fixed BDN9 mousepad layout

    * Added readme.md to mousepad bdn9 layout.

    * Updated readme.md for mousepad bdn9 layout.

    Fixed the tables to finally work.

    * Unslashed the mousepad keymap for the BDN9

commit 9b46fabe084cd3e15104f88ef5d1f87f215de3c6
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Mon May 13 09:58:15 2019 -0500

    Xulkal Keymap Changes (#5861)

commit 8e3cbe030c10090301ae94427cf0e6cf31ef31d9
Author: fauxpark <fauxpark@gmail.com>
Date:   Mon May 13 04:22:16 2019 +1000

    Add Wasdat controller (#5855)

    * Add Wasdat controller

    * Add reset instructions

    * Clarify ANSI & ISO support

commit 7e1d28673ff4c984be889ca1b67a45ca6d3a5065
Author: zvecr <git@zvecr.com>
Date:   Sun May 12 08:01:00 2019 +0100

    [Keyboard] Fix file encoding and add readme (#5853)

commit 94f104cb6cd8751b49df7fa7e5b0b266e5354f92
Author: Croktopus <39040552+Croktopus@users.noreply.github.com>
Date:   Sat May 11 23:59:52 2019 -0700

    [Keyboard] Added hand wired keyboard "Daishi" (#5712)

    * added daishi

    * edits made based on feedback

    * Update keyboards/handwired/daishi/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/handwired/daishi/keymaps/default/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * Update keyboards/handwired/daishi/keymaps/default/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * made more changes based on feedback

    * Update keyboards/handwired/daishi/keymaps/default/readme.md

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

    * updated usb device info

    * fixed layouts

    * fixed LEDs and keymaps

commit 0db65190c2f4f72fd99d676d7e8aed6e0cc834f6
Author: takashiski <takashiskibb@gmail.com>
Date:   Sun May 12 15:20:45 2019 +0900

    [Keyboard] Enable RGBLED_SPLIT on hecomi/alpha (#5836)

    * remove not need file

    * set RGBLIGHT_SPLIT

    * set RGBLIGHT by layer

    * exchange LED color on layer

    * Update keyboards/hecomi/alpha/rules.mk

    I misunderstand RGBLIGHT_SPLIT

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

commit 2b78840ef7e6227949bf6e2f9643449e11df0ac5
Author: zvecr <git@zvecr.com>
Date:   Sun May 12 07:15:18 2019 +0100

    [Keyboard] Fix dz60 LAYOUT_60_iso_split_space_bs_rshift api errors (#5852)

    * Fix LAYOUT_60_iso_split_space_bs_rshift to match comments and Configurator

    * Fix LAYOUT_60_iso_split_space_bs_rshift to match comments and Configurator

commit b32ad8b90cc3b6e8bdcdfa646c658b9848bde105
Author: zvecr <git@zvecr.com>
Date:   Sun May 12 06:57:51 2019 +0100

    [Keyboard] Convert Staryu to use DIRECT_PINS and BACKLIGHT_PINS (#5848)

    * Convert to use DIRECT_PINS and BACKLIGHT_PINS

    * Convert to use DIRECT_PINS and BACKLIGHT_PINS - remove old comment

commit 831d765b52a7d97ac7294e7c89afc34465a2ec32
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Sat May 11 22:56:00 2019 -0700

    [Keyboard] clarify readme for the growing number of kbd67 revisions (#5844)

    * clarify readme for the growing number of kbd67 revisions

    * some pr comment nits

commit 8d46bb9cabb9c8e81c7ca1266d97a0126cc80767
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Sun May 12 00:42:57 2019 -0500

    [Keyboard] Adding RGBKB Zygomorph Keyboard (#5841)

    * Initial Zygomorph 5x6 code

    Split is not working yet

    * layout changes

    implement 4 row config option (not done yet), remove layout comments in layout.c

    * Zygomorph layouts for 5x12, 5x6, 4x12, and 4x6

    Also, info.json *should* be nearly usable
     for the configurator

    * temporary fix for pin D5 being broken

    * show D5 issue comment

    * add build notes

    * Pin B7 broken in split why?

    * remove fix

    * Fix some pin assignments

    * begin to fix keymap

    * Create new 5x6 layout

    * update key positions

    * Initial Zygomorph 5x6 code

    Split is not working yet

    * layout changes

    implement 4 row config option (not done yet), remove layout comments in layout.c

    * Zygomorph layouts for 5x12, 5x6, 4x12, and 4x6

    Also, info.json *should* be nearly usable
     for the configurator

    * temporary fix for pin D5 being broken

    * show D5 issue comment

    * add build notes

    * Pin B7 broken in split why?

    * remove fix

    * Fix some pin assignments

    * begin to fix keymap

    * Create new 5x6 layout

    * Rough first pass at split common conversion.
    Keymap cleanup to cover just the basics.
    Broke OLED code out into separate example.

    * Fix readme

    * Removal of old encoder / oled driver, fix for layout macros

    * small update

    * xulkal zygomorph keymaps

    * Removed the LED_MIRRORED option as leds are always mirrored on Zygomorph

    * Xulkal keymaps update

    * split rgb light support

    * fix line endings

    * Apply suggestions from code review

    Co-Authored-By: zvecr <git@zvecr.com>

    * More layout and compile fixes from pr review

    * Cleaning up rules.mk files

    * Apply suggestions from code review

    Co-Authored-By: zvecr <git@zvecr.com>

    * Updating defaults

    * Apply suggestions from code review

    Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

commit c6184d2e7ed9695c22635431394e501b1d5e6271
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Sun May 12 00:20:14 2019 -0500

    Added check for event pressed to clear space cadet (#5839)

    * Added check for pressed to clear space cadet

    * Found some docs to update

    * Update docs/quantum_keycodes.md

    Co-Authored-By: fauxpark <fauxpark@gmail.com>

    * Changes from PR

commit ec302295b695e43c5967a6f806c4b4505c651e13
Author: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date:   Sat May 11 22:16:07 2019 -0700

    [Keyboard] Z-150 Blackheart refactor (#5823)

    * Fix white space on z150_blackheart.h

    * Update z150_blackheart.h to use #pragma once include guard

    * Update z150_blackheart.h to use QMK-preferred K<row><col> notation

    * Add QMK Configurator support

    * Refactor the keymaps

    - refactor the keymaps into separate files for each layout macro
    - give credit where credit is due
    - white space update (four-space indent)

    * Make Hardware Availability link in readme a rich text link

    * Convert LED indicators to GPIO commands

    * Elevate Indicator LED set-up and toggling to keyboard level

commit f542c0589bec06501a3990070c08638a9124f055
Author: Mike Roberts <miker@miker.org>
Date:   Sat May 11 21:12:06 2019 -0400

    NEK Type A (#5175)

    * project creation and config.h import

    * fix name

    * cleanup

    * layout for left

    * working left with feather pins

    * full keymap

    * ?

    * let's do this

    * non working twimaster version

    * it fucking works!

    * bluetooth!

    * cleanup

    * use auto output for ADAFRUIT_BLE

    * remove auto from custom matrix

    * better ble auto

    * fix f1

    * revert

    * fix ble

    * update readme

    * Update readme.md

    * Update readme.md

commit d53cbd2dc6ec6877f2815c546c03b39fac7a8afa
Author: zvecr <git@zvecr.com>
Date:   Sun May 12 01:55:12 2019 +0100

    Update run command now that the install script is unattended, fix mount point for Debian (#5847)

commit 5c4707eafc5165904918fad7daff4e566f8f60df
Author: stanrc85 <47038504+stanrc85@users.noreply.github.com>
Date:   Sat May 11 20:51:37 2019 -0400

    [Keymap] Minor keymap updates (#5850)

    * Move layer toggle key for one handed operation

    * Add print screen keycode

    * Cleaning up some tab/space formatting

commit 819364ea23c000d3015ca6d15b093ebf96c45732
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Sat May 11 14:31:31 2019 -0500

    Fix for Solid Reactive mode bug (#5846)

    derp, forgot to remove the pragma once

commit b9c38cfec844d5ff0cb952be0c27bbdca6279595
Author: William Chang <william@factual.com>
Date:   Sat May 11 10:14:42 2019 -0700

    Add vim arrow keybindings to layer 1, update readme. (#5842)

commit d591ab6263a4c5581d1614b006b5ef52b012c9a8
Author: Paul J. Miller <miller874@gmail.com>
Date:   Sat May 11 12:24:49 2019 -0400

    feat: add kbd67v2 support (#5777)

    * feat: add kbd67v2 support

    * update cr

    * Update keyboards/kbdfans/kbd67/rev2/config.h

    Co-Authored-By: Vorror <paul@dgtlrepublic.com>

    * Update keyboards/kbdfans/kbd67/rev2/config.h

    Co-Authored-By: Vorror <paul@dgtlrepublic.com>

    * Update keyboards/kbdfans/kbd67/rev2/rev2.c

    Co-Authored-By: Vorror <paul@dgtlrepublic.com>

    * Update keyboards/kbdfans/kbd67/rev2/rules.mk

    Co-Authored-By: MechMerlin <30334081+mechmerlin@users.noreply.github.com>

    * Update keyboards/kbdfans/kbd67/rev2/readme.md

    Co-Authored-By: MechMerlin <30334081+mechmerlin@users.noreply.github.com>

commit 7871a465d36d11c4f9216a9e862104e0e770c6f4
Author: ymzcdg <49898694+ymzcdg@users.noreply.github.com>
Date:   Sun May 12 00:22:16 2019 +0800

    translate docs into Mandarin Chinese (#5807)

    * translate newbs.md into Madarin Chinese

    translate newbs.md into Madarin Chinese

    * translate docs into Mandarin Chinese

    translate getting_started_github.md into Mandarin Chinese

    * translate getting_started_getting_help.md into Mandarin Chinese

    translate getting_started_getting_help.md into Mandarin Chinese

    * contributing.md to Chinese

    Personify QMK as a girl named Q酱 . It can make more developer read this document and contribute QMK.

    * getting_started_introduction.md to Chinese

    getting_started_introduction.md to Chinese

    * faq.md to Chinese

    faq.md to Chinese

    * crlf2lf getting_started_introduction.md

    ending line fix getting_started_introduction.md

    * crlf2lf contributing.md

    crlf2lf contributing.md

commit fd23a0e909c8478f3d9103bce410548af2496f92
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Fri May 10 21:56:16 2019 -0500

    RGB Matrix Effects: Cycle Out to In & Cycle Out to In Dual (#5812)

commit 62ba66d61821fec6a5ad3bdccdf738e15e082461
Author: XScorpion2 <rcalt2vt@gmail.com>
Date:   Fri May 10 18:55:02 2019 -0500

    Cleanup/rgb matrix (#5811)

    * clean up rgb matrix extern usage

    Moved rgb matrix boiler plate into macros

    Rebased onto typing heatmap pr

    * Fixing the reversed frame buffer access in digital rain

    * Fixing digital rain & typing heatmap if keyreactive effects are not enabled

    * Apply suggestions from code review

    Co-Authored-By: Drashna Jaelre <drashna@live.com>

    * Adding parenthesizes to DRIVER_LED_TOTAL where necessary

    * Updated docs

    * added notes about parentheses

commit febaf9dec42ce4d4ade316f811145a291137ee94
Author: Yan-Fa Li <yanfali@gmail.com>
Date:   Fri May 10 09:50:53 2019 -0700

    [Docs] RGB Animation documentation on reducing memory footprint (#5813)

    * Improve Animation docs with example

     - example to reduce flash footprint of animations using RGBLIGHT_EFFECT_ defines

    * Re-order the effects list

    * Update docs/feature_rgblight.md

    Co-Authored-By: yanfali <yanfali@gmail.com>

    * Update docs/feature_rgblight.md

    Co-Authored-By: yanfali <yanfali@gmail.com>

    * Update docs/feature_rgblight.md

    Co-Authored-By: yanfali <yanfali@gmail.com>

    * Introduce line breaks

    * Add title for animation speed section

    * Organize Animation Defines Into Groups

    * Use the RGB EFFECT recommended by mtei in docs

     - has the most modes, and STATIC_LIGHT can't really be disabled.

    * Use more accurate titles for effects and animation

     - accidentally put a toggle in settings

commit 6464dfc91d962faf9c890a373da5e3cbc5b2b743
Author: Andrew Kannan <andrew.kannan@klaviyo.com>
Date:   Fri May 10 01:53:36 2019 -0400

    [Keyboard] Satisfaction75 i2c fix and VIA layout (#5798)

commit d3f3da5112c241e1203bd91ae16cc7b0aa075c0c
Author: Torben Hoffmann <torben.lehoff@gmail.com>
Date:   Fri May 10 07:12:11 2019 +0200

    Norman layout for the minidox keyboard (#5747)

    * Norman layout with Lower and Raise layers working

    * Add keymap_extra def for Norman layout
    * Re-org'ed the modifiers as explained in the Readme
    * Corrected colour legend for KLE that the Readme links to

    * Use #pragma once in header file

    * Use pragma once and move user config to config.h

    * Move definitions to the right file and correct link in Readme

    * Move def of NM_COLN to the logical place in header file

    * Add sendstring_norman.h for when the laptop layout is not QWERTY

    * Update quantum/keymap_extras/sendstring_norman.h

    Co-Authored-By: lehoff <torben.lehoff@gmail.com>

commit 7dcf9237d5cdf83e6f357755c19c14e92e6593c0
Author: William Chang <willchang@gmail.com>
Date:   Thu May 9 21:41:26 2019 -0700

    [Keymap] Updated keymap and readme (#5834)

    * Initial commit

    * Modified keymap and updated readme.

    * fixed numbering in readme

    * Update README.md

    * Update README.md

    * Update README.md

    * Update README.md

    * Update README.md

    * Update README.md

    * Made requested changes in PR.

    * Rename README.md to readme.md

    * swapped media control keys

    * updated right alt key to apply shift key for emacs

    * updated R_Alt to remove shift

    * Updated readme

commit bce391a663d2848bff8ffffca0e4bad771bd3890
Author: moyi4681 <moyi4681@users.noreply.github.com>
Date:   Fri May 10 09:48:07 2019 +0800

    [Keyboard] DZTECH: CODE CLEANUP (#5828)

    * Delete board.c

    * Delete board.h

    * Delete board.mk

    * Delete bootloader_defs.h

    * Delete chconf.h

    * Delete halconf.h

    * Delete mcuconf.h

    * Update rules.mk

    * Update config.h

    * Update config.h

    * Update config.h

    * Update config.h

    * Update config.h

    * Update rules.mk

    * Delete bootloader_defs.h

    * Delete halconf.h

    * Delete chconf.h

    * Delete mcuconf.h

    * Update rules.mk

    * Update config.h

    * Update dz40rgb.c

    * Update dz65rgb.c

commit 2835a7074985f25dea9398a7ac211914c9d52fe4
Author: Konstantin Đorđević <vomindoraan@gmail.com>
Date:   Thu May 9 20:05:33 2019 +0200

    [Keymap] Fix RGB_MATRIX_ENABLE check in users/konstantin/rules.mk (#5832)

commit 94c4b6bd740bf1dbc2ff45a4a5f6385d06440ef0
Author: Hannes Egler <hannes.egler@gmail.com>
Date:   Thu May 9 18:57:56 2019 +0200

    fixed matrix (#5831)

commit f5b9690ec79f2bd5c6c74c76c87e870a901c2e8f
Author: Danu Widatama <widatama@users.noreply.github.com>
Date:   Thu May 9 20:35:47 2019 +0700

    Add no_caps_lock layout for Satan GH60 (#5829)

commit 16f367348a78f10b58fad0c6841c7529f4f73818
Author: Tobias V. Langhoff <tobias@langhoff.no>
Date:   Thu May 9 06:45:00 2019 +0200

    [Docs] Fix Space Cadet link (#5825)

    Fix broken Space Cadet link in Features list

commit aa65cd7a905370ab36f37a3562d3f53387fcae92
Author: Jan Christoph Ebersbach <jceb@e-jc.de>
Date:   Wed May 8 20:04:32 2019 +0200

    [Keymap] Signum3.0 Generate printable keymap (#5818)

    * Externalize generation of visual text keymap

    * Generate keymap in Asciidoc format for further processing

    * Remove artifacts from a2x call

commit 86532fa8d34e9395fe1b41fd22eaaf9a2ecd0e8e
Author: Jan Christoph Ebersbach <jceb@e-jc.de>
Date:   Wed May 8 20:03:53 2019 +0200

    [Keymap] Signum 3.0, fix, move and change keys (#5820)

commit 0f0062b4929b4598aa45d5aeb20d4678b4e06d37
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Tue May 7 22:15:01 2019 -0700

    [Keyboard] Noxary 220 (#5816)

    * initial commit and script error fixes

    * add matrix and pin definitions along with LAYOUT macro

    * add an appropriate keymap

    * add num lock led support

    * turn on bootmagic lite along with backlight led support

    * add QMK Configurator support

commit 9d5b4ec97549f3b20465b1e96fb781176a1814ea
Author: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date:   Tue May 7 21:40:45 2019 -0700

    [Keyboard] Add Noxary 260 (#5815)

    * initial commit

    * fix script issues

    * define pins used and electrical matrix size and an appropriate LAYOUT macro

    * add an appropriate keymap

    * turn on bootmagic lite and backlight support

    * Add QMK Configurator support

    * add caps lock led support

    * updat…
  • Loading branch information
Jeff Xiao committed Jun 3, 2019
1 parent f28b66c commit 84d9273
Show file tree
Hide file tree
Showing 4,049 changed files with 161,934 additions and 49,946 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
26 changes: 26 additions & 0 deletions .clang-format
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
BasedOnStyle: Google
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: 'true'
AlignConsecutiveDeclarations: 'true'
AlignOperands: 'true'
AllowAllParametersOfDeclarationOnNextLine: 'false'
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: 'false'
BinPackArguments: 'true'
BinPackParameters: 'true'
ColumnLimit: '1000'
IndentCaseLabels: 'true'
IndentPPDirectives: AfterHash
IndentWidth: '2'
MaxEmptyLinesToKeep: '1'
PointerAlignment: Right
SortIncludes: 'false'
SpaceBeforeAssignmentOperators: 'true'
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: 'false'
TabWidth: '4'
UseTab: Never

...
2 changes: 1 addition & 1 deletion .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ root = true

[*]
indent_style = space
indent_size = 2
indent_size = 4

# We recommend you to keep these unchanged
charset = utf-8
Expand Down
31 changes: 16 additions & 15 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,31 @@
name: Bug report
about: Create a report to help us improve the QMK Firmware
---
<!-- Provide a general summary of the bug in the Title above -->
<!-- Provide a general summary of the bug in the title above. -->

<!-- This template is entirely option and can be removed, but is here to help both you and us. -->
<!-- This text and anything on lines wrapped like this one will not show up in the final text. This text is to help us and you. -->
<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->

**Describe the bug**
## Describe the Bug

<!-- A clear and concise description of what the bug is. -->

**System Information**
## System Information

- Keyboard:
- Revision (if applicable):
- Operating System:
- avr-gcc version:
<!-- Run `avr-gcc --version` to find out -->
- arm gcc version:
<!-- Run `arm-none-eabi-gcc --version` to find out -->
- Operating system:
- AVR GCC version:
<!-- Run `avr-gcc --version` to find this out. -->
- ARM GCC version:
<!-- Run `arm-none-eabi-gcc --version` to find this out. -->
- QMK Firmware version:
<!-- You can run `git describe --abbrev=0 --tags` to find this out -->
<!-- Run `git describe --abbrev=0 --tags` to find this out. -->
- Any keyboard related software installed?
- [ ] Auto Hot Key
- [ ] AutoHotKey
- [ ] Karabiner
- [ ] Other
- [ ] Other:

**Additional context**
## Additional Context

<!-- Add any other context about the problem here. -->
<!-- Add any other relevant information about the problem here. -->
16 changes: 8 additions & 8 deletions .github/ISSUE_TEMPLATE/feature_request.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
name: Feature request
about: Suggest a new feature or changes to existing features
---
<!--- Provide a general summary of the changes you want in the Title above -->
<!--- Provide a general summary of the changes you want in the title above. -->

<!-- This template is entirely option and can be removed, but is here to help both you and us. -->
<!-- This text and anything on lines wrapped like this one will not show up in the final text. This text is to help us and you. -->
<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->

## Feature Request Type

- [ ] Core Functionality
- [ ] Add-on hardware support (e.g. audio, RGB, OLED screen, etc.)
- [ ] Alteration (enhancement/optimization) of existing Feature(s)
- [ ] Core functionality
- [ ] Add-on hardware support (eg. audio, RGB, OLED screen, etc.)
- [ ] Alteration (enhancement/optimization) of existing feature(s)
- [ ] New behavior

## Description
## Description

<!-- A few sentences describing what it is that you'd like to see. Additional information (such as links to spec sheets, licensing info, other related issues or PR's, etc) would be helpful. -->
<!-- A few sentences describing what it is that you'd like to see in QMK. Additional information (such as links to spec sheets, licensing info, other related issues or PRs, etc) would be helpful. -->
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/other_issues.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
name: Other issues
about: Anything else that doesn't fall into the above categories.
---
<!--- Provide a general summary of the changes you want in the Title above -->
<!--- Provide a general summary of the changes you want in the title above. -->

<!-- This text and anything on lines wrapped like this one will not show up in the final text. This text is to help us and you. -->
<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->

<!-- Please check https://docs.qmk.fm/#/support for additional resources first. If that doesn't answer your question, check the bug report option, as that may be more appropriate. -->
<!-- Please check https://docs.qmk.fm/#/support for additional resources first. If that doesn't answer your question, choose the bug report template instead, as that may be more appropriate. -->
28 changes: 15 additions & 13 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
<!--- Provide a general summary of your changes in the Title above -->
<!--- Provide a general summary of your changes in the title above. -->

<!--- This template is entirely option and can be removed, but is here to help both you and us. -->
<!--- This text and anything on lines wrapped like this one will not show up in the final text. This text is to help us and you. -->
<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->

## Description
<!--- Describe your changes in detail -->

## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
<!--- Describe your changes in detail here. -->

## Types of Changes

<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply. -->
- [ ] Core
- [ ] Bugfix
- [ ] New Feature
- [ ] Enhancement/Optimization
- [ ] New feature
- [ ] Enhancement/optimization
- [ ] Keyboard (addition or update)
- [ ] Keymap/Layout/Userspace (addition or update)
- [ ] Keymap/layout/userspace (addition or update)
- [ ] Documentation


## Issues Fixed or Closed by this PR
## Issues Fixed or Closed by This PR

*

## Checklist:
## Checklist

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have read the **CONTRIBUTING** document. (https://docs.qmk.fm/#/contributing)
- [ ] I have read the [**CONTRIBUTING** document](https://docs.qmk.fm/#/contributing).
- [ ] I have added tests to cover my changes.
- [ ] I have tested the changes and verified that they work and don't break anything (as well as I can manage).
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.history/
.dep
*.o
*.bin
Expand Down Expand Up @@ -53,6 +54,7 @@ util/Win_Check_Output.txt
.vscode/tasks.json
.vscode/last.sql
.vscode/temp.sql
.vscode/ipch/
.stfolder
.tags

Expand Down
7 changes: 6 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,22 @@ branches:
env:
global:
- secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM=
- MAKEFLAGS="-j3 --output-sync"
before_install:
- wget http://ww1.microchip.com/downloads/en/DeviceDoc/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz || wget http://qmk.fm/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
# Need DFU > .5 for dfu-suffix
- sudo add-apt-repository --yes ppa:tormodvolden/ppa
- sudo apt-get update -qq
install:
- tar -zxf avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
- export PATH="$PATH:$TRAVIS_BUILD_DIR/avr8-gnu-toolchain-linux_x86_64/bin"
- npm install -g moxygen
- sudo apt-get -y --force-yes install dfu-util
before_script:
- avr-gcc --version
script:
- git rev-parse --short HEAD
- make test:all AUTOGEN=false
- bash util/travis_test.sh
- bash util/travis_build.sh
- bash util/travis_docs.sh
addons:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian
FROM debian:9

RUN apt-get update && apt-get install --no-install-recommends -y \
avr-libc \
Expand Down
8 changes: 5 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,11 +534,13 @@ endef
%:
# Check if we have the CMP tool installed
cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi;
# Ensure that python3 is installed. This check can be removed after python is used in more places.
if ! python3 --version 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; fi
# Check if the submodules are dirty, and display a warning if they are
ifndef SKIP_GIT
if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --init lib/chibios; fi
if [ ! -e lib/chibios-contrib ]; then git submodule sync lib/chibios-contrib && git submodule update --init lib/chibios-contrib; fi
if [ ! -e lib/ugfx ]; then git submodule sync lib/ugfx && git submodule update --init lib/ugfx; fi
if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --depth 1 --init lib/chibios; fi
if [ ! -e lib/chibios-contrib ]; then git submodule sync lib/chibios-contrib && git submodule update --depth 1 --init lib/chibios-contrib; fi
if [ ! -e lib/ugfx ]; then git submodule sync lib/ugfx && git submodule update --depth 1 --init lib/ugfx; fi
git submodule status --recursive 2>/dev/null | \
while IFS= read -r x; do \
case "$$x" in \
Expand Down
8 changes: 5 additions & 3 deletions Vagrantfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ Vagrant.configure(2) do |config|
config.vm.define "qmk_firmware"

# VMware/Virtualbox ( and also Hyperv/Parallels) 64 bit
config.vm.box = "bento/ubuntu-16.04"
config.vm.box = "generic/debian9"

config.vm.synced_folder '.', '/vagrant'

# This section allows you to customize the Virtualbox VM
# settings, ie showing the GUI or upping the memory
Expand Down Expand Up @@ -55,7 +57,7 @@ Vagrant.configure(2) do |config|
# image, you'll need to: chmod -R a+rw .
config.vm.provider "docker" do |docker, override|
override.vm.box = nil
docker.image = "jesselang/debian-vagrant:jessie"
docker.image = "jesselang/debian-vagrant:stretch"
docker.has_ssh = true
end

Expand All @@ -64,7 +66,7 @@ Vagrant.configure(2) do |config|
# If this causes issues you can run a 'vagrant destroy' and then
# add a # before ,run: (or change "always" to "once") and run 'vagrant up' to get a working
# non-updated box and then attempt to troubleshoot or open a Github issue
config.vm.provision "shell", inline: "/bin/sh -c 'yes | /vagrant/util/qmk_install.sh'", run: "always"
config.vm.provision "shell", inline: "/vagrant/util/qmk_install.sh", run: "always"

config.vm.post_up_message = <<-EOT
Expand Down
27 changes: 25 additions & 2 deletions build_keyboard.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
OPT_DEFS += -DCONVERT_TO_PROTON_C
endif

ifneq ($(FORCE_LAYOUT),)
TARGET := $(TARGET)_$(FORCE_LAYOUT)
endif

include quantum/mcu_selection.mk

ifdef MCU_FAMILY
Expand Down Expand Up @@ -276,6 +280,23 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_1)/config.h)","")
CONFIG_H += $(KEYBOARD_PATH_1)/config.h
endif

POST_CONFIG_H :=
ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_config.h)","")
POST_CONFIG_H += $(KEYBOARD_PATH_1)/post_config.h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_2)/post_config.h)","")
POST_CONFIG_H += $(KEYBOARD_PATH_2)/post_config.h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_3)/post_config.h)","")
POST_CONFIG_H += $(KEYBOARD_PATH_3)/post_config.h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_4)/post_config.h)","")
POST_CONFIG_H += $(KEYBOARD_PATH_4)/post_config.h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_config.h)","")
POST_CONFIG_H += $(KEYBOARD_PATH_5)/post_config.h
endif

# Save the defines and includes here, so we don't include any keymap specific ones
PROJECT_DEFS := $(OPT_DEFS)
PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
Expand Down Expand Up @@ -303,7 +324,6 @@ ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")
endif

# # project specific files
SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
SRC += $(KEYBOARD_SRC) \
$(KEYMAP_C) \
$(QUANTUM_SRC)
Expand All @@ -313,15 +333,16 @@ SRC += $(KEYBOARD_SRC) \

# Search Path
VPATH += $(KEYMAP_PATH)
VPATH += $(USER_PATH)
VPATH += $(KEYBOARD_PATHS)
VPATH += $(COMMON_VPATH)
VPATH += $(USER_PATH)

include common_features.mk
include $(TMK_PATH)/protocol.mk
include $(TMK_PATH)/common.mk
include bootloader.mk

SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC))
SRC += $(TMK_COMMON_SRC)
OPT_DEFS += $(TMK_COMMON_DEFS)
Expand Down Expand Up @@ -351,6 +372,7 @@ ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
include $(VISUALIZER_PATH)/visualizer.mk
endif

CONFIG_H += $(POST_CONFIG_H)
ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)

OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
Expand All @@ -371,4 +393,5 @@ all: build check-size
build: elf cpfirmware
check-size: build

include show_options.mk
include $(TMK_PATH)/rules.mk
9 changes: 9 additions & 0 deletions build_layout.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,13 @@ define SEARCH_LAYOUTS
$$(foreach LAYOUTS_REPO,$$(LAYOUTS_REPOS),$$(eval $$(call SEARCH_LAYOUTS_REPO)))
endef

ifneq ($(FORCE_LAYOUT),)
ifneq (,$(findstring $(FORCE_LAYOUT),$(LAYOUTS)))
$(info Forcing layout: $(FORCE_LAYOUT))
LAYOUTS := $(FORCE_LAYOUT)
else
$(error Forced layout does not exist)
endif
endif

$(foreach LAYOUT,$(LAYOUTS),$(eval $(call SEARCH_LAYOUTS)))
Loading

0 comments on commit 84d9273

Please sign in to comment.