Merge https://github.com/climbalima/qmk_firmware

diff --cc keyboards/maxipad/config.h
index a056e4963bc2b92bb520ee174baa2e27347426f8,fc5ab7761726c62f38e69428d7153ad129c390fe..4377a892e95ddd5ac481cac3ef52908900df327c
--- 1/keyboards/maxipad/config.h
--- 2/keyboards/maxipad/config.h
+++ b/keyboards/maxipad/config.h
@@@ -32,18 -33,25 +32,40 @@@ along with this program.  If not, see <
  #define MATRIX_ROWS 5
  #define MATRIX_COLS 6
  
++<<<<<<< HEAD
 +// Planck PCB default pin-out
 +// Change this to how you wired your keyboard
 +// COLS: Left to right, ROWS: Top to bottom
 +#ifdef USE_PRO_MICRO
 +      #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
 +      #define MATRIX_COL_PINS { F4, C6, D7, F5, B4, B5 }
 +      #define UNUSED_PINS
 + #else
 +      #define MATRIX_ROW_PINS { B6, F7, B2, B3, B1 }
 +      #define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 }
 +      #define UNUSED_PINS
 + #endif
++=======
+ /*
+  * Keyboard Matrix Assignments
+  *
+  * Change this to how you wired your keyboard
+  * COLS: AVR pins used for columns, left to right
+  * ROWS: AVR pins used for rows, top to bottom
+  * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+  *
+ */
+ //Pro micro pinout
+       #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
+       #define MATRIX_COL_PINS { F4, C6, D7, F5, B4, B5 }
+       #define UNUSED_PINS
+ //Teensy 2 pinout
+       //#define MATRIX_ROW_PINS { B6, F7, B2, B3, B1 }
+       //#define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 }
+       //#define UNUSED_PINS
+ 
++>>>>>>> 102a830bbdb302eb0951ec7910ab7c9feae272d1
  
  /* COL2ROW or ROW2COL */
  #define DIODE_DIRECTION COL2ROW

diff --cc keyboards/maxipad/readme.md
index 606bacd75db98fd0cace08100e0bdc704b053fdb,de2265d1115037f5c02464d9c48780abfbf6b12d..58ed5d718ff6d69a41e47531dc4008475dd1ec7f
--- 1/keyboards/maxipad/readme.md
--- 2/keyboards/maxipad/readme.md
+++ b/keyboards/maxipad/readme.md
@@@ -1,20 -1,11 +1,13 @@@
 -## Quantum MK Firmware
 -
 -For the full Quantum feature list, see [the parent readme](/).
 +<<<<<<< HEAD
 +Maxipad keyboard firmware
 +======================
  
 +## Quantum MK Firmware
  
 -## Building
 +For the full Quantum feature list, see [the parent readme.md](/readme.md).
- =======
- ## Quantum MK Firmware
- 
- For the full Quantum feature list, see [the parent readme](/).
- 
- >>>>>>> a06115df19a74d39b08758472b221e630c3680d3
- 
- ## Building
  
 +If you are using a pro micro then make sure to enable USE_PRO_MICRO in the makefile
+ Change the config.h pinout to match your mcu!!
  
  Download or clone the whole firmware and navigate to the keyboards/maxipad 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. 
  
@@@ -24,28 -15,16 +17,15 @@@ Depending on which keymap you would lik
  
  To build with the default keymap, simply run `make`.
  
- >>>>>>> a06115df19a74d39b08758472b221e630c3680d3
  
  ### Other Keymaps
 +Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `<name>.c` and see keymap document (you can find in top readme.md) and existent keymap files.
  
- <<<<<<< HEAD
- =======
--Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files.
  
- >>>>>>> a06115df19a74d39b08758472b221e630c3680d3
  To build the firmware binary hex file with a keymap just do `make` with a keymap like this:
  
  ```
  $ make [default|jack|<name>]
  ```
- <<<<<<< HEAD
- Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
- =======
  
  Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
--
- >>>>>>> a06115df19a74d39b08758472b221e630c3680d3

diff --cc keyboards/maxipad/rules.mk
index e6e5923f16322b0ad48af37050d36e51623c8da7,56b2042efa087c5d07a738f56eaae4f041d29595..49bb5f00229f176c9b03d5f42f140790c799c924
--- 1/keyboards/maxipad/rules.mk
--- 2/keyboards/maxipad/rules.mk
+++ b/keyboards/maxipad/rules.mk
@@@ -51,18 -49,19 +51,29 @@@ OPT_DEFS += -DBOOTLOADER_SIZE=51
  
  
  # Build Options
 -#   change yes to no to disable
 +#   comment out to disable the options.
  #
 -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 ?= yes        # Console for debug(+400)
 -COMMAND_ENABLE ?= yes        # Commands for debug and configuration
 +BOOTMAGIC_ENABLE ?= yes       # Virtual DIP switch configuration(+1000)
 +MOUSEKEY_ENABLE ?= yes        # Mouse keys(+4700)
 +EXTRAKEY_ENABLE ?= yes        # Audio control and System control(+450)
 +CONSOLE_ENABLE ?= yes # Console for debug(+400)
 +COMMAND_ENABLE ?= yes    # Commands for debug and configuration
  # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
- USE_PRO_MICRO ?= yes
++<<<<<<< HEAD
 +# SLEEP_LED_ENABLE ?= yes  # Breathing sleep LED during USB suspend
 +# NKRO_ENABLE ?= yes          # USB 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 ?= YES          # MIDI controls
 +# UNICODE_ENABLE ?= YES               # Unicode
 +# BLUETOOTH_ENABLE ?= yes # Enable Bluetooth with the Adafruit EZ-Key HID
 -AUDIO_ENABLE ?= no           # Audio output on port C6
++USE_PRO_MICRO ?= yes
++=======
+ SLEEP_LED_ENABLE ?= no       # Breathing sleep LED during USB suspend
+ # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+ NKRO_ENABLE ?= no            # USB Nkey Rollover
+ BACKLIGHT_ENABLE ?= no       # Enable keyboard backlight functionality on B7 by default
+ MIDI_ENABLE ?= no            # MIDI controls
+ UNICODE_ENABLE ?= no         # Unicode
+ BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
++AUDIO_ENABLE ?= no           # Audio output on port C6
++>>>>>>> 102a830bbdb302eb0951ec7910ab7c9feae272d1