Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

59 files changed, 5285 insertions, 2928 deletions

diff --git a/keyboard/arrow_pad/arrow_pad.h b/keyboard/arrow_pad/arrow_pad.h
index 2026b52d1d..b3fb578e8f 100644
--- a/keyboard/arrow_pad/arrow_pad.h
+++ b/keyboard/arrow_pad/arrow_pad.h
@@ -2,7 +2,7 @@
 #define ARROW_PAD_H
 
 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #ifdef BACKLIGHT_ENABLE
 	#include "backlight.h"
 #endif
diff --git a/keyboard/atreus/atreus.h b/keyboard/atreus/atreus.h
index 8d5989e442..10712d26d8 100644
--- a/keyboard/atreus/atreus.h
+++ b/keyboard/atreus/atreus.h
@@ -2,7 +2,7 @@
 #define ATREUS_H
 
 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "backlight.h"
 #include <stddef.h>
 
diff --git a/keyboard/bantam44/bantam44.h b/keyboard/bantam44/bantam44.h
index fa5b9df9e4..8e776d63b0 100644
--- a/keyboard/bantam44/bantam44.h
+++ b/keyboard/bantam44/bantam44.h
@@ -2,7 +2,7 @@
 #define BANTAM44_H
 
 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "backlight.h"
 #include <stddef.h>
 
diff --git a/keyboard/clueboard1/clueboard1.h b/keyboard/clueboard1/clueboard1.h
index 839a81a150..5b53e92588 100644
--- a/keyboard/clueboard1/clueboard1.h
+++ b/keyboard/clueboard1/clueboard1.h
@@ -2,7 +2,7 @@
 #define CLUEBOARD1_H
 
 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include <stddef.h>
 
 
diff --git a/keyboard/clueboard2/clueboard2.h b/keyboard/clueboard2/clueboard2.h
index 9f0d42d2b3..97042f73f7 100644
--- a/keyboard/clueboard2/clueboard2.h
+++ b/keyboard/clueboard2/clueboard2.h
@@ -2,7 +2,7 @@
 #define CLUEBOARD2_H
 
 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include <stddef.h>
 
 
diff --git a/keyboard/cluepad/cluepad.h b/keyboard/cluepad/cluepad.h
index 36bf591e4b..8635ee583a 100644
--- a/keyboard/cluepad/cluepad.h
+++ b/keyboard/cluepad/cluepad.h
@@ -2,7 +2,7 @@
 #define CLUEPAD_H
 
 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include <stddef.h>
 
 
diff --git a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c b/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
index d8911af412..131796fc5d 100644
--- a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
@@ -1,6 +1,6 @@
 #include "ergodox_ez.h"
 #include "action_layer.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "keymap_extras/keymap_german.h"
 
 #define UC_ASYMPTOTICALLY_EQUAL_TO 0
diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c b/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c
index b63698ec6a..07e58a491b 100644
--- a/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c
@@ -3,7 +3,7 @@
 #include "action_layer.h"
 #include "action_util.h"
 #include "led.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "timer.h"
 
 /*
diff --git a/keyboard/ergodox_ez/matrix.c b/keyboard/ergodox_ez/matrix.c
index 7266cca985..2a7dfba21d 100644
--- a/keyboard/ergodox_ez/matrix.c
+++ b/keyboard/ergodox_ez/matrix.c
@@ -106,6 +106,25 @@ void matrix_init(void)
 
 }
 
+void matrix_power_up(void) {
+    mcp23018_status = init_mcp23018();
+
+    unselect_rows();
+    init_cols();
+
+    // initialize matrix state: all keys off
+    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+        matrix[i] = 0;
+        matrix_debouncing[i] = 0;
+    }
+
+#ifdef DEBUG_MATRIX_SCAN_RATE
+    matrix_timer = timer_read32();
+    matrix_scan_count = 0;
+#endif
+
+}
+
 uint8_t matrix_scan(void)
 {
     if (mcp23018_status) { // if there was an error
diff --git a/keyboard/gh60/gh60.h b/keyboard/gh60/gh60.h
index 95e5e1ebc7..a0ad51357b 100644
--- a/keyboard/gh60/gh60.h
+++ b/keyboard/gh60/gh60.h
@@ -2,7 +2,7 @@
 #define GH60_H

 

 #include "matrix.h"

-#include "keymap_common.h"

+#include "keymap.h"

 #include "backlight.h"

 #include <stddef.h>

 

diff --git a/keyboard/hhkb/hhkb.h b/keyboard/hhkb/hhkb.h
index 5e93b1dd1b..093d7aeabc 100644
--- a/keyboard/hhkb/hhkb.h
+++ b/keyboard/hhkb/hhkb.h
@@ -2,7 +2,7 @@
 #define HHKB_H
 
 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 //#include "backlight.h"
 #include <stddef.h>
 
diff --git a/keyboard/jd45/jd45.h b/keyboard/jd45/jd45.h
index d0ca1a88d0..54b6641b21 100644
--- a/keyboard/jd45/jd45.h
+++ b/keyboard/jd45/jd45.h
@@ -2,7 +2,7 @@
 #define JD45_H
 
 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "backlight.h"
 #include <stddef.h>
 
diff --git a/keyboard/kc60/Makefile b/keyboard/kc60/Makefile
index 84b72cde60..1a02d4f1cd 100644
--- a/keyboard/kc60/Makefile
+++ b/keyboard/kc60/Makefile
@@ -27,7 +27,7 @@
 # make flip-ee = Download the eeprom file to the device, using Atmel FLIP
 #                (must have Atmel FLIP installed).
 #
-# make debug = Start either simulavr or avarice as specified for debugging, 
+# make debug = Start either simulavr or avarice as specified for debugging,
 #              with avr-gdb or avr-insight as the front end for debugging.
 #
 # make filename.s = Just compile filename.c into the assembler code only.
@@ -111,4 +111,3 @@ AUDIO_ENABLE ?= no           # Audio output on port C6
 ifndef QUANTUM_DIR
 	include ../../Makefile
 endif
-
diff --git a/keyboard/kc60/README.md b/keyboard/kc60/README.md
index fbc5ac9422..00d78d0a6b 100644
--- a/keyboard/kc60/README.md
+++ b/keyboard/kc60/README.md
@@ -2,12 +2,10 @@ KC60 (version 2.0) keyboard firmware
 ======================
 
 ## Quantum MK Firmware
-
 For the full Quantum feature list, see [the parent README.md](/README.md).
 
 ## Building
-
-Download or clone the whole firmware and navigate to the keyboard/kc60 folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. 
+Download or clone the whole firmware and navigate to the keyboard/kc60 folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file.
 
 Depending on which keymap you would like to use, you will have to compile slightly differently.
 
@@ -22,3 +20,8 @@ To build the firmware binary hex file with a keymap just do `make` with `KEYMAP`
 $ make KEYMAP=[default|jack|<name>]
 ```
 Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
+
+## WS2812 Support
+![Image of KC60 with RGB Underglow](keymaps/ws2812/ws2812_example.jpg)
+
+Build with WS2812 Support by running `make KEYMAP=ws2812`.
diff --git a/keyboard/kc60/config.h b/keyboard/kc60/config.h
index 91d4e09c2e..956a569f93 100644
--- a/keyboard/kc60/config.h
+++ b/keyboard/kc60/config.h
@@ -45,7 +45,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Possible pins for columns include: F1  F0  E6  D7  D6  D4  C7  C6  B7  B5  B4  B3  B1  B0
 // Pins for rows include:  D0  D1  F6  F7  D5
-// KC60 Version 2 
+// KC60 Version 2
 #define MATRIX_ROW_PINS { D0, D1, F6, F7, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
 #define UNUSED_PINS
diff --git a/keyboard/kc60/kc60.c b/keyboard/kc60/kc60.c
index 0a578b2b88..64c0675cd7 100644
--- a/keyboard/kc60/kc60.c
+++ b/keyboard/kc60/kc60.c
@@ -62,7 +62,7 @@ void backlight_init_ports()
   DDRB |= (1<<6);
   PORTB &= ~(1<<6);
 
-  // Use full 16-bit resolution. 
+  // Use full 16-bit resolution.
   ICR1 = 0xFFFF;
 
   // I could write a wall of text here to explain... but TL;DW
@@ -99,7 +99,7 @@ void backlight_set(uint8_t level)
     // Set the brightness
     CHANNEL = 0xFFFF;
   }
-  else        
+  else
   {
     // Turn on PWM control of PB6
     TCCR1A |= _BV(COM1B1);
diff --git a/keyboard/kc60/kc60.h b/keyboard/kc60/kc60.h
index d346a55028..a54edfef47 100644
--- a/keyboard/kc60/kc60.h
+++ b/keyboard/kc60/kc60.h
@@ -2,7 +2,7 @@
 #define KC60_H
 
 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #ifdef BACKLIGHT_ENABLE
 #include "backlight.h"
 #endif
diff --git a/keyboard/kc60/keymaps/default/compiled.hex b/keyboard/kc60/keymaps/default/compiled.hex
index c8233506df..f7417a27fd 100644
--- a/keyboard/kc60/keymaps/default/compiled.hex
+++ b/keyboard/kc60/keymaps/default/compiled.hex
@@ -1,1451 +1,1764 @@
-:100000000C9472060C94B6060C94B6060C94B606C4

-:100010000C94B6060C94B6060C94B6060C94B60670

-:100020000C94B6060C94B6060C94AB110C947D128D

-:100030000C9454200C94B6060C94B6060C94B60698

-:100040000C94B6060C94B6060C94B6060C94B60640

-:100050000C94B6060C94BB200C94B6060C94B60611

-:100060000C94B6060C94B6060C94B6060C94B60620

-:100070000C94B6060C94B6060C94B6060C94B60610

-:100080000C94B6060C94B6060C94B6060C94B60600

-:100090000C94B6060C94B6060C94B6060C94B606F0

-:1000A0000C94B6060C94B6060C94B606E212041331

-:1000B000EF130413EF1346136913EF13BE13D11399

-:1000C0001A171A17491749178917AB17FA18FA1888

-:1000D000B617FA185D185D18C718CF18FA18F51872

-:1000E0006A186A186A186A186A186A186A186A1800

-:1000F0006A186A186A186A186A186A186A186A18F0

-:100100007A188A1891189818A21829001E001F0042

-:1001100020002100220023002400250026002700C3

-:100120002D002E002A002B0014001A0008001500D4

-:1001300017001C0018000C00120013002F003000E4

-:100140003100390004001600070009000A000B0006

-:100150000D000E000F003300340000002800E10005

-:1001600000001D001B000600190005001100100012

-:100170003600370038000000E500E000E200E30050

-:10018000000000002C000000000000000000E7005C

-:10019000E600E40000500A44454255473A20656EA7

-:1001A00061626C65642E0A005374617465206F6629

-:1001B00020726F772025583A2025303136620A00A8

-:1001C00048756D616E2D7265616461626C65206D4C

-:1001D00061747269782073746174653A0D0A004421

-:1001E00065626F756E63696E672064656C61792006

-:1001F00072656D61696E696E673A2025580A005B09

-:10020000735D004B6579626F617264207374617213

-:10021000742E0A005B575D005B535D005B525D000E

-:100220005B445D005B435D000E036B0063003600C2

-:100230003000760032000000080359006F0075009E

-:1002400000000403090409027400040100A0FA0973

-:1002500004000001030101000921110100012240F5

-:10026000000705810308000A0904010001030102D7

-:1002700000092111010001224D0007058203080039

-:100280000A09040200010300000009211101000114

-:100290002236000705830308000A0904030002034D

-:1002A000000000092111010001222000070584033C

-:1002B00020000107050403200001120110010000C5

-:1002C0000008EDFE60600100010200010631FF0937

-:1002D00074A1010975150025FF9520750881020993

-:1002E00076150025FF952075089102C0050109804B

-:1002F000A101850216010026B7001A01002AB700E5

-:10030000751095018100C0050C0901A10185031636

-:100310000100269C021A01002A9C02751095018199

-:1003200000C005010902A1010901A1000509190187

-:1003300029051500250195057501810295017503B3

-:1003400081010501093009311581257F9502750864

-:10035000810609381581257F950175088106050CF0

-:100360000A38021581257F950175088106C0C005F0

-:10037000010906A101050719E029E71500250195E6

-:100380000875018102950175088101050819012987

-:1003900005950575019102950175039101050719F0

-:1003A0000029FF150026FF00950675088100C00A88

-:1003B000002530325820006B6579626F6172645F8E

-:1003C0007265706F72743A20004B6579626F61726A

-:1003D00064204C4544732073746174653A20257819

-:1003E0000A00646F6E652E0A00626F6F676D616749

-:1003F0006963207363616E3A202E2E2E2000290A35

-:10040000002575002F002575005D2800256400205B

-:1004100000256400200025640020002564007C0085

-:1004200025303258006D6F7573656B6579205B629E

-:10043000746E7C782079207620685D287265702F34

-:1004400061636C293A205B006D6B5F776865656C52

-:100450005F74696D655F746F5F6D6178203D202505

-:10046000640A006D6B5F776865656C5F6D61785FCE

-:100470007370656564203D2025640A006D6B5F74B0

-:10048000696D655F746F5F6D6178203D2025640A3A

-:10049000006D6B5F6D61785F7370656564203D20F2

-:1004A00025640A006D6B5F696E74657276616C20FD

-:1004B0003D2025640A006D6B5F64656C6179203DA9

-:1004C0002025640A006D6B5F776865656C5F7469F1

-:1004D0006D655F746F5F6D6178203D2025640A0053

-:1004E0006D6B5F776865656C5F6D61785F73706574

-:1004F0006564203D2025640A006D6B5F74696D653D

-:100500005F746F5F6D6178203D2025640A006D6B1C

-:100510005F6D61785F7370656564203D2025640AB6

-:10052000006D6B5F696E74657276616C203D20258D

-:10053000640A006D6B5F64656C6179203D20256401

-:100540000A000A00257500363A20776865656C5FF9

-:1005500074696D655F746F5F6D61783A20000A00A1

-:10056000257500353A20776865656C5F6D61785F49

-:1005700073706565643A20000A00257500343A20DE

-:1005800074696D655F746F5F6D61783A20000A0071

-:10059000257500333A206D61785F73706565643A44

-:1005A00020000A00257500323A20696E7465727663

-:1005B000616C286D73293A20000A00257500313AD4

-:1005C0002064656C6179282A31306D73293A2000E6

-:1005D0000A092D2056616C756573202D0A004D3E69

-:1005E000004D25643E20003F0073657420646566FD

-:1005F00061756C740A00433E20007768657265205F

-:1006000064656C74613A20637572736F723D256422

-:100610002C20776865656C3D25640A536565206804

-:100620007474703A2F2F656E2E77696B69706564EC

-:1006300069612E6F72672F77696B692F4D6F7573C4

-:10064000655F6B6579730A000A092D204D6F75731C

-:10065000656B6579202D0A4553432F713A097175F1

-:1006600069740A313A0964656C6179282A31306D00

-:1006700073290A323A09696E74657276616C286D65

-:1006800073290A333A096D61785F73706565640A8E

-:10069000343A0974696D655F746F5F6D61780A350E

-:1006A0003A09776865656C5F6D61785F7370656541

-:1006B000640A363A09776865656C5F74696D655FD1

-:1006C000746F5F6D61780A0A703A097072696E74AE

-:1006D0002076616C7565730A643A097365742064E9

-:1006E000656661756C74730A75703A092B310A641A

-:1006F0006F776E3A092D310A706775703A092B31A0

-:10070000300A7067646F776E3A092D31300A0A73C8

-:1007100070656564203D2064656C7461202A206DDD

-:1007200061785F7370656564202A20287265706542

-:100730006174202F2074696D655F746F5F6D6178DF

-:10074000290A003F004D3E2000433E20004C256416

-:100750000A0074696D65725F636F756E743A202567

-:1007600030346C580A006B6579626F6172645F693E

-:10077000646C653A2025580A006B6579626F617276

-:10078000645F70726F746F636F6C3A2025580A0053

-:10079000686F73745F6B6579626F6172645F6C65BB

-:1007A000647328293A2025580A000A092D20537419

-:1007B00061747573202D0A004743433A20342E3864

-:1007C0002E31204156522D4C4942433A20312E3889

-:1007D0002E3073766E204156525F415243483A2084

-:1007E000617672350A004F5054494F4E533A204CAF

-:1007F00055464120424F4F544D41474943204D4FAC

-:100800005553454B45592045585452414B45592065

-:10081000434F4E534F4C4520434F4D4D414E442086

-:10082000343039360A004255494C443A203865384C

-:1008300039313730202831333A32333A3434204A90

-:10084000756E2031342032303136290A0056494441

-:100850003A2030784645454428596F75292050493B

-:10086000443A20307836303630286B633630763272

-:1008700029205645523A203078303030310A004431

-:100880004553433A204120637573746F6D206B6547

-:1008900079626F6172640A000A092D2056657273CD

-:1008A000696F6E202D0A000A092D20436F6E736F49

-:1008B0006C65202D0A4553432F713A09717569748F

-:1008C0000A6D3A096D6F7573656B65790A000A09DF

-:1008D0002D204D61676963202D0A443A0944656201

-:1008E0007567204D65737361676520546F67676C2A

-:1008F000650A583A094D61747269782044656275D9

-:1009000067204D6F646520546F67676C65202D20EC

-:1009100053686F77206B65797072657373657320A8

-:10092000696E206D617472697820677269640A4B20

-:100930003A094B6579626F6172642044656275673C

-:1009400020546F67676C65202D2053686F77206B8C

-:1009500065797072657373207265706F72740A4D79

-:100960003A094465627567204D6F75736520546F51

-:1009700067676C650A563A0956657273696F6E0A45

-:10098000533A095374617475730A433A09416374A5

-:10099000697661746520436F6E736F6C65204D6F6F

-:1009A00064650A46312D4631303A095377697463DC

-:1009B0006820746F204C6179657220302D392028B1

-:1009C000463130203D204C30290A302D393A095328

-:1009D000776974636820746F204C61796572203088

-:1009E0002D390A4553433A09537769746368207473

-:1009F0006F204C6179657220302028616C746572BB

-:100A00006E617465206B65792031290A4752415621

-:100A1000453A0953776974636820746F204C617993

-:100A2000657220302028616C7465726E6174652077

-:100A30006B65792032290A50415553453A094A7568

-:100A40006D7020746F20426F6F746C6F616465729B

-:100A500020285265736574290A453A095072696EF7

-:100A60007420454550524F4D2053657474696E672C

-:100A7000730A000A002575002E6C6576656C3A20B5

-:100A8000000A002575002E656E61626C653A2000D3

-:100A90000A0025303258006261636B6C69676874C4

-:100AA0005F636F6E6669672E7261773A20000A0095

-:100AB0002575002E6E6B726F3A20000A00257500B6

-:100AC0002E737761705F6261636B736C6173685FD3

-:100AD0006261636B73706163653A20000A0025757B

-:100AE000002E737761705F67726176655F6573630F

-:100AF0003A20000A002575002E6E6F5F6775693A0F

-:100B000020000A002575002E737761705F72616C9A

-:100B1000745F726775693A20000A002575002E73AC

-:100B20007761705F6C616C745F6C6775693A200007

-:100B30000A002575002E636170736C6F636B5F74C0

-:100B40006F5F636F6E74726F6C3A20000A002575D8

-:100B5000002E737761705F636F6E74726F6C5F638A

-:100B60006170736C6F636B3A20000A002530325855

-:100B7000006B65796D61705F636F6E6669672E7279

-:100B800061773A20000A002575002E6D6F75736538

-:100B90003A20000A002575002E6B6579626F61723C

-:100BA000643A20000A002575002E6D617472697820

-:100BB0003A20000A002575002E656E61626C653A68

-:100BC00020000A00253032580064656275675F6353

-:100BD0006F6E6669672E7261773A20000A0025758C

-:100BE0000064656661756C745F6C617965723A204A

-:100BF000003F000A6D6F7573653A206F66660A00E4

-:100C00000A6D6F7573653A206F6E0A000A6B65791D

-:100C1000626F6172643A206F66660A000A6B6579DA

-:100C2000626F6172643A206F6E0A000A6D617472BD

-:100C300069783A206F66660A000A6D617472697895

-:100C40003A206F6E0A000A64656275673A206F6623

-:100C5000660A000A64656275673A206F6E0A000AC8

-:100C60000A4A756D70696E6720746F20626F6F74C9

-:100C70006C6F616465722E2E2E2000433E2000654D

-:100C800065636F6E6669673A0A006261636B6C69DF

-:100C900067687420737465703A2025750A00626174

-:100CA000636B6C6967687420746F67676C653A2062

-:100CB00025750A006261636B6C69676874206465FE

-:100CC0006372656173653A2025750A006261636B22

-:100CD0006C6967687420696E6372656173653A2038

-:100CE00025750A0011241FBECFEFDAE0DEBFCDBFAD

-:100CF00004B603FE24C08091F3019091F401A09109

-:100D0000F501B091F6018730904BA740B04BB9F494

-:100D10001092F3011092F4011092F5011092F60175

-:100D200014BE84B7877F84BF88E10FB6F8948093A0

-:100D30006000109260000FBEE0E0F8E3099511E05A

-:100D4000A0E0B1E0EEE4FAE502C005900D92A63411

-:100D5000B107D9F721E0A6E4B1E001C01D92A33F9D

-:100D6000B207E1F70E94EB0E0C94252D0C940000C5

-:100D7000FF93EF93E0914601F0914701309709F01E

-:100D80000995EF91FF910895FC018591803011F054

-:100D9000EFDFFBCF0895FF27E0E230E247FF0CC012

-:100DA000419597FF09C0EDE260957095809590950B

-:100DB000611D711D811D911D27FF02C0219530E32A

-:100DC00050E2AA27660F771F881F991FAA1FA41732

-:100DD00010F0A41B63955A95A9F7AA3008F0A95FF3

-:100DE000A05DAF93F395611571058105910541F7FC

-:100DF000ED3211F4EF93F395F21718F43F93F39556

-:100E0000FBCF8F91B5DFFA95E1F70895E991F9915C

-:100E10008591803021F0853219F0AADFF9CF08954D

-:100E200020E0E89455915532C1F3503311F4689