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

7 files changed, 152 insertions, 0 deletions

diff --git a/keyboards/handwired/phantagom/baragon/info.json b/keyboards/handwired/phantagom/baragon/info.json
new file mode 100644
index 0000000000..47132a094e
--- /dev/null
+++ b/keyboards/handwired/phantagom/baragon/info.json
@@ -0,0 +1,68 @@
+{
+    "manufacturer": "Dennis Kruyt",
+    "keyboard_name": "phantagom/baragon",
+    "maintainer": "dkruyt",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true,
+    },
+    "rgblight": {
+        "led_count": 12,
+        "pin": "GP15",
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "GP6", "pin_b": "GP7", "resolution": 2 }
+        ]
+    },
+    "matrix_pins": {
+        "rows": [ "GP8", "GP10", "GP9" ],
+        "cols": [ "GP11", "GP12", "GP13", "GP14" ]
+    },
+    "processor": "RP2040",
+    "url": "https://github.com/dkruyt/mk/tree/main/baragon",
+    "usb": {
+        "vid": "0xF8E8",
+        "pid": "0x0004",
+        "device_version": "0.0.3"
+    },
+    "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": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2}
+
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/phantagom/baragon/keymaps/default/keymap.c b/keyboards/handwired/phantagom/baragon/keymaps/default/keymap.c
new file mode 100644
index 0000000000..96431bbedb
--- /dev/null
+++ b/keyboards/handwired/phantagom/baragon/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 <dennis@kruyt.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT( /* Base */
+    KC_P1,  KC_P2, KC_P3, KC_P4,
+    KC_P5,  KC_P6, KC_P7,
+    KC_P8,   MO(1),   KC_P9   
+  ),
+  [1] = LAYOUT(
+    RGB_TOG , RGB_MOD , RGB_HUI, _______,
+    _______, _______, _______,
+    _______, _______, _______
+  ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)  },
+    [1] = { ENCODER_CCW_CW(KC_MRWD, KC_MFFD)  },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/handwired/phantagom/baragon/keymaps/default/rules.mk b/keyboards/handwired/phantagom/baragon/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/handwired/phantagom/baragon/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/handwired/phantagom/baragon/keymaps/via/keymap.c b/keyboards/handwired/phantagom/baragon/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ee6b9d5ec6
--- /dev/null
+++ b/keyboards/handwired/phantagom/baragon/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 <dennis@kruyt.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT( /* Base */
+    KC_P1,  KC_P2, KC_P3, KC_P4,
+    KC_P5,  KC_P6, KC_P7,
+    KC_P8,   MO(1),   KC_P9   
+  ),
+  [1] = LAYOUT(
+    RGB_TOG , RGB_MOD , RGB_HUI, _______,
+    _______, _______, _______,
+    _______, _______, _______
+  ),
+};
+
+#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_MRWD, KC_MFFD)  },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/handwired/phantagom/baragon/keymaps/via/rules.mk b/keyboards/handwired/phantagom/baragon/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/handwired/phantagom/baragon/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/handwired/phantagom/baragon/readme.md b/keyboards/handwired/phantagom/baragon/readme.md
new file mode 100644
index 0000000000..e47616c0d8
--- /dev/null
+++ b/keyboards/handwired/phantagom/baragon/readme.md
@@ -0,0 +1,29 @@
+# phantagom/baragon
+
+[Baragon](https://en.wikipedia.org/wiki/Baragon) is a fictional monster, or kaiju, which first appeared in Ishirō Honda's 1965 film Frankenstein vs. Baragon.
+
+![phantagom/baragon](https://i.imgur.com/17RkGUPh.jpeg)
+
+A macro pad, 3x3 with rgb ring and rotary encoder, via compatible. Keys can be rotated, so macropad is usable at different angles.
+
+* Keyboard Maintainer: [Dennis Kruyt](https://github.com/dkruyt)
+* Project page: [baragon](https://github.com/dkruyt/mk/tree/main/baragon)
+* Hardware Supported: *RP2040-Zero*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make phantagom/baragon:default
+
+Flashing example for this keyboard:
+
+    Copy the uf2 file to the rp2040 
+
+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 mode  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 top of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/phantagom/baragon/rules.mk b/keyboards/handwired/phantagom/baragon/rules.mk
new file mode 100644
index 0000000000..bffd02535d
--- /dev/null
+++ b/keyboards/handwired/phantagom/baragon/rules.mk
@@ -0,0 +1,2 @@
+# Needed for RP2040
+WS2812_DRIVER = vendor
\ No newline at end of file