Merge remote-tracking branch 'origin/master' into develop

14 files changed, 704 insertions, 0 deletions

diff --git a/keyboards/pizzakeyboards/pizza65/config.h b/keyboards/pizzakeyboards/pizza65/config.h
new file mode 100644
index 0000000000..039fc68263
--- /dev/null
+++ b/keyboards/pizzakeyboards/pizza65/config.h
@@ -0,0 +1,58 @@
+/*
+Copyright 2020 mmonte
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x504B // PK
+#define PRODUCT_ID      0x707A // PZ
+#define DEVICE_VER      0x0001
+#define MANUFACTURER pizzakeyboards
+#define PRODUCT      pizza65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+#define MATRIX_ROW_PINS { B15, A10, F1, A0, A1 }
+#define MATRIX_COL_PINS { A9, A8, F0, A2, A3, A4, B9, B8, B7, B6, B5, B4, B3, A15, A14, A13}
+#define UNUSED_PINS
+
+#define DIODE_DIRECTION COL2ROW
+
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 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
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/pizzakeyboards/pizza65/info.json b/keyboards/pizzakeyboards/pizza65/info.json
new file mode 100644
index 0000000000..551edc70e3
--- /dev/null
+++ b/keyboards/pizzakeyboards/pizza65/info.json
@@ -0,0 +1,317 @@
+{
+    "keyboard_name": "pizza65",
+    "url": "www.keyboards.pizza",
+    "maintainer": "mm0nte",
+    "width": 16,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0, "w":2},
+                {"label": "r1_15", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "r3_14", "x": 15, "y": 2},
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
+                {"label": "r4_02", "x": 2.25, "y": 3},
+                {"label": "r4_03", "x": 3.25, "y": 3},
+                {"label": "r4_04", "x": 4.25, "y": 3},
+                {"label": "r4_05", "x": 5.25, "y": 3},
+                {"label": "r4_06", "x": 6.25, "y": 3},
+                {"label": "r4_07", "x": 7.25, "y": 3},
+                {"label": "r4_08", "x": 8.25, "y": 3},
+                {"label": "r4_09", "x": 9.25, "y": 3},
+                {"label": "r4_10", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0, "w":2},
+                {"label": "r1_15", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2},
+                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
+                {"label": "r3_15", "x": 15, "y": 2},
+
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
+                {"label": "r4_02", "x": 1.25, "y": 3},
+                {"label": "r4_03", "x": 2.25, "y": 3},
+                {"label": "r4_04", "x": 3.25, "y": 3},
+                {"label": "r4_05", "x": 4.25, "y": 3},
+                {"label": "r4_06", "x": 5.25, "y": 3},
+                {"label": "r4_07", "x": 6.25, "y": 3},
+                {"label": "r4_08", "x": 7.25, "y": 3},
+                {"label": "r4_09", "x": 8.25, "y": 3},
+                {"label": "r4_10", "x": 9.25, "y": 3},
+                {"label": "r4_11", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_doublebs": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0},
+                {"label": "r1_15", "x": 14, "y": 0},
+                {"label": "r1_16", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "r3_14", "x": 15, "y": 2},
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
+                {"label": "r4_02", "x": 2.25, "y": 3},
+                {"label": "r4_03", "x": 3.25, "y": 3},
+                {"label": "r4_04", "x": 4.25, "y": 3},
+                {"label": "r4_05", "x": 5.25, "y": 3},
+                {"label": "r4_06", "x": 6.25, "y": 3},
+                {"label": "r4_07", "x": 7.25, "y": 3},
+                {"label": "r4_08", "x": 8.25, "y": 3},
+                {"label": "r4_09", "x": 9.25, "y": 3},
+                {"label": "r4_10", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_doublebs": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0},
+                {"label": "r1_15", "x": 14, "y": 0},
+                {"label": "r1_16", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2},
+                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
+                {"label": "r3_15", "x": 15, "y": 2},
+
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
+                {"label": "r4_02", "x": 1.25, "y": 3},
+                {"label": "r4_03", "x": 2.25, "y": 3},
+                {"label": "r4_04", "x": 3.25, "y": 3},
+                {"label": "r4_05", "x": 4.25, "y": 3},
+                {"label": "r4_06", "x": 5.25, "y": 3},
+                {"label": "r4_07", "x": 6.25, "y": 3},
+                {"label": "r4_08", "x": 7.25, "y": 3},
+                {"label": "r4_09", "x": 8.25, "y": 3},
+                {"label": "r4_10", "x": 9.25, "y": 3},
+                {"label": "r4_11", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c
new file mode 100644
index 0000000000..6111144b1d
--- /dev/null
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 'mm0nte'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi_blocker_doublebs(
+        KC_ESC,  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_HOME,
+        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_PGUP,
+        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_PGDN,
+        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_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker_doublebs(
+        KC_GRV,  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_DEL,  KC_DEL,  KC_INS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        RESET,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_HOME, KC_PGDN, KC_END
+    ),
+};
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..faf803461d
--- /dev/null
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 'mm0nte'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi_blocker(
+        KC_ESC,  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_HOME,
+        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_PGUP,
+        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_PGDN,
+        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_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker(
+        KC_GRV,  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_DEL,  KC_INS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        RESET,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_HOME, KC_PGDN, KC_END
+    ),
+};
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/default/readme.md b/keyboards/pizzakeyboards/pizza65/keymaps/default/readme.md
new file mode 100644
index 0000000000..bf78ffe048
--- /dev/null
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/default/readme.md
@@ -0,0 +1 @@
+#Default keymap. Pretty Standard ANSI with blocker layout. 
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c
new file mode 100644
index 0000000000..d05902ac6a
--- /dev/null
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 'mm0nte'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_iso_blocker(
+        KC_ESC,  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_HOME,
+        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_PGUP,
+        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_PGDN,
+        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_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_iso_blocker(
+        KC_GRV,  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_DEL,  KC_INS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS,
+        RESET,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_HOME, KC_PGDN, KC_END
+    ),
+};
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c
new file mode 100644
index 0000000000..17008937c2
--- /dev/null
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 'mm0nte'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_iso_blocker_doublebs(
+        KC_ESC,  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_HOME,
+        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_NUHS, KC_PGUP,
+        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_PGDN,
+        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_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT,   MO(1),          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_iso_blocker_doublebs(
+        KC_GRV,  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_DEL,  KC_DEL,  KC_INS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS,
+        RESET,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_HOME, KC_PGDN, KC_END
+    ),
+};
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..068f2d1d41
--- /dev/null
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2020 'mm0nte'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi_blocker(
+        KC_ESC,  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_HOME,
+        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_PGUP,
+        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_PGDN,
+        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_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker(
+        KC_GRV,  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_DEL,  KC_INS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        RESET,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_HOME, KC_PGDN, KC_END
+    ),
+    [2] = LAYOUT_65_ansi_blocker(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_65_ansi_blocker(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/via/readme.md b/keyboards/pizzakeyboards/pizza65/keymaps/via/readme.md
new file mode 100644
index 0000000000..72be963a9c
--- /dev/null
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/via/readme.md
@@ -0,0 +1 @@
+#Keymap for enabling VIA compatibility. Same ANSI with blocker as default. 
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/via/rules.mk b/keyboards/pizzakeyboards/pizza65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/pizzakeyboards/pizza65/pizza65.c b/keyboards/pizzakeyboards/pizza65/pizza65.c
new file mode 100644
index 0000000000..93d832af2b
--- /dev/null
+++ b/keyboards/pizzakeyboards/pizza65/pizza65.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 mmonte
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "pizza65.h"
diff --git a/keyboards/pizzakeyboards/pizza65/pizza65.h b/keyboards/pizzakeyboards/pizza65/pizza65.h
new file mode 100644
index 0000000000..7331f4c4a0
--- /dev/null
+++ b/keyboards/pizzakeyboards/pizza65/pizza65.h
@@ -0,0 +1,86 @@
+/* Copyright 2020 mmonte
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+ #define LAYOUT_65_ansi_blocker( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+     K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F  \
+ ) \
+ { \
+  { K00,   K01, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A, K0B,   K0C, KC_NO, K0E, K0F }, \
+  { K10, KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A, K1B,   K1C,   K1D, K1E, K1F }, \
+  { K20, KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A, K2B,   K2C, KC_NO, K2E, K2F }, \
+  { K30, KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A, K3B, KC_NO,   K3D, K3E, K3F }, \
+  { K40,   K41, K42, KC_NO, KC_NO, KC_NO,   K46, KC_NO, KC_NO, KC_NO,   K4A, K4B, KC_NO,   K4D, K4E, K4F }, \
+ }
+
+ #define LAYOUT_65_iso_blocker( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,