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

7 files changed, 228 insertions, 0 deletions

diff --git a/keyboards/handwired/polly40/config.h b/keyboards/handwired/polly40/config.h
new file mode 100644
index 0000000000..79dcced218
--- /dev/null
+++ b/keyboards/handwired/polly40/config.h
@@ -0,0 +1,24 @@
+/* Copyright 2023 PAUL ENRICO N. VIOLA @PollyV1
+ *
+ * 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
+/* 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
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/polly40/info.json b/keyboards/handwired/polly40/info.json
new file mode 100644
index 0000000000..69265ed6ec
--- /dev/null
+++ b/keyboards/handwired/polly40/info.json
@@ -0,0 +1,77 @@
+{
+    "keyboard_name": "polly40 v2",
+    "manufacturer": "paul",
+    "url": "https://github.com/PollyV1",
+    "maintainer": "Paul Enrico N. Viola",
+    "usb": {
+        "vid": "0x6532",
+        "pid": "0x0069",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "rows": ["F0", "F1", "F5", "B4"],
+        "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "backlight": false,
+        "rgblight": false,
+        "audio": false,
+        "key_lock": false
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "K00 (F0,F4)", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01 (F0,D7)", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02 (F0,B5)", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03 (F0,B6)", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04 (F0,C6)", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05 (F0,C7)", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06 (F0,D4)", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07 (F0,D6)", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08 (F0,D5)", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09 (F0,D0)", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A (F0,D1)", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B (F0,D2)", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K10 (F1,F4)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"label": "K11 (F1,D7)", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12 (F1,B5)", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13 (F1,B6)", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14 (F1,C6)", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15 (F1,C7)", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16 (F1,D4)", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17 (F1,D6)", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18 (F1,D5)", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19 (F1,D0)", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1B (F1,D2)", "matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+                {"label": "K20 (F5,F4)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K22 (F5,B5)", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "K23 (F5,B6)", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "K24 (F5,C6)", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "K25 (F5,C7)", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "K26 (F5,D4)", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "K27 (F5,D6)", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "K28 (F5,D5)", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K29 (F5,D0)", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "K2A (F5,D1)", "matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+                {"label": "K2B (F5,D2)", "matrix": [2, 11], "x": 11, "y": 2},
+                {"label": "K30 (B4,F4)", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31 (B4,D7)", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32 (B4,B5)", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K36 (B4,D4)", "matrix": [3, 6], "x": 3.25, "y": 3, "w": 6.25},
+                {"label": "K3A (B4,D1)", "matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"label": "K3B (B4,D2)", "matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
+           ]
+        }
+    },
+    "meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
\ No newline at end of file
diff --git a/keyboards/handwired/polly40/keymaps/default/keymap.c b/keyboards/handwired/polly40/keymaps/default/keymap.c
new file mode 100644
index 0000000000..130887fb90
--- /dev/null
+++ b/keyboards/handwired/polly40/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2023 PAUL ENRICO N. VIOLA @PollyV1
+ *
+ * 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(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, 
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,  
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_RSFT, MO(3),   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(2),   MO(1)    
+    ),
+
+    [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_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_ENT,  
+        KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, KC_INS,  KC_DEL,  KC_COMM, KC_DOT,  KC_SLSH, KC_PGUP, _______,   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_PGDN, _______  
+    ),
+
+    [2] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_INS,  
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_UP,   KC_DEL,  
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_LEFT, KC_DOWN, KC_RGHT, _______,   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  _______, _______  
+    ),
+
+    [3] = LAYOUT(
+        QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  _______, 
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, 
+        _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_SLSH, KC_RSFT, _______, 
+        _______, _______, _______, _______, _______, _______  
+    ),
+
+};
diff --git a/keyboards/handwired/polly40/keymaps/via/keymap.c b/keyboards/handwired/polly40/keymaps/via/keymap.c
new file mode 100644
index 0000000000..130887fb90
--- /dev/null
+++ b/keyboards/handwired/polly40/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2023 PAUL ENRICO N. VIOLA @PollyV1
+ *
+ * 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(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, 
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,  
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_RSFT, MO(3),   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(2),   MO(1)    
+    ),
+
+    [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_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_ENT,  
+        KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, KC_INS,  KC_DEL,  KC_COMM, KC_DOT,  KC_SLSH, KC_PGUP, _______,   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_PGDN, _______  
+    ),
+
+    [2] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_INS,  
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_UP,   KC_DEL,  
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_LEFT, KC_DOWN, KC_RGHT, _______,   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  _______, _______  
+    ),
+
+    [3] = LAYOUT(
+        QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  _______, 
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, 
+        _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_SLSH, KC_RSFT, _______, 
+        _______, _______, _______, _______, _______, _______  
+    ),
+
+};
diff --git a/keyboards/handwired/polly40/keymaps/via/rules.mk b/keyboards/handwired/polly40/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/handwired/polly40/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/polly40/readme.md b/keyboards/handwired/polly40/readme.md
new file mode 100644
index 0000000000..58e74febaf
--- /dev/null
+++ b/keyboards/handwired/polly40/readme.md
@@ -0,0 +1,26 @@
+# Polly40
+
+![Polly40](https://i.imgur.com/QJCQcFAh.jpg)
+
+A handwired 40% keyboard running a Pro micro Atmega32u4 controller
+
+* Keyboard Maintainer: [Paul Enrico N. Viola](https://github.com/PollyV1)
+* Hardware Supported: Atmega32u4 controller
+* Hardware Availability: https://shopee.ph/Pro-Micro-ATmega32U4-5V-16MHz-USB-Arduino-Compatible-i.20469516.225455828
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/polly40:default
+
+Flashing example for this keyboard:
+
+    make handwired/polly40: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 3 ways:
+
+* **Physical reset button**: Short Ground and RST pin
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/handwired/polly40/rules.mk b/keyboards/handwired/polly40/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/handwired/polly40/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file