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

7 files changed, 268 insertions, 0 deletions

diff --git a/keyboards/meletrix/zoom75/info.json b/keyboards/meletrix/zoom75/info.json
new file mode 100644
index 0000000000..9fd3bb8522
--- /dev/null
+++ b/keyboards/meletrix/zoom75/info.json
@@ -0,0 +1,148 @@
+{
+  "keyboard_name": "zoom75",
+  "manufacturer": "meletrix",
+  "url": "https://meletrix.com/products/zoom75-essential-edition-black-wired",
+  "maintainer": "spbgzh",
+  "usb": {
+    "vid": "0x806D",
+    "pid": "0x0006",
+    "device_version": "0.0.1"
+  },
+  "encoder": {
+    "rotary": [
+        {"pin_a": "B0", "pin_b": "B1", "resolution": 2}
+    ]
+},
+  "indicators": {
+    "caps_lock": "F6",
+    "on_state": 0
+  },
+  "diode_direction": "COL2ROW",
+  "features": {
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "encoder": true
+  },
+  "matrix_pins": {
+    "rows": ["F4", "F1", "F0", "C6", "B6", "F5"],
+    "cols": [
+      "C7",
+      "D5",
+      "B5",
+      "B4",
+      "D7",
+      "D6",
+      "D4",
+      "D3",
+      "D2",
+      "D1",
+      "D0",
+      "B7",
+      "B2",
+      "B3",
+      "F7"
+    ]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 },
+        { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 },
+        { "matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0 },
+        { "matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0 },
+        { "matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0 },
+        { "matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0 },
+        { "matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0 },
+        { "matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0 },
+        { "matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0 },
+        { "matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0 },
+        { "matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0 },
+        { "matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0 },
+        { "matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0 },
+        { "matrix": [0, 13], "label": "F13", "x": 14, "y": 0 },
+        { "matrix": [0, 14], "label": "Encoder", "x": 15, "y": 0 },
+
+        { "matrix": [1, 0], "label": "~", "x": 0, "y": 1.25 },
+        { "matrix": [1, 1], "label": "1", "x": 1, "y": 1.25 },
+        { "matrix": [1, 2], "label": "2", "x": 2, "y": 1.25 },
+        { "matrix": [1, 3], "label": "3", "x": 3, "y": 1.25 },
+        { "matrix": [1, 4], "label": "4", "x": 4, "y": 1.25 },
+        { "matrix": [1, 5], "label": "5", "x": 5, "y": 1.25 },
+        { "matrix": [1, 6], "label": "6", "x": 6, "y": 1.25 },
+        { "matrix": [1, 7], "label": "7", "x": 7, "y": 1.25 },
+        { "matrix": [1, 8], "label": "8", "x": 8, "y": 1.25 },
+        { "matrix": [1, 9], "label": "9", "x": 9, "y": 1.25 },
+        { "matrix": [1, 10], "label": "0", "x": 10, "y": 1.25 },
+        { "matrix": [1, 11], "label": "-", "x": 11, "y": 1.25 },
+        { "matrix": [1, 12], "label": "=", "x": 12, "y": 1.25 },
+        { "matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25 },
+        { "matrix": [3, 13], "label": "Backspace1", "x": 14, "y": 1.25 },
+        { "matrix": [1, 14], "label": "Delect", "x": 15, "y": 1.25 },
+
+        { "matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25 },
+        { "matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25 },
+        { "matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25 },
+        { "matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25 },
+        { "matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25 },
+        { "matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25 },
+        { "matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25 },
+        { "matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25 },
+        { "matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25 },
+        { "matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25 },
+        { "matrix": [2, 11], "label": "[", "x": 11.5, "y": 2.25 },
+        { "matrix": [2, 12], "label": "]", "x": 12.5, "y": 2.25 },
+        { "matrix": [2, 13], "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "matrix": [2, 14], "label": "PageUp", "x": 15, "y": 2.25 },
+
+        { "matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25 },
+        { "matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25 },
+        { "matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25 },
+        { "matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25 },
+        { "matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25 },
+        { "matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25 },
+        { "matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25 },
+        { "matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25 },
+        { "matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25 },
+        { "matrix": [3, 10], "label": ";", "x": 10.75, "y": 3.25 },
+        { "matrix": [3, 11], "label": "'", "x": 11.75, "y": 3.25 },
+        { "matrix": [3, 12], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "matrix": [3, 14], "label": "PageDown", "x": 15, "y": 3.25 },
+
+        { "matrix": [4, 0], "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
+        { "matrix": [4, 1], "label": "Shift2", "x": 1.25, "y": 4.25 },
+        { "matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25 },
+        { "matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25 },
+        { "matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25 },
+        { "matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25 },
+        { "matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25 },
+        { "matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25 },
+        { "matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25 },
+        { "matrix": [4, 9], "label": ",", "x": 9.25, "y": 4.25 },
+        { "matrix": [4, 10], "label": ".", "x": 10.25, "y": 4.25 },
+        { "matrix": [4, 11], "label": "/", "x": 11.25, "y": 4.25 },
+        { "matrix": [4, 12], "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
+        { "matrix": [4, 13], "label": "\u2191", "x": 14, "y": 4.25 },
+
+        { "matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
+        { "matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
+        { "matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
+        { "matrix": [5, 5], "label": "Space","x": 3.75, "y": 5.25, "w": 2.25 },
+        { "matrix": [5, 6], "label": "Space","x": 6, "y": 5.25, "w": 1.25 },
+        { "matrix": [5, 7], "label": "Space","x": 7.25, "y": 5.25, "w": 2.75 },
+        { "matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
+        { "matrix": [5, 10], "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25 },
+        { "matrix": [5, 12], "label": "\u2190", "x": 13, "y": 5.25 },
+        { "matrix": [5, 13], "label": "\u2193", "x": 14, "y": 5.25 },
+        { "matrix": [5, 14], "label": "\u2192", "x": 15, "y": 5.25 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/meletrix/zoom75/keymaps/default/keymap.c b/keyboards/meletrix/zoom75/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b1cbfb9e9f
--- /dev/null
+++ b/keyboards/meletrix/zoom75/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 meletrix
+ *
+ * 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
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] =  { ENCODER_CCW_CW(KC_MPRV, KC_MNXT),  },
+};
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
+    [0] = LAYOUT(
+        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_F13,  KC_MUTE,
+        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_DEL,
+        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_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_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______,          _______, _______, _______
+    ),
+};
diff --git a/keyboards/meletrix/zoom75/keymaps/default/rules.mk b/keyboards/meletrix/zoom75/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/meletrix/zoom75/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/meletrix/zoom75/keymaps/via/keymap.c b/keyboards/meletrix/zoom75/keymaps/via/keymap.c
new file mode 100644
index 0000000000..00fa34dd13
--- /dev/null
+++ b/keyboards/meletrix/zoom75/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2023 meletrix
+ *
+ * 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
+
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = {  ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] = {  ENCODER_CCW_CW(KC_MNXT, KC_MPRV)  },
+};
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
+    [0] = LAYOUT(
+        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_F13,  KC_MUTE,
+        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_DEL,
+        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_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_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______,          _______, _______, _______
+    ),
+};
diff --git a/keyboards/meletrix/zoom75/keymaps/via/rules.mk b/keyboards/meletrix/zoom75/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f48a8b1056
--- /dev/null
+++ b/keyboards/meletrix/zoom75/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+
diff --git a/keyboards/meletrix/zoom75/readme.md b/keyboards/meletrix/zoom75/readme.md
new file mode 100644
index 0000000000..060889ce04
--- /dev/null
+++ b/keyboards/meletrix/zoom75/readme.md
@@ -0,0 +1,27 @@
+# Zoom75
+
+More Info at [Zoom75 Wired Version](https://meletrix.com/products/zoom75-essential-edition-black-wired)
+​
+
+* Keyboard Maintainer: [spbgzh](https://github.com/spbgzh)
+* Hardware Supported: Zoom75 Wired Version
+* Hardware Availability: [zoom75](https://meletrix.com/products/zoom75-essential-edition-black-wired)  
+​
+
+Make example for this keyboard (after setting up your build environment):  
+
+    make meletrix/zoom75:default
+
+Flashing example for this keyboard:
+
+    make meletrix/zoom75:default:flash
+
+## Bootloader
+
+Enter the bootloader using one of the following methods:
+
+* Tap the Reset switch mounted on the PCB
+* In the case of the default keymap, use the key combination Fn + Delete
+* Hold the Esc key while connecting the USB cable (also erases persistent settings)
+
+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/meletrix/zoom75/rules.mk b/keyboards/meletrix/zoom75/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/meletrix/zoom75/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank