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

keyboards/troyle/macro_keys_dual/keyboard.json

@@ -0,0 +1,44 @@
+{
+    "manufacturer": "troyle",
+    "keyboard_name": "troyle/macro_keys_dual",
+    "maintainer": "troyle",
+    "development_board": "promicro",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D1", "pin_b": "D0", "resolution": 2},
+            {"pin_a": "B4", "pin_b": "B5", "resolution": 2}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["F7", "F6", "F5", "F4"],
+            ["B6", "B2", "B3", "B1"]
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x7472"
+    },
+    "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},
+                {"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}
+            ]
+        }
+    }
+}

keyboards/troyle/macro_keys_dual/keymaps/default/keymap.c

@@ -0,0 +1,17 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(
+		KC_P1, KC_P2, KC_P3, KC_P4,
+		KC_P5, KC_P6, KC_P7, KC_P8
+	)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+	[0] = { ENCODER_CCW_CW(KC_LEFT_BRACKET, KC_RIGHT_BRACKET), ENCODER_CCW_CW(KC_KP_PLUS, KC_KP_MINUS) }
+};
+#endif

keyboards/troyle/macro_keys_dual/keymaps/default/rules.mk

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

keyboards/troyle/macro_keys_dual/readme.md

@@ -0,0 +1,27 @@
+# troyle/macro_keys_dual
+
+![troyle/macro_keys_dual](https://i.imgur.com/3rrOsde.png)
+
+A pretty simple macro keyboard that can use up to 2 rotary encoders
+
+* Keyboard Maintainer: [Tom Royle](https://github.com/tom-royle)
+* Hardware Supported: Sparkfun ProMicro in the troyle-macro-keyboard v1.0 PCB
+* Hardware Availability: You will have to contact me some how :)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make troyle/macro_keys_dual:default
+
+Flashing example for this keyboard:
+
+    make troyle/macro_keys_dual: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**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available