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

keyboards/handwired/cans12erv2/keyboard.json

@@ -0,0 +1,49 @@
+{
+    "manufacturer": "Can Baytok",
+    "keyboard_name": "Cans12erV2",
+    "maintainer": "canbaytok",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP14", "pin_b": "GP15"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP9", "GP10", "GP11", "GP12"],
+        "rows": ["GP13", "GP7", "GP8"]
+    },
+    "host_language": "german",
+    "processor": "RP2040",
+    "url": "https://github.com/canbaytok/Cans12erV2",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xABC0",
+        "vid": "0x4342"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0, "encoder": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2}
+            ]
+        }
+    }
+}

keyboards/handwired/cans12erv2/keymaps/default/keymap.c

@@ -0,0 +1,17 @@
+// Copyright 2024 Can Baytok (https://github.com/canbaytok)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_A, KC_B, KC_C, KC_D,
+        KC_E, KC_F, KC_G, KC_H,
+        KC_I, KC_J, KC_K, KC_L
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
+};
+#endif

keyboards/handwired/cans12erv2/keymaps/default/rules.mk

@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes

keyboards/handwired/cans12erv2/readme.md

@@ -0,0 +1,27 @@
+# Cans12erV2
+![Cans12erV2](https://i.imgur.com/3fkbydJ.png)
+
+New version of my 12-key orthogonal macro keypad with hot swappable keyswitch support and an encoder knob.
+
+* Keyboard Maintainer: [Can Baytok](https://github.com/canbaytok)
+* Build Instructions: [Github](https://github.com/canbaytok/Cans12erV2)
+* Hardware Supported: RP2040 Zero
+* Hardware Availability: amazon, aliexpress (RP2040 Zero clones work too)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/cans12erv2:default
+
+Flashing example for this keyboard:
+
+    make handwired/cans12erv2: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:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Quickly double press the reset button on the PCB to make the RP2040 boot into its uf2 mode
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available