Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

11 files changed, 709 insertions, 0 deletions

diff --git a/keyboards/toad/config.h b/keyboards/toad/config.h
new file mode 100644
index 0000000000..f1d32c15b6
--- /dev/null
+++ b/keyboards/toad/config.h
@@ -0,0 +1,54 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6776
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    farmakon
+#define PRODUCT         "TOAD"
+#define DESCRIPTION     "TOAD"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 14
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B0, F6, F5, F4, F1, F0 }
+#define MATRIX_COL_PINS { B3, B2, B1, E6, B7, C7, C6, D4, D6, D7, B4, D0, D1, F7 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 0
+#endif
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCING_DELAY 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+)
+
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 0
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#endif
+
+#endif
diff --git a/keyboards/toad/info.json b/keyboards/toad/info.json
new file mode 100644
index 0000000000..17a37147ec
--- /dev/null
+++ b/keyboards/toad/info.json
@@ -0,0 +1,409 @@
+{
+  "keyboard_name": "Toad",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 15,
+  "height": 6.5,
+  "layouts": {
+    "LAYOUT_all": {
+      "key_count": 78,
+      "layout": [
+        {"label":"K000", "x":0, "y":0},
+        {"label":"K001", "x":2, "y":0},
+        {"label":"K002", "x":3, "y":0},
+        {"label":"K003", "x":4, "y":0},
+        {"label":"K004", "x":5, "y":0},
+        {"label":"K005", "x":6.5, "y":0},
+        {"label":"K006", "x":7.5, "y":0},
+        {"label":"K007", "x":8.5, "y":0},
+        {"label":"K008", "x":9.5, "y":0},
+        {"label":"K009", "x":11, "y":0},
+        {"label":"K010", "x":12, "y":0},
+        {"label":"K011", "x":13, "y":0},
+        {"label":"K012", "x":14, "y":0},
+        {"label":"K100", "x":0, "y":1.5},
+        {"label":"K101", "x":1, "y":1.5},
+        {"label":"K102", "x":2, "y":1.5},
+        {"label":"K103", "x":3, "y":1.5},
+        {"label":"K104", "x":4, "y":1.5},
+        {"label":"K105", "x":5, "y":1.5},
+        {"label":"K106", "x":6, "y":1.5},
+        {"label":"K107", "x":7, "y":1.5},
+        {"label":"K108", "x":8, "y":1.5},
+        {"label":"K109", "x":9, "y":1.5},
+        {"label":"K110", "x":10, "y":1.5},
+        {"label":"K111", "x":11, "y":1.5},
+        {"label":"K112", "x":12, "y":1.5},
+        {"label":"K113", "x":13, "y":1.5},
+        {"label":"K013", "x":14, "y":1.5},
+        {"label":"K200", "x":0, "y":2.5, "w":1.5},
+        {"label":"K201", "x":1.5, "y":2.5},
+        {"label":"K202", "x":2.5, "y":2.5},
+        {"label":"K203", "x":3.5, "y":2.5},
+        {"label":"K204", "x":4.5, "y":2.5},
+        {"label":"K205", "x":5.5, "y":2.5},
+        {"label":"K206", "x":6.5, "y":2.5},
+        {"label":"K207", "x":7.5, "y":2.5},
+        {"label":"K208", "x":8.5, "y":2.5},
+        {"label":"K209", "x":9.5, "y":2.5},
+        {"label":"K210", "x":10.5, "y":2.5},
+        {"label":"K211", "x":11.5, "y":2.5},
+        {"label":"K212", "x":12.5, "y":2.5},
+        {"label":"K213", "x":13.5, "y":2.5, "w":1.5},
+        {"label":"K300", "x":0, "y":3.5, "w":1.75},
+        {"label":"K301", "x":1.75, "y":3.5},
+        {"label":"K302", "x":2.75, "y":3.5},
+        {"label":"K303", "x":3.75, "y":3.5},
+        {"label":"K304", "x":4.75, "y":3.5},
+        {"label":"K305", "x":5.75, "y":3.5},
+        {"label":"K306", "x":6.75, "y":3.5},
+        {"label":"K307", "x":7.75, "y":3.5},
+        {"label":"K308", "x":8.75, "y":3.5},
+        {"label":"K309", "x":9.75, "y":3.5},
+        {"label":"K310", "x":10.75, "y":3.5},
+        {"label":"K311", "x":11.75, "y":3.5},
+        {"label":"K312", "x":12.75, "y":3.5},
+        {"label":"K313", "x":13.75, "y":3.5, "w":1.25},
+        {"label":"K400", "x":0, "y":4.5, "w":1.25},
+        {"label":"K401", "x":1.25, "y":4.5},
+        {"label":"K402", "x":2.25, "y":4.5},
+        {"label":"K403", "x":3.25, "y":4.5},
+        {"label":"K404", "x":4.25, "y":4.5},
+        {"label":"K405", "x":5.25, "y":4.5},
+        {"label":"K406", "x":6.25, "y":4.5},
+        {"label":"K407", "x":7.25, "y":4.5},
+        {"label":"K408", "x":8.25, "y":4.5},
+        {"label":"K409", "x":9.25, "y":4.5},
+        {"label":"K410", "x":10.25, "y":4.5},
+        {"label":"K411", "x":11.25, "y":4.5},
+        {"label":"K412", "x":12.25, "y":4.5, "w":1.75},
+        {"label":"K413", "x":14, "y":4.5},
+        {"label":"K500", "x":0, "y":5.5, "w":1.25},
+        {"label":"K501", "x":1.25, "y":5.5, "w":1.25},
+        {"label":"K502", "x":2.5, "y":5.5, "w":1.25},
+        {"label":"K507", "x":3.75, "y":5.5, "w":6.25},
+        {"label":"K510", "x":10, "y":5.5, "w":1.25},
+        {"label":"K511", "x":11.25, "y":5.5, "w":1.25},
+        {"label":"K512", "x":12.5, "y":5.5, "w":1.25},
+        {"label":"K513", "x":13.75, "y":5.5, "w":1.25}
+      ]
+    },
+
+    "LAYOUT_ansi_wk": {
+      "key_count": 74,
+      "layout": [
+        {"label":"K000", "x":0, "y":0}, 
+        {"label":"K001", "x":2, "y":0}, 
+        {"label":"K002", "x":3, "y":0}, 
+        {"label":"K003", "x":4, "y":0}, 
+        {"label":"K004", "x":5, "y":0}, 
+        {"label":"K005", "x":6.5, "y":0}, 
+        {"label":"K006", "x":7.5, "y":0}, 
+        {"label":"K007", "x":8.5, "y":0}, 
+        {"label":"K008", "x":9.5, "y":0}, 
+        {"label":"K009", "x":11, "y":0}, 
+        {"label":"K010", "x":12, "y":0}, 
+        {"label":"K011", "x":13, "y":0}, 
+        {"label":"K012", "x":14, "y":0}, 
+        {"label":"K100", "x":0, "y":1.5}, 
+        {"label":"K101", "x":1, "y":1.5}, 
+        {"label":"K102", "x":2, "y":1.5}, 
+        {"label":"K103", "x":3, "y":1.5}, 
+        {"label":"K104", "x":4, "y":1.5}, 
+        {"label":"K105", "x":5, "y":1.5}, 
+        {"label":"K106", "x":6, "y":1.5}, 
+        {"label":"K107", "x":7, "y":1.5}, 
+        {"label":"K108", "x":8, "y":1.5}, 
+        {"label":"K109", "x":9, "y":1.5}, 
+        {"label":"K110", "x":10, "y":1.5}, 
+        {"label":"K111", "x":11, "y":1.5}, 
+        {"label":"K112", "x":12, "y":1.5}, 
+        {"label":"K013", "x":13, "y":1.5, "w":2}, 
+        {"label":"K200", "x":0, "y":2.5, "w":1.5}, 
+        {"label":"K201", "x":1.5, "y":2.5}, 
+        {"label":"K202", "x":2.5, "y":2.5}, 
+        {"label":"K203", "x":3.5, "y":2.5}, 
+        {"label":"K204", "x":4.5, "y":2.5}, 
+        {"label":"K205", "x":5.5, "y":2.5}, 
+        {"label":"K206", "x":6.5, "y":2.5}, 
+        {"label":"K207", "x":7.5, "y":2.5}, 
+        {"label":"K208", "x":8.5, "y":2.5}, 
+        {"label":"K209", "x":9.5, "y":2.5}, 
+        {"label":"K210", "x":10.5, "y":2.5}, 
+        {"label":"K211", "x":11.5, "y":2.5}, 
+        {"label":"K212", "x":12.5, "y":2.5}, 
+        {"label":"K213", "x":13.5, "y":2.5, "w":1.5}, 
+        {"label":"K300", "x":0, "y":3.5, "w":1.75}, 
+        {"label":"K301", "x":1.75, "y":3.5}, 
+        {"label":"K302", "x":2.75, "y":3.5}, 
+        {"label":"K303", "x":3.75, "y":3.5}, 
+        {"label":"K304", "x":4.75, "y":3.5}, 
+        {"label":"K305", "x":5.75, "y":3.5}, 
+        {"label":"K306", "x":6.75, "y":3.5}, 
+        {"label":"K307", "x":7.75, "y":3.5}, 
+        {"label":"K308", "x":8.75, "y":3.5}, 
+        {"label":"K309", "x":9.75, "y":3.5}, 
+        {"label":"K310", "x":10.75, "y":3.5}, 
+        {"label":"K311", "x":11.75, "y":3.5}, 
+        {"label":"K313", "x":12.75, "y":3.5, "w":2.25}, 
+        {"label":"K400", "x":0, "y":4.5, "w":2.25}, 
+        {"label":"K402", "x":2.25, "y":4.5}, 
+        {"label":"K403", "x":3.25, "y":4.5}, 
+        {"label":"K404", "x":4.25, "y":4.5}, 
+        {"label":"K405", "x":5.25, "y":4.5}, 
+        {"label":"K406", "x":6.25, "y":4.5}, 
+        {"label":"K407", "x":7.25, "y":4.5}, 
+        {"label":"K408", "x":8.25, "y":4.5}, 
+        {"label":"K409", "x":9.25, "y":4.5}, 
+        {"label":"K410", "x":10.25, "y":4.5}, 
+        {"label":"K411", "x":11.25, "y":4.5}, 
+        {"label":"K412", "x":12.25, "y":4.5, "w":2.75}, 
+        {"label":"K500", "x":0, "y":5.5, "w":1.25}, 
+        {"label":"K501", "x":1.25, "y":5.5, "w":1.25}, 
+        {"label":"K502", "x":2.5, "y":5.5, "w":1.25}, 
+        {"label":"K507", "x":3.75, "y":5.5, "w":6.25}, 
+        {"label":"K510", "x":10, "y":5.5, "w":1.25}, 
+        {"label":"K511", "x":11.25, "y":5.5, "w":1.25}, 
+        {"label":"K512", "x":12.5, "y":5.5, "w":1.25}, 
+        {"label":"K513", "x":13.75, "y":5.5, "w":1.25}
+      ]
+    },
+ 
+    "LAYOUT_ansi_wkl": {
+      "key_count": 71,
+      "layout": [
+        {"label":"K000", "x":0, "y":0}, 
+        {"label":"K001", "x":2, "y":0}, 
+        {"label":"K002", "x":3, "y":0}, 
+        {"label":"K003", "x":4, "y":0}, 
+        {"label":"K004", "x":5, "y":0}, 
+        {"label":"K005", "x":6.5, "y":0}, 
+        {"label":"K006", "x":7.5, "y":0}, 
+        {"label":"K007", "x":8.5, "y":0}, 
+        {"label":"K008", "x":9.5, "y":0}, 
+        {"label":"K009", "x":11, "y":0}, 
+        {"label":"K010", "x":12, "y":0}, 
+        {"label":"K011", "x":13, "y":0}, 
+        {"label":"K012", "x":14, "y":0}, 
+        {"label":"K100", "x":0, "y":1.5}, 
+        {"label":"K101", "x":1, "y":1.5}, 
+        {"label":"K102", "x":2, "y":1.5}, 
+        {"label":"K103", "x":3, "y":1.5}, 
+        {"label":"K104", "x":4, "y":1.5}, 
+        {"label":"K105", "x":5, "y":1.5}, 
+        {"label":"K106", "x":6, "y":1.5}, 
+        {"label":"K107", "x":7, "y":1.5}, 
+        {"label":"K108", "x":8, "y":1.5}, 
+        {"label":"K109", "x":9, "y":1.5}, 
+        {"label":"K110", "x":10, "y":1.5}, 
+        {"label":"K111", "x":11, "y":1.5}, 
+        {"label":"K112", "x":12, "y":1.5}, 
+        {"label":"K013", "x":13, "y":1.5, "w":2}, 
+        {"label":"K200", "x":0, "y":2.5, "w":1.5}, 
+        {"label":"K201", "x":1.5, "y":2.5}, 
+        {"label":"K202", "x":2.5, "y":2.5}, 
+        {"label":"K203", "x":3.5, "y":2.5}, 
+        {"label":"K204", "x":4.5, "y":2.5}, 
+        {"label":"K205", "x":5.5, "y":2.5}, 
+        {"label":"K206", "x":6.5, "y":2.5}, 
+        {"label":"K207", "x":7.5, "y":2.5}, 
+        {"label":"K208", "x":8.5, "y":2.5}, 
+        {"label":"K209", "x":9.5, "y":2.5}, 
+        {"label":"K210", "x":10.5, "y":2.5}, 
+        {"label":"K211", "x":11.5, "y":2.5}, 
+        {"label":"K212", "x":12.5, "y":2.5}, 
+        {"label":"K213", "x":13.5, "y":2.5, "w":1.5}, 
+        {"label":"K300", "x":0, "y":3.5, "w":1.75}, 
+        {"label":"K301", "x":1.75, "y":3.5}, 
+        {"label":"K302", "x":2.75, "y":3.5}, 
+        {"label":"K303", "x":3.75, "y":3.5}, 
+        {"label":"K304", "x":4.75, "y":3.5}, 
+        {"label":"K305", "x":5.75, "y":3.5}, 
+        {"label":"K306", "x":6.75, "y":3.5}, 
+        {"label":"K307", "x":7.75, "y":3.5}, 
+        {"label":"K308", "x":8.75, "y":3.5}, 
+        {"label":"K309", "x":9.75, "y":3.5}, 
+        {"label":"K310", "x":10.75, "y":3.5}, 
+        {"label":"K311", "x":11.75, "y":3.5}, 
+        {"label":"K313", "x":12.75, "y":3.5, "w":2.25}, 
+        {"label":"K400", "x":0, "y":4.5, "w":2.25}, 
+        {"label":"K402", "x":2.25, "y":4.5}, 
+        {"label":"K403", "x":3.25, "y":4.5}, 
+        {"label":"K404", "x":4.25, "y":4.5}, 
+        {"label":"K405", "x":5.25, "y":4.5}, 
+        {"label":"K406", "x":6.25, "y":4.5}, 
+        {"label":"K407", "x":7.25, "y":4.5}, 
+        {"label":"K408", "x":8.25, "y":4.5}, 
+        {"label":"K409", "x":9.25, "y":4.5}, 
+        {"label":"K410", "x":10.25, "y":4.5}, 
+        {"label":"K411", "x":11.25, "y":4.5}, 
+        {"label":"K412", "x":12.25, "y":4.5, "w":2.75}, 
+        {"label":"K500", "x":0, "y":5.5, "w":1.5}, 
+        {"label":"K502", "x":2.5, "y":5.5, "w":1.5}, 
+        {"label":"K507", "x":4, "y":5.5, "w":7}, 
+        {"label":"K511", "x":11, "y":5.5, "w":1.5}, 
+        {"label":"K513", "x":13.5, "y":5.5, "w":1.5}
+      ]
+    },
+
+    "LAYOUT_iso_wk": {
+      "key_count": 75,
+      "layout": [
+        {"label":"K000", "x":0, "y":0}, 
+        {"label":"K001", "x":2, "y":0}, 
+        {"label":"K002", "x":3, "y":0}, 
+        {"label":"K003", "x":4, "y":0}, 
+        {"label":"K004", "x":5, "y":0}, 
+        {"label":"K005", "x":6.5, "y":0}, 
+        {"label":"K006", "x":7.5, "y":0}, 
+        {"label":"K007", "x":8.5, "y":0}, 
+        {"label":"K008", "x":9.5, "y":0}, 
+        {"label":"K009", "x":11, "y":0}, 
+        {"label":"K010", "x":12, "y":0}, 
+        {"label":"K011", "x":13, "y":0}, 
+        {"label":"K012", "x":14, "y":0}, 
+        {"label":"K100", "x":0, "y":1.5}, 
+        {"label":"K101", "x":1, "y":1.5}, 
+        {"label":"K102", "x":2, "y":1.5}, 
+        {"label":"K103", "x":3, "y":1.5}, 
+        {"label":"K104", "x":4, "y":1.5}, 
+        {"label":"K105", "x":5, "y":1.5}, 
+        {"label":"K106", "x":6, "y":1.5}, 
+        {"label":"K107", "x":7, "y":1.5}, 
+        {"label":"K108", "x":8, "y":1.5}, 
+        {"label":"K109", "x":9, "y":1.5}, 
+        {"label":"K110", "x":10, "y":1.5}, 
+        {"label":"K111", "x":11, "y":1.5}, 
+        {"label":"K112", "x":12, "y":1.5}, 
+        {"label":"K013", "x":13, "y":1.5, "w":2}, 
+        {"label":"K200", "x":0, "y":2.5, "w":1.5}, 
+        {"label":"K201", "x":1.5, "y":2.5}, 
+        {"label":"K202", "x":2.5, "y":2.5}, 
+        {"label":"K203", "x":3.5, "y":2.5}, 
+        {"label":"K204", "x":4.5, "y":2.5}, 
+        {"label":"K205", "x":5.5, "y":2.5}, 
+        {"label":"K206", "x":6.5, "y":2.5}, 
+        {"label":"K207", "x":7.5, "y":2.5}, 
+        {"label":"K208", "x":8.5, "y":2.5}, 
+        {"label":"K209", "x":9.5, "y":2.5}, 
+        {"label":"K210", "x":10.5, "y":2.5}, 
+        {"label":"K211", "x":11.5, "y":2.5}, 
+        {"label":"K212", "x":12.5, "y":2.5}, 
+        {"label":"K300", "x":0, "y":3.5, "w":1.75}, 
+        {"label":"K301", "x":1.75, "y":3.5}, 
+        {"label":"K302", "x":2.75, "y":3.5}, 
+        {"label":"K303", "x":3.75, "y":3.5}, 
+        {"label":"K304", "x":4.75, "y":3.5}, 
+        {"label":"K305", "x":5.75, "y":3.5}, 
+        {"label":"K306", "x":6.75, "y":3.5}, 
+        {"label":"K307", "x":7.75, "y":3.5}, 
+        {"label":"K308", "x":8.75, "y":3.5}, 
+        {"label":"K309", "x":9.75, "y":3.5}, 
+        {"label":"K310", "x":10.75, "y":3.5}, 
+        {"label":"K311", "x":11.75, "y":3.5}, 
+        {"label":"K312", "x":12.75, "y":3.5}, 
+        {"label":"K313", "x":13.75, "y":2.5, "w":1.25, "h":2}, 
+        {"label":"K400", "x":0, "y":4.5, "w":1.25}, 
+        {"label":"K401", "x":1.25, "y":4.5}, 
+        {"label":"K402", "x":2.25, "y":4.5}, 
+        {"label":"K403", "x":3.25, "y":4.5}, 
+        {"label":"K404", "x":4.25, "y":4.5}, 
+        {"label":"K405", "x":5.25, "y":4.5}, 
+        {"label":"K406", "x":6.25, "y":4.5}, 
+        {"label":"K407", "x":7.25, "y":4.5}, 
+        {"label":"K408", "x":8.25, "y":4.5}, 
+        {"label":"K409", "x":9.25, "y":4.5}, 
+        {"label":"K410", "x":10.25, "y":4.5}, 
+        {"label":"K411", "x":11.25, "y":4.5}, 
+        {"label":"K412", "x":12.25, "y":4.5, "w":2.75}, 
+        {"label":"K500", "x":0, "y":5.5, "w":1.25}, 
+        {"label":"K501", "x":1.25, "y":5.5, "w":1.25}, 
+        {"label":"K502", "x":2.5, "y":5.5, "w":1.25}, 
+        {"label":"K507", "x":3.75, "y":5.5, "w":6.25}, 
+        {"label":"K510", "x":10, "y":5.5, "w":1.25}, 
+        {"label":"K511", "x":11.25, "y":5.5, "w":1.25}, 
+        {"label":"K512", "x":12.5, "y":5.5, "w":1.25}, 
+        {"label":"K513", "x":13.75, "y":5.5, "w":1.25}
+      ]
+    },
+ 
+    "LAYOUT_iso_wkl": {
+      "key_count": 72,
+      "layout": [
+        {"label":"K000", "x":0, "y":0}, 
+        {"label":"K001", "x":2, "y":0}, 
+        {"label":"K002", "x":3, "y":0}, 
+        {"label":"K003", "x":4, "y":0}, 
+        {"label":"K004", "x":5, "y":0}, 
+        {"label":"K005", "x":6.5, "y":0}, 
+        {"label":"K006", "x":7.5, "y":0}, 
+        {"label":"K007", "x":8.5, "y":0}, 
+        {"label":"K008", "x":9.5, "y":0}, 
+        {"label":"K009", "x":11, "y":0}, 
+        {"label":"K010", "x":12, "y":0}, 
+        {"label":"K011", "x":13, "y":0}, 
+        {"label":"K012", "x":14, "y":0}, 
+        {"label":"K100", "x":0, "y":1.5}, 
+        {"label":"K101", "x":1, "y":1.5}, 
+        {"label":"K102", "x":2, "y":1.5}, 
+        {"label":"K103", "x":3, "y":1.5}, 
+        {"label":"K104", "x":4, "y":1.5}, 
+        {"label":"K105", "x":5, "y":1.5}, 
+        {"label":"K106", "x":6, "y":1.5}, 
+        {"label":"K107", "x":7, "y":1.5}, 
+        {"label":"K108", "x":8, "y":1.5}, 
+        {"label":"K109", "x":9, "y":1.5}, 
+        {"label":"K110", "x":10, "y":1.5}, 
+        {"label":"K111", "x":11, "y":1.5}, 
+        {"label":"K112", "x":12, "y":1.5}, 
+        {"label":"K013", "x":13, "y":1.5, "w":2}, 
+        {"label":"K200", "x":0, "y":2.5, "w":1.5}, 
+        {"label":"K201", "x":1.5, "y":2.5}, 
+        {"label":"K202", "x":2.5, "y":2.5}, 
+        {"label":"K203", "x":3.5, "y":2.5}, 
+        {"label":"K204", "x":4.5, "y":2.5}, 
+        {"label":"K205", "x":5.5, "y":2.5}, 
+        {"label":"K206", "x":6.5, "y":2.5}, 
+        {"label":"K207", "x":7.5, "y":2.5}, 
+        {"label":"K208", "x":8.5, "y":2.5}, 
+        {"label":"K209", "x":9.5, "y":2.5}, 
+        {"label":"K210", "x":10.5, "y":2.5}, 
+        {"label":"K211", "x":11.5, "y":2.5}, 
+        {"label":"K212", "x":12.5, "y":2.5}, 
+        {"label":"K300", "x":0, "y":3.5, "w":1.75}, 
+        {"label":"K301", "x":1.75, "y":3.5}, 
+        {"label":"K302", "x":2.75, "y":3.5}, 
+        {"label":"K303", "x":3.75, "y":3.5}, 
+        {"label":"K304", "x":4.75, "y":3.5}, 
+        {"label":"K305", "x":5.75, "y":3.5}, 
+        {"label":"K306", "x":6.75, "y":3.5}, 
+        {"label":"K307", "x":7.75, "y":3.5}, 
+        {"label":"K308", "x":8.75, "y":3.5}, 
+        {"label":"K309", "x":9.75, "y":3.5}, 
+        {"label":"K310", "x":10.75, "y":3.5}, 
+        {"label":"K311", "x":11.75, "y":3.5}, 
+        {"label":"K312", "x":12.75, "y":3.5}, 
+        {"label":"K313", "x":13.75, "y":2.5, "w":1.25, "h":2}, 
+        {"label":"K400", "x":0, "y":4.5, "w":1.25}, 
+        {"label":"K401", "x":1.25, "y":4.5}, 
+        {"label":"K402", "x":2.25, "y":4.5}, 
+        {"label":"K403", "x":3.25, "y":4.5}, 
+        {"label":"K404", "x":4.25, "y":4.5}, 
+        {"label":"K405", "x":5.25, "y":4.5}, 
+        {"label":"K406", "x":6.25, "y":4.5}, 
+        {"label":"K407", "x":7.25, "y":4.5}, 
+        {"label":"K408", "x":8.25, "y":4.5}, 
+        {"label":"K409", "x":9.25, "y":4.5}, 
+        {"label":"K410", "x":10.25, "y":4.5}, 
+        {"label":"K411", "x":11.25, "y":4.5}, 
+        {"label":"K412", "x":12.25, "y":4.5, "w":2.75}, 
+        {"label":"K500", "x":0, "y":5.5, "w":1.5}, 
+        {"label":"K502", "x":2.5, "y":5.5, "w":1.5}, 
+        {"label":"K507", "x":4, "y":5.5, "w":7}, 
+        {"label":"K511", "x":11, "y":5.5, "w":1.5}, 
+        {"label":"K513", "x":13.5, "y":5.5, "w":1.5}
+      ]
+    }
+  }
+}
+
diff --git a/keyboards/toad/keymaps/ansi_wk/keymap.c b/keyboards/toad/keymaps/ansi_wk/keymap.c
new file mode 100644
index 0000000000..a4fd348f0e
--- /dev/null
+++ b/keyboards/toad/keymaps/ansi_wk/keymap.c
@@ -0,0 +1,15 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	LAYOUT_ansi_wk(
+	KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,            \
+    KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,  KC_BSPC,   \
+    KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC, KC_RBRC, KC_BSLS,   \
+    KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,          KC_ENT, \
+    KC_LSFT,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,         \
+    KC_LCTL,KC_LGUI,KC_LALT,                                  KC_SPC,                 KC_RALT,KC_RGUI, KC_APP,KC_RCTL
+	)
+};
+
+
diff --git a/keyboards/toad/keymaps/ansi_wkl/keymap.c b/keyboards/toad/keymaps/ansi_wkl/keymap.c
new file mode 100644
index 0000000000..7fb6b3b599
--- /dev/null
+++ b/keyboards/toad/keymaps/ansi_wkl/keymap.c
@@ -0,0 +1,13 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	LAYOUT_ansi_wkl(
+	KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,                    \
+    KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,  KC_BSPC,   \
+    KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC, KC_RBRC, KC_BSLS,   \
+    KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,          KC_ENT, \
+    KC_LSFT,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,         \
+    KC_LCTL,        KC_LALT,                                  KC_SPC,                 KC_RALT,      KC_RCTL
+	)
+};
diff --git a/keyboards/toad/keymaps/default/keymap.c b/keyboards/toad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4c30bdc442
--- /dev/null
+++ b/keyboards/toad/keymaps/default/keymap.c
@@ -0,0 +1,13 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	LAYOUT_all(
+	KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,      KC_F9, KC_F10, KC_F11, KC_F12,              \
+    KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    \
+    KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,         \
+    KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,          \
+    KC_LSFT,KC_NUBS,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,         \
+    KC_LCTL,KC_LGUI,KC_LALT,                                  KC_SPC,                  KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
+	)
+};
diff --git a/keyboards/toad/keymaps/iso_wk/keymap.c b/keyboards/toad/keymaps/iso_wk/keymap.c
new file mode 100644
index 0000000000..2025504321
--- /dev/null
+++ b/keyboards/toad/keymaps/iso_wk/keymap.c
@@ -0,0 +1,13 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	LAYOUT_iso_wk(
+	KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,                    \
+    KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,  KC_BSPC,   \
+    KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC, KC_RBRC,            \
+    KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT, \
+    KC_LSFT,  KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,         \
+    KC_LCTL,KC_LGUI,KC_LALT,                                  KC_SPC,                 KC_RALT,KC_RGUI, KC_APP,KC_RCTL
+	)
+};
diff --git a/keyboards/toad/keymaps/iso_wkl/keymap.c b/keyboards/toad/keymaps/iso_wkl/keymap.c
new file mode 100644
index 0000000000..1659d7b384
--- /dev/null
+++ b/keyboards/toad/keymaps/iso_wkl/keymap.c
@@ -0,0 +1,13 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	LAYOUT_iso_wkl(
+	KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,                    \
+    KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,  KC_BSPC,   \
+    KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC, KC_RBRC,            \
+    KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT, \
+    KC_LSFT,  KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,         \
+    KC_LCTL,        KC_LALT,                                  KC_SPC,                 KC_RALT,                KC_RCTL
+	)
+};
diff --git a/keyboards/toad/readme.md b/keyboards/toad/readme.md
new file mode 100644
index 0000000000..de58f7202b
--- /dev/null
+++ b/keyboards/toad/readme.md
@@ -0,0 +1,14 @@
+# Toad
+
+Toad: 70% Mechanical Keyboard PCB.
+
+Toad schematic and PCB are available opensource under Creative Commons BY-SA 3.0 license on EasyEDA at [this link](https://easyeda.com/farmakon/70_Keyboard-d4f6baf4792d4ada9c0571fa3713e461)
+
+For more informations on the Toad please visit this [geekhack.org thread](https://geekhack.org/index.php?topic=91388.0)
+
+Make examples for these keyboards (after setting up your build environment):
+
+    make toad:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
diff --git a/keyboards/toad/rules.mk b/keyboards/toad/rules.mk
new file mode 100644
index 0000000000..ee87c6e8d4
--- /dev/null
+++ b/keyboards/toad/rules.mk
@@ -0,0 +1,56 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency.
+#     This will define a symbol, F_CPU, in all source code files equal to the
+#     processor frequency in Hz. You can then use this symbol in your source code to
+#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+#     automatically to create a 32-bit value in your source code.
+#
+#     This will be an integer division of F_USB below, as it is sourced by
+#     F_USB after it has run through any CPU prescalers. Note that this value
+#     does not *change* the processor frequency - it should merely be updated to
+#     reflect the processor speed set externally so that the code can use accurate
+#     software delays.
+F_CPU = 16000000
+
+#
+# LUFA specific
+#
+# Target architecture (see library "Board Types" documentation).
+ARCH = AVR8
+
+# Input clock frequency.
+#     This will define a symbol, F_USB, in all source code files equal to the
+#     input clock frequency (before any prescaling is performed) in Hz. This value may
+#     differ from F_CPU if prescaling is used on the latter, and is required as the
+#     raw input clock is fed directly to the PLL sections of the AVR for high speed
+#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+#     at the end, this will be done automatically to create a 32-bit value in your
+#     source code.
+#
+#     If no clock division is performed on the input clock inside the AVR (via the
+#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_USB = $(F_CPU)
+
+# Interrupt driven control endpoint task(+60)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+
+# Boot Section Size in *bytes*
+OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
+# Build Options
+#   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE ?= no	# Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE ?= no	# Mouse keys(+4700)
+EXTRAKEY_ENABLE ?= yes	# Audio control and System control(+450)
+CONSOLE_ENABLE ?= no	# Console for debug(+400)
+COMMAND_ENABLE ?= no    # Commands for debug and configuration
+SLEEP_LED_ENABLE ?= no  # 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 ?= no  # Enable keyboard backlight functionality
+AUDIO_ENABLE ?= no
+RGBLIGHT_ENABLE ?= no
\ No newline at end of file
diff --git a/keyboards/toad/toad.c b/keyboards/toad/toad.c
new file mode 100644
index 0000000000..bc4db0339e
--- /dev/null
+++ b/keyboards/toad/toad.c
@@ -0,0 +1,18 @@
+#include "toad.h"
+
+void led_set_user(uint8_t usb_led) {
+
+	//LED1
+	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+		DDRB |= (1 << 6); PORTB &= ~(1 << 6);
+	} else {
+		DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
+	}
+
+	//LED2
+	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+		DDRB |= (1 << 5); PORTB &= ~(1 << 5);
+	} else {
+		DDRB &= ~(1 << 5); PORTB &= ~(1 << 5);
+	}
+}
diff --git a/keyboards/toad/toad.h b/keyboards/toad/toad.h
new file mode 100644
index 0000000000..154068e42a
--- /dev/null
+++ b/keyboards/toad/toad.h
@@ -0,0 +1,91 @@
+#ifndef TOAD
+#define TOAD
+
+#include "quantum.h"
+
+// 70% keyboard: default - all keys
+#define LAYOUT_all( \
+	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,        \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K013,  \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,        \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,        \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,        \
+	K500, K501, K502,                         K507,             K510, K511, K512, K513         \
+) { \
+	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
+	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
+	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
+	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
+	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413 }, \
+	{ K500, K501, K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,K510, K511, K512, K513 }  \
+}
+
+// 70% keyboard: ANSI Winkey
+#define LAYOUT_ansi_wk( \
+	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,  \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,  \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,  \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,  \
+	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,        \
+	K500, K501, K502,                         K507,             K510, K511, K512, K513   \
+) { \
+	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
+	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO}, \
+	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
+	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO,K313 }, \
+	{ K400, KC_NO,K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO}, \
+	{ K500, K501, K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,K510, K511, K512, K513 }  \
+}
+
+// 70% keyboard: ANSI Winkeyless
+#define LAYOUT_ansi_wkl( \
+	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,  \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,  \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,  \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,  \
+	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,        \
+	K500,       K502,                         K507,                   K511,       K513   \
+) { \
+	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
+	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO}, \
+	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
+	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO,K313 }, \
+	{ K400, KC_NO,K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO}, \
+	{ K500, KC_NO,K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,KC_NO,K511, KC_NO,K513 }  \
+}
+
+// 70% keyboard: ISO Winkey
+#define LAYOUT_iso_wk( \
+	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,  \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,  \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,        \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,  \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,        \
+	K500, K501, K502,                         K507,             K510, K511, K512, K513   \
+) { \
+	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
+	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO}, \
+	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO}, \
+	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
+	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO}, \
+	{ K500, K501, K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,K510, K511, K512, K513 }  \
+}
+
+// 70% keyboard: ISO Winkeyless
+#define LAYOUT_iso_wkl( \
+	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,  \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,  \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,        \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,  \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,        \
+	K500,       K502,                         K507,                   K511,       K513   \
+) { \
+	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
+	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO}, \
+	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO}, \
+	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
+	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO}, \
+	{ K500, KC_NO,K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,KC_NO,K511, KC_NO,K513 }  \
+}
+
+#endif