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

86 files changed, 42428 insertions, 412 deletions

diff --git a/keyboard/planck/keymaps/README.md b/keyboard/planck/keymaps/README.md
new file mode 100644
index 0000000000..9152353017
--- /dev/null
+++ b/keyboard/planck/keymaps/README.md
@@ -0,0 +1,22 @@
+# How to add your own keymap
+
+Folders can be named however you'd like (will be approved upon merging), or should follow the format with a preceding `_`:
+
+    _[ISO 3166-1 alpha-2 code*]_[layout variant]_[layout name/author]
+
+\* See full list: https://en.wikipedia.org/wiki/ISO_3166-1#Officially_assigned_code_elements
+
+and contain the following files:
+
+* `keymap.c`
+* `readme.md` *recommended*
+* `config_user.h` *optional*, found automatically when compiling
+* `makefile.mk` *optional*, found automatically when compling
+
+When adding your keymap to this list, keep it organised alphabetically (select list, edit->sort lines), and use this format:
+
+     * **folder_name** description
+
+# List of Planck keymaps
+
+* **default** default Planck layout
\ No newline at end of file
diff --git a/keyboard/planck/keymaps/alexey/Makefile b/keyboard/planck/keymaps/alexey/Makefile
new file mode 100644
index 0000000000..4fbe3b6619
--- /dev/null
+++ b/keyboard/planck/keymaps/alexey/Makefile
@@ -0,0 +1,63 @@
+#----------------------------------------------------------------------------
+# On command line:
+#
+# make all = Make software.
+#
+# make clean = Clean out built project files.
+#
+# make coff = Convert ELF to AVR COFF.
+#
+# make extcoff = Convert ELF to AVR Extended COFF.
+#
+# make program = Download the hex file to the device.
+#                Please customize your programmer settings(PROGRAM_CMD)
+#
+# make teensy = Download the hex file to the device, using teensy_loader_cli.
+#               (must have teensy_loader_cli installed).
+#
+# make dfu = Download the hex file to the device, using dfu-programmer (must
+#            have dfu-programmer installed).
+#
+# make flip = Download the hex file to the device, using Atmel FLIP (must
+#             have Atmel FLIP installed).
+#
+# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
+#               (must have dfu-programmer installed).
+#
+# 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,
+#              with avr-gdb or avr-insight as the front end for debugging.
+#
+# make filename.s = Just compile filename.c into the assembler code only.
+#
+# make filename.i = Create a preprocessed source file for use in submitting
+#                   bug reports to the GCC project.
+#
+# To rebuild project do "make clean" then "make all".
+#----------------------------------------------------------------------------
+
+# Build Options
+#   change to "no" to disable the options, or define them in the makefile.mk in 
+#   the appropriate keymap folder that will get included automatically
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = no         # Console for debug(+400)
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI controls
+AUDIO_ENABLE = yes           # Audio output on port C6
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
\ No newline at end of file
diff --git a/keyboard/planck/keymaps/alexey/compiled.hex b/keyboard/planck/keymaps/alexey/compiled.hex
new file mode 100644
index 0000000000..deddcea06a
--- /dev/null
+++ b/keyboard/planck/keymaps/alexey/compiled.hex
@@ -0,0 +1,1444 @@
+:100000000C9461020C94A5020C94A5020C94A50218

+:100010000C94A5020C94A5020C94A5020C94A502C4

+:100020000C94A5020C94A5020C9452140C94241563

+:100030000C9486220C94A5020C94A5020C94A502A3

+:100040000C94A5020C9407030C94A5020C94A50231

+:100050000C94A5020C94EE220C94A5020C94A5021B

+:100060000C94A5020C94A5020C94A5020C94A50274

+:100070000C94A5020C94A5020C94A5020C94A50264

+:100080000C94C70A0C94A5020C94A5020C94A5022A

+:100090000C94A5020C94A5020C94A5020C94A50244

+:1000A0000C94A5020C94A5020C94A5029115B3150D

+:1000B000A116B315A116F8151B16A11670168316F6

+:1000C0006D196D199C199C19DB19FB19511B511BDA

+:1000D000061A511BB61AB61A1D1B261B511B4B1BA9

+:1000E000C31AC31AC31AC31AC31AC31AC31AC31A28

+:1000F000C31AC31AC31AC31AC31AC31AC31AC31A18

+:10010000D31AE11AE81AEF1AF91A07634236B79BB5

+:10011000D8A71A39685618AEBAAB558C1D3CB7CC67

+:100120005763BD6DEDFD753EF6177231BF000000DF

+:10013000803F08000000BE922449123EABAAAA2AC2

+:10014000BECDCCCC4C3E00000080BEABAAAAAA3EDD

+:1001500000000000BF000000803F00000000000819

+:100160004178D3BB4387D1133D190E3CC3BD4282B6

+:10017000AD2B3E68EC8276BED98FE1A93E4C80EF74

+:10018000FFBE01C4FF7F3F00000000000000000030

+:1001900000000000000000010204060A0F17202CD6

+:1001A0003A4A5D71879DB3C7DAE9F5FCFFFCF5E9D2

+:1001B000DAC7B39D87715D4A3A2C20170F0A0604EF

+:1001C0000201000000000000000000002B001400ED

+:1001D0001A000800150017001C0018000C0012007F

+:1001E00013002A00290004001600070009000A0075

+:1001F0000B000D000E000F003300015201001D0026

+:100200001B00060019000500110010003600370021

+:10021000380001000030E300E200E000E1002C00C3

+:100220002C0002522D00340028000100010049007A

+:100230004A0052004D004B000100400041004200C6

+:100240004300010001004C00500051004F004E00DF

+:1002500001003D003E003F0044000100010001009C

+:10026000010001000100010001003A003B003C00D8

+:100270004500010001000100010001000100010032

+:100280000100AA00A900AB00AE00010001001E029F

+:100290001F022F02300231024B00240025002600ED

+:1002A000250201000100200221022602270235005A

+:1002B0004E002100220023002E0201000100220234

+:1002C00023022F003000350224021E001F002000F0

+:1002D000310001000100010049000100010001009E

+:1002E00001000100010027002E0001002803540036

+:1002F00068006500200050006C0061006E00630023

+:100300006B0020004B006500790062006F00610007

+:100310007200640000002C034F007200740068003B

+:100320006F006C0069006E006500610072002000C3

+:100330004B006500790062006F006100720064008C

+:10034000730000000403090409026D00040100A009

+:10035000FA09040000010301010009211101000153

+:10036000223F000705810308000A09040100010378

+:10037000010200092111010001224D00070582033D

+:1003800008000A090402000103000000092111010C

+:1003900000012236000705830308000A0904030050

+:1003A00001030000000921110100012239000705A5

+:1003B00084031000011201100100000008EDFE602E

+:1003C0006001000102000105010906A101050719EC

+:1003D000E029E71500250195087501810205081936

+:1003E0000129059505750191029501750391010596

+:1003F000071900297715002501957875018102C03C

+:1004000005010980A101850216010026B7001A0125

+:10041000002AB700751095018100C0050C0901A1E3

+:10042000018503160100269C021A01002A9C027510

+:100430001095018100C005010902A1010901A10077

+:100440000509190129051500250195057501810288

+:100450009501750381010501093009311581257F59

+:1004600095027508810609381581257F9501750863

+:100470008106050C0A38021581257F9501750881D2

+:1004800006C0C005010906A101050719E029E71505

+:100490000025019508750181029501750881010506

+:1004A00008190129059505750191029501750391BA

+:1004B000010507190029FF150025FF95067508811C

+:1004C00000C011241FBECFEFDAE0DEBFCDBF04B6FF

+:1004D00003FE24C080911E0390911F03A09120036E

+:1004E000B09121038730904BA740B04BB9F41092E4

+:1004F0001E0310921F03109220031092210314BEBA

+:1005000084B7877F84BF88E10FB6F894809360003A

+:10051000109260000FBEE0E0F8E3099511E0A0E062

+:10052000B1E0E6E6F9E502C005900D92A03CB10706

+:10053000D9F713E0A0ECB1E001C01D92AE31B107D4

+:10054000E1F70E9498110C94B12C0C9400000895CE

+:10055000089581E0089508950C94A8020C94A902CE

+:100560000C94AB020E947B2823E030E0281B310969

+:10057000220F2093C4010895282F2F988091800086

+:10058000211108C0877F8093800010928D00109207

+:100590008C001BC0886080938000233019F48FEF9B

+:1005A0009FEF0FC083E090E0821B9109880F991F95

+:1005B0002FEF3FEFA90102C0569547958A95E2F7C4

+:1005C000CA0190938D0080938C000C94B2020E941B

+:1005D000B20284E08093C3011092C0010895279A6B

+:1005E0002F988FEF9FEF90938700809386008AE08B

+:1005F0008093800089E1809381000E94E4270C941D

+:10060000E7020E94EF026E9A769A0C94A7021F925C

+:100610000F920FB60F9211242F933F938F939F93B6

+:10062000EF93FF93E091C101F091C201CF010196D8

+:100630009093C2018093C1010090C30102C0F6955E

+:10064000E7950A94E2F7EF738091C001823019F4C4

+:10065000E03251F404C0813039F4EF3329F4809151

+:100660006F008D7F80936F00F0E0E457FE4FE491C0

+:1006700021E031E0E29FC001E39F900D1124009042

+:10068000C40102C0969587950A94E2F790938D0075

+:1006900080938C00FF91EF919F918F913F912F91CB

+:1006A0000F900FBE0F901F90189561110DC0FC01A7

+:1006B0008281882331F085EE0E9411180E943B2828

+:1006C00003C085EE0E94D91880E090E0089581E093

+:1006D00008950C94670308950C940103809115020A

+:1006E000882309F448C08091D1019091D2010097EC

+:1006F00079F40E94B8229093D2018093D101809125

+:10070000D30190E0009771F48091D40190E00AC089

+:100710000E94C4222091000130910101281739075D

+:1007200040F329C00197880F991F880F991FFC017A

+:10073000EB52FE4F60817181828193810E942D0A6C

+:10074000E091D30184E0E89FF0011124EB52FE4FC9

+:1007500060817181828193814FE050E00E94E50DBC

+:100760008091D30190E001966091D40170E00E94E5

+:10077000612C8093D3010C94AC02109217020C945C

+:10078000FA090895089581E0809317020C94C2033A

+:10079000089508958F929F92AF92BF92EF92FF9229

+:1007A0000F931F93CF93DF93CDB7DEB7A3970FB609

+:1007B000F894DEBF0FBECDBF7C01FC01008111812A

+:1007C000C8010E94B520B8010E94CC058C01B70178

+:1007D0000E946903882309F4CCC10032F0E51F07A9

+:1007E00041F4F7018281882309F458C00E94490E20

+:1007F000C0C10132F0E51F0741F4F701828188236F

+:1008000009F44CC00E94520EB4C10232F0E51F0739

+:1008100051F4F7018281882309F440C00E94450EFB

+:100820008111F0CFE3CF0332F0E51F0739F4F70170

+:100830008281882399F10E94C3039BC10432F0E5B1

+:100840001F0739F4F7018281882341F10E94BD031B

+:1008500090C10532F0E51F0749F4F7018281882332

+:10086000E9F0809117028111F1CFE5CF0632F0E572

+:100870001F0739F4F7018281882381F00E94590E05

+:100880000AC00732F0E51F0749F4F7018281882387

+:1008900029F00E94640E0E94C9036BC18091170267

+:1008A000811105C0F70182818111CFC018C1003EBE

+:1008B000110579F4F7018281882309F44DC00E9463

+:1008C000FA0981E080931602109215021092D40169

+:1008D00050C1023E110559F4F70182818823E1F1EC

+:1008E0000E94FA09109216021092150242C1033EAC

+:1008F000110591F4F7018281882371F10E94FA09B0

+:100900001092160281E0809315021092D30110928A

+:10091000D2011092D1012DC10235110559F4F70110

+:100920008281882309F425C1809100019091010101

+:100930000A970DC00135110579F4F70182818823EA

+:1009400009F417C180910001909101010A969093DA

+:100950000101809300010DC14091040183E2EFE1A8

+:10096000F1E0DE01119601900D928A95E1F7F70111

+:10097000808121E030E02C0F3D1F280F311DC9017F

+:100980002091020130910301FC01E20FF31F60810D

+:10099000772767FD7095640F711D882777FD809517

+:1009A000982F0E94832920E030E040E451E40E9427

+:1009B000E8284B015C01F701218184E090E0821B73

+:1009C0009109BC01882777FD8095982F0E94832983

+:1009D0009B01AC01C501B4010E9480289B01AC01C0

+:1009E00060E070E080E090E40E94F62A20E030E0D1

+:1009F0004CED50E40E94932A4B015C01F701828187

+:100A00008823D1F04FE050E0C501B4010E94E50D0C

+:100A1000809116028823A1F08091D40124E0829F66

+:100A2000F0011124EB52FE4F80829182A282B382A8

+:100A30008F5F8093D40104C0C501B4010E942D0AC8

+:100A40000F3F110508F02ECF94C08091D001811185

+:100A50001FC0043130E5130709F051C00E946B0339

+:100A600081E08093D0010E94B8229093CF018093BF

+:100A7000CE011092C7011092C9011092C8011092C4

+:100A8000CB011092CA011092CD011092CC0171C01D

+:100A90008091CE019091CF010E94C422883C9105A3

+:100AA00070F48091C701E82FF0E0EE0FFF1FE853CC

+:100AB000FE4F118300838F5F8093C7015AC00438B3

+:100AC00080E5180721F00538104501F13AC0F7011B

+:100AD0008281882341F01092C50182E01EC0043853

+:100AE00030E5130759F58091C501811106C086E2F2

+:100AF0000E94111886E20E94D91882E01CC00438B6

+:100B0000F0E51F0741F305381045D9F4F70182815C

+:100B1000882331F01092C60180E20E94281929C072

+:100B20008091C601811106C087E20E94111887E2F8

+:100B30000E94D91880E20E942F191BC00538104569

+:100B400029F381E08093C5018093C601C701A39674

+:100B50000FB6F894DEBF0FBECDBFDF91CF911F91CE

+:100B60000F91FF90EF90BF90AF909F908F900C945B

+:100B7000AE0280E0A3960FB6F894DEBF0FBECDBFE5

+:100B8000DF91CF911F910F91FF90EF90BF90AF90A9

+:100B90009F908F90089508959CE0799FF001112413

+:100BA00090E3899FE00DF11D1124E60FF11DEE0F7A

+:100BB000FF1FE453FE4F859194910895880F991F6C

+:100BC000FC01E45BFF4F859194910895880F991F74

+:100B