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

7 files changed, 265 insertions, 0 deletions

diff --git a/keyboards/handwired/carpolly/carpolly.c b/keyboards/handwired/carpolly/carpolly.c
new file mode 100644
index 0000000000..119dfa962b
--- /dev/null
+++ b/keyboards/handwired/carpolly/carpolly.c
@@ -0,0 +1,20 @@
+/* Copyright 2021 Paul Enrico N. Viola
+ *
+ * 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 "carpolly.h"
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/carpolly/carpolly.h b/keyboards/handwired/carpolly/carpolly.h
new file mode 100644
index 0000000000..ddcf98fcdb
--- /dev/null
+++ b/keyboards/handwired/carpolly/carpolly.h
@@ -0,0 +1,36 @@
+/* Copyright 2021 Paul Enrico N. Viola
+ *
+ * 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"
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, \
+    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
+    K30, K31, K32, K36, K3A, K3B, K3C  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, XXX }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
+    { K30, K31, K32, XXX, XXX, XXX, K36, XXX, XXX, XXX, K3A, K3B, K3C }, \
+}
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/carpolly/config.h b/keyboards/handwired/carpolly/config.h
new file mode 100644
index 0000000000..e0890cf7ac
--- /dev/null
+++ b/keyboards/handwired/carpolly/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2021 Paul Enrico N. Viola
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6532
+#define PRODUCT_ID      0x0017
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    paul
+#define PRODUCT         Carpolly
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 13
+
+/*
+ * 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)
+ *
+ */
+#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, B6, B5, B4, D7, D6, D4, D5, C7 }
+
+#define DIODE_DIRECTION COL2ROW
+
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/carpolly/info.json b/keyboards/handwired/carpolly/info.json
new file mode 100644
index 0000000000..7a7395e914
--- /dev/null
+++ b/keyboards/handwired/carpolly/info.json
@@ -0,0 +1,55 @@
+{
+    "keyboard_name": "Carpolly",
+    "url": "https://github.com/PollyV1",
+    "maintainer": "Paul Enrico N. Viola",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "K00 (B0,F0)", "x": 0, "y": 0 },
+                { "label": "K01 (B0,F1)", "x": 1, "y": 0 },
+                { "label": "K02 (B0,F4)", "x": 2, "y": 0 },
+                { "label": "K03 (B0,F5)", "x": 3, "y": 0 },
+                { "label": "K04 (B0,F6)", "x": 4, "y": 0 },
+                { "label": "K05 (B0,B6)", "x": 5, "y": 0 },
+                { "label": "K06 (B0,B5)", "x": 6, "y": 0 },
+                { "label": "K07 (B0,B4)", "x": 7, "y": 0 },
+                { "label": "K08 (B0,D7)", "x": 8, "y": 0 },
+                { "label": "K09 (B0,D6)", "x": 9, "y": 0 },
+                { "label": "K0A (B0,D4)", "x": 10, "y": 0 },
+                { "label": "K0B (B0,D5)", "x": 11, "y": 0, "w": 1.75 },
+                { "label": "K10 (B1,F0)", "x": 0, "y": 1, "w": 1.25 },
+                { "label": "K11 (B1,F1)", "x": 1.25, "y": 1 },
+                { "label": "K12 (B1,F4)", "x": 2.25, "y": 1 },
+                { "label": "K13 (B1,F5)", "x": 3.25, "y": 1 },
+                { "label": "K14 (B1,F6)", "x": 4.25, "y": 1 },
+                { "label": "K15 (B1,B6)", "x": 5.25, "y": 1 },
+                { "label": "K16 (B1,B5)", "x": 6.25, "y": 1 },
+                { "label": "K17 (B1,B4)", "x": 7.25, "y": 1 },
+                { "label": "K18 (B1,D7)", "x": 8.25, "y": 1 },
+                { "label": "K19 (B1,D6)", "x": 9.25, "y": 1 },
+                { "label": "K1A (B1,D4)", "x": 10.25, "y": 1 },
+                { "label": "K1C (B1,C7)", "x": 11.25, "y": 1, "w": 1.5 },
+                { "label": "K20 (B2,F0)", "x": 0, "y": 2, "w": 1.75 },
+                { "label": "K22 (B2,F4)", "x": 1.75, "y": 2 },
+                { "label": "K23 (B2,F5)", "x": 2.75, "y": 2 },
+                { "label": "K24 (B2,F6)", "x": 3.75, "y": 2 },
+                { "label": "K25 (B2,B6)", "x": 4.75, "y": 2 },
+                { "label": "K26 (B2,B5)", "x": 5.75, "y": 2 },
+                { "label": "K27 (B2,B4)", "x": 6.75, "y": 2 },
+                { "label": "K28 (B2,D7)", "x": 7.75, "y": 2 },
+                { "label": "K29 (B2,D6)", "x": 8.75, "y": 2 },
+                { "label": "K2A (B2,D4)", "x": 9.75, "y": 2 },
+                { "label": "K2B (B2,D5)", "x": 10.75, "y": 2 },
+                { "label": "K2C (B2,C7)", "x": 11.75, "y": 2 },
+                { "label": "K30 (B3,F0)", "x": 0, "y": 3, "w": 1.25 },
+                { "label": "K31 (B3,F1)", "x": 1.25, "y": 3 },
+                { "label": "K32 (B3,F4)", "x": 2.25, "y": 3, "w": 1.25 },
+                { "label": "K36 (B3,B5)", "x": 3.5, "y": 3, "w": 6.25 },
+                { "label": "K3A (B3,D4)", "x": 9.75, "y": 3 },
+                { "label": "K3B (B3,D5)", "x": 10.75, "y": 3 },
+                { "label": "K3C (B3,C7)", "x": 11.75, "y": 3 }
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/handwired/carpolly/keymaps/default/keymap.c b/keyboards/handwired/carpolly/keymaps/default/keymap.c
new file mode 100644
index 0000000000..78eb95a77f
--- /dev/null
+++ b/keyboards/handwired/carpolly/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 Paul Enrico N. Vola
+ *
+ * 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
+
+#define LT3_TAB     LT(3, KC_TAB)
+#define LT2_LAL     LT(2, KC_LALT)
+#define LT1_TAB     LT(1, KC_LGUI)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, 
+        LT3_TAB, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_COLN, KC_ENT,  
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_SLSH, KC_UP,   MO(1),   
+        KC_LCTL, KC_LGUI,  LT2_LAL, KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT  
+    ),
+
+    [1] = LAYOUT(
+        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_CAPS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_ENT,  
+        KC_LSFT, KC_MPLY, KC_VOLD, KC_VOLU, _______, _______, _______, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, _______, 
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_HOME, KC_PGDN, KC_PGUP  
+    ),
+
+    [2] = LAYOUT(
+        RESET,   _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_INS,  
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT, _______, 
+        _______, _______, _______, _______, _______, KC_DEL,  KC_INS   
+    ),
+
+    [3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, KC_SPC,  _______, _______, _______  
+    ),
+
+};
diff --git a/keyboards/handwired/carpolly/readme.md b/keyboards/handwired/carpolly/readme.md
new file mode 100644
index 0000000000..e79bd543e6
--- /dev/null
+++ b/keyboards/handwired/carpolly/readme.md
@@ -0,0 +1,30 @@
+# carpolly
+
+![carpool](https://i.imgur.com/w691sNnh.jpg)
+
+* Keyboard Maintainer: Paul Enrico N. Viola (https://github.com/PollyV1)
+* Hardware Supported: Teensy 2 controller
+* Hardware Availability: [PollyV1] https://github.com/PollyV1/Carpolly
+
+carpolly - a handwired keyboard on a teensy 2 controller
+
+## Make 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/carpolly:default
+
+## Flashing
+
+Flashing example for this keyboard:
+
+    make handwired/carpolly:default:flash
+    
+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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the RESET button on the controller.
+* **Keycode in layout**: Longpress ALT + ESC
diff --git a/keyboards/handwired/carpolly/rules.mk b/keyboards/handwired/carpolly/rules.mk
new file mode 100644
index 0000000000..a7f3367d86
--- /dev/null
+++ b/keyboards/handwired/carpolly/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+# generated by KBFirmware JSON to QMK Parser
+# https://noroadsleft.github.io/kbf_qmk_converter/