From 51a49f8c56aa9329f2859d8c6ae00dbc2c5f848c Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 15:20:54 +0200 Subject: [PATCH 01/23] add baragon marcopad --- keyboards/phantagom/baragon/config.h | 23 ++++++ keyboards/phantagom/baragon/info.json | 75 +++++++++++++++++++ .../baragon/keymaps/default/keymap.c | 41 ++++++++++ .../phantagom/baragon/keymaps/via/keymap.c | 41 ++++++++++ .../phantagom/baragon/keymaps/via/rules.mk | 1 + keyboards/phantagom/baragon/readme.md | 28 +++++++ keyboards/phantagom/baragon/rules.mk | 2 + 7 files changed, 211 insertions(+) create mode 100644 keyboards/phantagom/baragon/config.h create mode 100644 keyboards/phantagom/baragon/info.json create mode 100644 keyboards/phantagom/baragon/keymaps/default/keymap.c create mode 100644 keyboards/phantagom/baragon/keymaps/via/keymap.c create mode 100644 keyboards/phantagom/baragon/keymaps/via/rules.mk create mode 100644 keyboards/phantagom/baragon/readme.md create mode 100644 keyboards/phantagom/baragon/rules.mk diff --git a/keyboards/phantagom/baragon/config.h b/keyboards/phantagom/baragon/config.h new file mode 100644 index 000000000000..a2023210f12a --- /dev/null +++ b/keyboards/phantagom/baragon/config.h @@ -0,0 +1,23 @@ +// Copyright 2023 Dennis Kruyt (@dkruyt) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +//RGB +#define NOP_FUDGE 0.4 \ No newline at end of file diff --git a/keyboards/phantagom/baragon/info.json b/keyboards/phantagom/baragon/info.json new file mode 100644 index 000000000000..5c3ed95241b7 --- /dev/null +++ b/keyboards/phantagom/baragon/info.json @@ -0,0 +1,75 @@ +{ + "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", + "hue_steps": 10, + "saturation_steps": 17, + "brightness_steps": 17, + "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 + } + }, + "bootmagic": { + "enabled": true, + "matrix": [0, 0] + }, + "encoder": { + "rotary": [ + { "pin_a": "GP6", "pin_b": "GP7", "resolution": 2 } + ] + }, + "matrix_pins": { + "rows": [ "GP8", "GP10", "GP9" ], + "cols": [ "GP11", "GP12", "GP13", "GP14" ] + }, + "processor": "RP2040", + "url": "", + "usb": { + "vid": "0xF8E8", + "pid": "0x0004", + "device_version": "0.0.3" + }, + "layouts": { + "LAYOUT_numpad_3x4": { + "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} + + ] + } + } +} \ No newline at end of file diff --git a/keyboards/phantagom/baragon/keymaps/default/keymap.c b/keyboards/phantagom/baragon/keymaps/default/keymap.c new file mode 100644 index 000000000000..e56c9916dc1e --- /dev/null +++ b/keyboards/phantagom/baragon/keymaps/default/keymap.c @@ -0,0 +1,41 @@ +// Copyright 2023 +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum Layer { + _NUMPAD = 0, // Standard QWERTY layer +}; +#define _NP _NUMPAD + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_numpad_3x4( /* Base */ + KC_P1, KC_P2, KC_P3, KC_P4, + KC_P5, KC_P6, KC_P7, + KC_P8, MO(1), KC_P9 + ), + [1] = LAYOUT_numpad_3x4( + RGB_TOG , RGB_MOD , RGB_HUI, _______, + _______, _______, _______, + _______, _______, _______ + ), + [2] = LAYOUT_numpad_3x4( + RGB_TOG , RGB_MOD , RGB_HUI, _______, + _______, _______, _______, + _______, _______, _______ + ), + [3] = LAYOUT_numpad_3x4( + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______ + ), +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLD); + } else { + tap_code(KC_VOLU); + } + return true; +} diff --git a/keyboards/phantagom/baragon/keymaps/via/keymap.c b/keyboards/phantagom/baragon/keymaps/via/keymap.c new file mode 100644 index 000000000000..95e18fbc69ec --- /dev/null +++ b/keyboards/phantagom/baragon/keymaps/via/keymap.c @@ -0,0 +1,41 @@ +// Copyright 2023 +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum Layer { + _NUMPAD = 0, // Standard QWERTY layer +}; +#define _NP _NUMPAD + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_numpad_3x4( /* Base */ + KC_P1, KC_P2, KC_P3, KC_P4, + KC_P5, KC_P6, KC_P7, + KC_P8, MO(1), KC_P9 + ), + [1] = LAYOUT_numpad_3x4( + RGB_TOG , RGB_MOD , RGB_HUI, _______, + _______, _______, _______, + _______, _______, _______ + ), + [2] = LAYOUT_numpad_3x4( + RGB_TOG , RGB_MOD , RGB_HUI, _______, + _______, _______, _______, + _______, _______, _______ + ), + [3] = LAYOUT_numpad_3x4( + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______ + ), +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLD); + } else { + tap_code(KC_VOLU); + } + return true; +} \ No newline at end of file diff --git a/keyboards/phantagom/baragon/keymaps/via/rules.mk b/keyboards/phantagom/baragon/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/phantagom/baragon/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/phantagom/baragon/readme.md b/keyboards/phantagom/baragon/readme.md new file mode 100644 index 000000000000..551445bf35a7 --- /dev/null +++ b/keyboards/phantagom/baragon/readme.md @@ -0,0 +1,28 @@ +# 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/17RkGUP.jpeg) + +A marco pad, 3x3 with rgb ring and rotary encoder, via compatible. Key's can be rotated, so marcopad is useable 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 bootluf2 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/phantagom/baragon/rules.mk b/keyboards/phantagom/baragon/rules.mk new file mode 100644 index 000000000000..bffd02535de1 --- /dev/null +++ b/keyboards/phantagom/baragon/rules.mk @@ -0,0 +1,2 @@ +# Needed for RP2040 +WS2812_DRIVER = vendor \ No newline at end of file From f54b565839f92645bb7c60e8f1d2741f86d00776 Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 16:49:03 +0200 Subject: [PATCH 02/23] Update keyboards/phantagom/baragon/config.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> --- keyboards/phantagom/baragon/config.h | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/keyboards/phantagom/baragon/config.h b/keyboards/phantagom/baragon/config.h index a2023210f12a..e69de29bb2d1 100644 --- a/keyboards/phantagom/baragon/config.h +++ b/keyboards/phantagom/baragon/config.h @@ -1,23 +0,0 @@ -// Copyright 2023 Dennis Kruyt (@dkruyt) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT - -//RGB -#define NOP_FUDGE 0.4 \ No newline at end of file From 51380f553c350a5a2adba730fcb64d8d46d0e897 Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 16:49:15 +0200 Subject: [PATCH 03/23] Update keyboards/phantagom/baragon/info.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> --- keyboards/phantagom/baragon/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phantagom/baragon/info.json b/keyboards/phantagom/baragon/info.json index 5c3ed95241b7..798fdc14e863 100644 --- a/keyboards/phantagom/baragon/info.json +++ b/keyboards/phantagom/baragon/info.json @@ -47,7 +47,7 @@ "cols": [ "GP11", "GP12", "GP13", "GP14" ] }, "processor": "RP2040", - "url": "", + "url": "https://github.com/dkruyt/mk/tree/main/baragon", "usb": { "vid": "0xF8E8", "pid": "0x0004", From d874061932b62ad485083cdbe8bf6503fdadab04 Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 16:49:58 +0200 Subject: [PATCH 04/23] Update keyboards/phantagom/baragon/keymaps/default/keymap.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> --- keyboards/phantagom/baragon/keymaps/default/keymap.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/keyboards/phantagom/baragon/keymaps/default/keymap.c b/keyboards/phantagom/baragon/keymaps/default/keymap.c index e56c9916dc1e..acaea42395ce 100644 --- a/keyboards/phantagom/baragon/keymaps/default/keymap.c +++ b/keyboards/phantagom/baragon/keymaps/default/keymap.c @@ -19,16 +19,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_numpad_3x4( - RGB_TOG , RGB_MOD , RGB_HUI, _______, - _______, _______, _______, - _______, _______, _______ - ), - [3] = LAYOUT_numpad_3x4( - _______, _______, _______, _______, - _______, _______, _______, - _______, _______, _______ - ), }; bool encoder_update_user(uint8_t index, bool clockwise) { From ef4fb39708af6ec96ddf51a749e757147c9c05cf Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 16:50:38 +0200 Subject: [PATCH 05/23] Update keyboards/phantagom/baragon/keymaps/via/keymap.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> --- keyboards/phantagom/baragon/keymaps/via/keymap.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/phantagom/baragon/keymaps/via/keymap.c b/keyboards/phantagom/baragon/keymaps/via/keymap.c index 95e18fbc69ec..a34c7751fb32 100644 --- a/keyboards/phantagom/baragon/keymaps/via/keymap.c +++ b/keyboards/phantagom/baragon/keymaps/via/keymap.c @@ -3,10 +3,6 @@ #include QMK_KEYBOARD_H -enum Layer { - _NUMPAD = 0, // Standard QWERTY layer -}; -#define _NP _NUMPAD const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_numpad_3x4( /* Base */ From c29b50fe383ca6531db28083962739e5376ba651 Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 16:50:47 +0200 Subject: [PATCH 06/23] Update keyboards/phantagom/baragon/keymaps/default/keymap.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> --- keyboards/phantagom/baragon/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phantagom/baragon/keymaps/default/keymap.c b/keyboards/phantagom/baragon/keymaps/default/keymap.c index acaea42395ce..a9db09923581 100644 --- a/keyboards/phantagom/baragon/keymaps/default/keymap.c +++ b/keyboards/phantagom/baragon/keymaps/default/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P5, KC_P6, KC_P7, KC_P8, MO(1), KC_P9 ), - [1] = LAYOUT_numpad_3x4( + [1] = LAYOUT( RGB_TOG , RGB_MOD , RGB_HUI, _______, _______, _______, _______, _______, _______, _______ From e181fcc8cdbae4f3b58e9e1297fc53cf3ae6badd Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 16:50:57 +0200 Subject: [PATCH 07/23] Update keyboards/phantagom/baragon/keymaps/via/keymap.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> --- keyboards/phantagom/baragon/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phantagom/baragon/keymaps/via/keymap.c b/keyboards/phantagom/baragon/keymaps/via/keymap.c index a34c7751fb32..5339058032c2 100644 --- a/keyboards/phantagom/baragon/keymaps/via/keymap.c +++ b/keyboards/phantagom/baragon/keymaps/via/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P5, KC_P6, KC_P7, KC_P8, MO(1), KC_P9 ), - [1] = LAYOUT_numpad_3x4( + [1] = LAYOUT( RGB_TOG , RGB_MOD , RGB_HUI, _______, _______, _______, _______, _______, _______, _______ From 55b88afe2899e3010336f46389b3ef23f542d1a0 Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 16:51:03 +0200 Subject: [PATCH 08/23] Update keyboards/phantagom/baragon/keymaps/via/keymap.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> --- keyboards/phantagom/baragon/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phantagom/baragon/keymaps/via/keymap.c b/keyboards/phantagom/baragon/keymaps/via/keymap.c index 5339058032c2..6c1e2fd1a54c 100644 --- a/keyboards/phantagom/baragon/keymaps/via/keymap.c +++ b/keyboards/phantagom/baragon/keymaps/via/keymap.c @@ -5,7 +5,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_numpad_3x4( /* Base */ + [0] = LAYOUT( /* Base */ KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, MO(1), KC_P9 From e9a2e2fd6c0688b7756850c1eb981ec664c0c9fd Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 16:51:09 +0200 Subject: [PATCH 09/23] Update keyboards/phantagom/baragon/keymaps/default/keymap.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> --- keyboards/phantagom/baragon/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phantagom/baragon/keymaps/default/keymap.c b/keyboards/phantagom/baragon/keymaps/default/keymap.c index a9db09923581..71127f62fbaf 100644 --- a/keyboards/phantagom/baragon/keymaps/default/keymap.c +++ b/keyboards/phantagom/baragon/keymaps/default/keymap.c @@ -9,7 +9,7 @@ enum Layer { #define _NP _NUMPAD const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_numpad_3x4( /* Base */ + [0] = LAYOUT( /* Base */ KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, MO(1), KC_P9 From f6adb54273b86211a1d75f6ba5a6a9cf130b49cf Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 16:51:21 +0200 Subject: [PATCH 10/23] Update keyboards/phantagom/baragon/info.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> --- keyboards/phantagom/baragon/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phantagom/baragon/info.json b/keyboards/phantagom/baragon/info.json index 798fdc14e863..dee9c9e42ad7 100644 --- a/keyboards/phantagom/baragon/info.json +++ b/keyboards/phantagom/baragon/info.json @@ -54,7 +54,7 @@ "device_version": "0.0.3" }, "layouts": { - "LAYOUT_numpad_3x4": { + "LAYOUT": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, From bce41208382e87fe747d2ce53e566de53a5d1b4b Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 16:51:37 +0200 Subject: [PATCH 11/23] Update keyboards/phantagom/baragon/keymaps/via/keymap.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> --- keyboards/phantagom/baragon/keymaps/via/keymap.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/keyboards/phantagom/baragon/keymaps/via/keymap.c b/keyboards/phantagom/baragon/keymaps/via/keymap.c index 6c1e2fd1a54c..c949f4f915f6 100644 --- a/keyboards/phantagom/baragon/keymaps/via/keymap.c +++ b/keyboards/phantagom/baragon/keymaps/via/keymap.c @@ -15,16 +15,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_numpad_3x4( - RGB_TOG , RGB_MOD , RGB_HUI, _______, - _______, _______, _______, - _______, _______, _______ - ), - [3] = LAYOUT_numpad_3x4( - _______, _______, _______, _______, - _______, _______, _______, - _______, _______, _______ - ), }; bool encoder_update_user(uint8_t index, bool clockwise) { From 34891ba6a9edeaefa1942a592b06ac1a9254ebc1 Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 16:51:47 +0200 Subject: [PATCH 12/23] Update keyboards/phantagom/baragon/keymaps/default/keymap.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> --- keyboards/phantagom/baragon/keymaps/default/keymap.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/phantagom/baragon/keymaps/default/keymap.c b/keyboards/phantagom/baragon/keymaps/default/keymap.c index 71127f62fbaf..31620aff6c99 100644 --- a/keyboards/phantagom/baragon/keymaps/default/keymap.c +++ b/keyboards/phantagom/baragon/keymaps/default/keymap.c @@ -3,10 +3,6 @@ #include QMK_KEYBOARD_H -enum Layer { - _NUMPAD = 0, // Standard QWERTY layer -}; -#define _NP _NUMPAD const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* Base */ From ebcdb7dd65c22f7f2a48087b7220046145a03f3a Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 16:52:07 +0200 Subject: [PATCH 13/23] Update keyboards/phantagom/baragon/readme.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> --- keyboards/phantagom/baragon/readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/phantagom/baragon/readme.md b/keyboards/phantagom/baragon/readme.md index 551445bf35a7..be00dfb13b42 100644 --- a/keyboards/phantagom/baragon/readme.md +++ b/keyboards/phantagom/baragon/readme.md @@ -7,7 +7,8 @@ A marco pad, 3x3 with rgb ring and rotary encoder, via compatible. Key's can be rotated, so marcopad is useable 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* +* 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): From d2305db00369253ea20ffe7a98c610161887e119 Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 17:08:24 +0200 Subject: [PATCH 14/23] Update keyboards/phantagom/baragon/info.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> --- keyboards/phantagom/baragon/info.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/phantagom/baragon/info.json b/keyboards/phantagom/baragon/info.json index dee9c9e42ad7..c8dd944ebce5 100644 --- a/keyboards/phantagom/baragon/info.json +++ b/keyboards/phantagom/baragon/info.json @@ -33,10 +33,6 @@ "twinkle": true } }, - "bootmagic": { - "enabled": true, - "matrix": [0, 0] - }, "encoder": { "rotary": [ { "pin_a": "GP6", "pin_b": "GP7", "resolution": 2 } From 3da293bb649dee4948e56c9bc1c8cb1ddc2b773a Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 17:11:39 +0200 Subject: [PATCH 15/23] remove empty config.h --- keyboards/phantagom/baragon/config.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 keyboards/phantagom/baragon/config.h diff --git a/keyboards/phantagom/baragon/config.h b/keyboards/phantagom/baragon/config.h deleted file mode 100644 index e69de29bb2d1..000000000000 From e3d679ac60abc47c0c618dcc01a6536f38a38177 Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 17:39:47 +0200 Subject: [PATCH 16/23] use encoder map --- keyboards/phantagom/baragon/info.json | 3 ++- .../phantagom/baragon/keymaps/default/keymap.c | 14 ++++++-------- keyboards/phantagom/baragon/keymaps/via/keymap.c | 14 ++++++-------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/keyboards/phantagom/baragon/info.json b/keyboards/phantagom/baragon/info.json index c8dd944ebce5..f0adb1df28e1 100644 --- a/keyboards/phantagom/baragon/info.json +++ b/keyboards/phantagom/baragon/info.json @@ -12,7 +12,8 @@ "mousekey": true, "nkro": true, "rgblight": true, - "encoder": true + "encoder": true, + "encoder_map": true }, "rgblight": { "led_count": 12, diff --git a/keyboards/phantagom/baragon/keymaps/default/keymap.c b/keyboards/phantagom/baragon/keymaps/default/keymap.c index 31620aff6c99..36e8ea691609 100644 --- a/keyboards/phantagom/baragon/keymaps/default/keymap.c +++ b/keyboards/phantagom/baragon/keymaps/default/keymap.c @@ -17,11 +17,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLD); - } else { - tap_code(KC_VOLU); - } - return true; -} +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][1] = { + [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/phantagom/baragon/keymaps/via/keymap.c b/keyboards/phantagom/baragon/keymaps/via/keymap.c index c949f4f915f6..ee6b9d5ec6df 100644 --- a/keyboards/phantagom/baragon/keymaps/via/keymap.c +++ b/keyboards/phantagom/baragon/keymaps/via/keymap.c @@ -17,11 +17,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLD); - } else { - tap_code(KC_VOLU); - } - return true; -} \ No newline at end of file +#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 From 5e28ee90155581ff2a04a9a0eba56d5e6a694544 Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 18:04:12 +0200 Subject: [PATCH 17/23] use encoder map --- keyboards/phantagom/baragon/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phantagom/baragon/keymaps/default/keymap.c b/keyboards/phantagom/baragon/keymaps/default/keymap.c index 36e8ea691609..96431bbedbac 100644 --- a/keyboards/phantagom/baragon/keymaps/default/keymap.c +++ b/keyboards/phantagom/baragon/keymaps/default/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][1] = { +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) }, }; From fed3970ca7976d5e9d371a37b158ec1a0ebbee9e Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 18:10:18 +0200 Subject: [PATCH 18/23] Update keyboards/phantagom/baragon/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/phantagom/baragon/info.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/phantagom/baragon/info.json b/keyboards/phantagom/baragon/info.json index f0adb1df28e1..e9376486a097 100644 --- a/keyboards/phantagom/baragon/info.json +++ b/keyboards/phantagom/baragon/info.json @@ -18,9 +18,6 @@ "rgblight": { "led_count": 12, "pin": "GP15", - "hue_steps": 10, - "saturation_steps": 17, - "brightness_steps": 17, "animations": { "alternating": true, "breathing": true, From b1a38ac867ec8c630166cef0efc69bce320d6041 Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Mon, 24 Apr 2023 19:06:10 +0200 Subject: [PATCH 19/23] ENCODER_MAP_ENABLE to keymaps rules.mk --- keyboards/phantagom/baragon/info.json | 3 +-- keyboards/phantagom/baragon/keymaps/default/rules.mk | 1 + keyboards/phantagom/baragon/keymaps/via/rules.mk | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 keyboards/phantagom/baragon/keymaps/default/rules.mk diff --git a/keyboards/phantagom/baragon/info.json b/keyboards/phantagom/baragon/info.json index e9376486a097..47132a094e0a 100644 --- a/keyboards/phantagom/baragon/info.json +++ b/keyboards/phantagom/baragon/info.json @@ -13,7 +13,6 @@ "nkro": true, "rgblight": true, "encoder": true, - "encoder_map": true }, "rgblight": { "led_count": 12, @@ -66,4 +65,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/phantagom/baragon/keymaps/default/rules.mk b/keyboards/phantagom/baragon/keymaps/default/rules.mk new file mode 100644 index 000000000000..ee325681483f --- /dev/null +++ b/keyboards/phantagom/baragon/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/phantagom/baragon/keymaps/via/rules.mk b/keyboards/phantagom/baragon/keymaps/via/rules.mk index 1e5b99807cb7..f1adcab005e8 100644 --- a/keyboards/phantagom/baragon/keymaps/via/rules.mk +++ b/keyboards/phantagom/baragon/keymaps/via/rules.mk @@ -1 +1,2 @@ VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes From 6802a02f83a51d062d9a57ea61d7c5aa0d2d72bb Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Tue, 25 Apr 2023 13:01:40 +0200 Subject: [PATCH 20/23] Update keyboards/phantagom/baragon/readme.md Co-authored-by: Drashna Jaelre --- keyboards/phantagom/baragon/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phantagom/baragon/readme.md b/keyboards/phantagom/baragon/readme.md index be00dfb13b42..66d1bcf6ff70 100644 --- a/keyboards/phantagom/baragon/readme.md +++ b/keyboards/phantagom/baragon/readme.md @@ -2,7 +2,7 @@ [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/17RkGUP.jpeg) +![phantagom/baragon](https://i.imgur.com/17RkGUPh.jpeg) A marco pad, 3x3 with rgb ring and rotary encoder, via compatible. Key's can be rotated, so marcopad is useable at different angles. From 6dba886238e6f15fe727aa7eb1b2e55e7699d3bc Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Thu, 27 Apr 2023 13:33:40 +0200 Subject: [PATCH 21/23] Update keyboards/phantagom/baragon/readme.md Co-authored-by: Tom Barnes --- keyboards/phantagom/baragon/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phantagom/baragon/readme.md b/keyboards/phantagom/baragon/readme.md index 66d1bcf6ff70..2d4c22ce164f 100644 --- a/keyboards/phantagom/baragon/readme.md +++ b/keyboards/phantagom/baragon/readme.md @@ -4,7 +4,7 @@ ![phantagom/baragon](https://i.imgur.com/17RkGUPh.jpeg) -A marco pad, 3x3 with rgb ring and rotary encoder, via compatible. Key's can be rotated, so marcopad is useable at different angles. +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) From bd2ce6feae7ca39bab28194689640e8030b950d9 Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Thu, 27 Apr 2023 13:33:47 +0200 Subject: [PATCH 22/23] Update keyboards/phantagom/baragon/readme.md Co-authored-by: Tom Barnes --- keyboards/phantagom/baragon/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/phantagom/baragon/readme.md b/keyboards/phantagom/baragon/readme.md index 2d4c22ce164f..e47616c0d80c 100644 --- a/keyboards/phantagom/baragon/readme.md +++ b/keyboards/phantagom/baragon/readme.md @@ -22,7 +22,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to ## Bootloader -Enter the bootluf2 mode in 3 ways: +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 From 11461afb4263c7a785cfc3c81424f44233518d43 Mon Sep 17 00:00:00 2001 From: Dennis Kruyt Date: Sat, 29 Apr 2023 07:29:04 +0200 Subject: [PATCH 23/23] move handwired --- keyboards/{ => handwired}/phantagom/baragon/info.json | 0 .../{ => handwired}/phantagom/baragon/keymaps/default/keymap.c | 0 .../{ => handwired}/phantagom/baragon/keymaps/default/rules.mk | 0 keyboards/{ => handwired}/phantagom/baragon/keymaps/via/keymap.c | 0 keyboards/{ => handwired}/phantagom/baragon/keymaps/via/rules.mk | 0 keyboards/{ => handwired}/phantagom/baragon/readme.md | 0 keyboards/{ => handwired}/phantagom/baragon/rules.mk | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/{ => handwired}/phantagom/baragon/info.json (100%) rename keyboards/{ => handwired}/phantagom/baragon/keymaps/default/keymap.c (100%) rename keyboards/{ => handwired}/phantagom/baragon/keymaps/default/rules.mk (100%) rename keyboards/{ => handwired}/phantagom/baragon/keymaps/via/keymap.c (100%) rename keyboards/{ => handwired}/phantagom/baragon/keymaps/via/rules.mk (100%) rename keyboards/{ => handwired}/phantagom/baragon/readme.md (100%) rename keyboards/{ => handwired}/phantagom/baragon/rules.mk (100%) diff --git a/keyboards/phantagom/baragon/info.json b/keyboards/handwired/phantagom/baragon/info.json similarity index 100% rename from keyboards/phantagom/baragon/info.json rename to keyboards/handwired/phantagom/baragon/info.json diff --git a/keyboards/phantagom/baragon/keymaps/default/keymap.c b/keyboards/handwired/phantagom/baragon/keymaps/default/keymap.c similarity index 100% rename from keyboards/phantagom/baragon/keymaps/default/keymap.c rename to keyboards/handwired/phantagom/baragon/keymaps/default/keymap.c diff --git a/keyboards/phantagom/baragon/keymaps/default/rules.mk b/keyboards/handwired/phantagom/baragon/keymaps/default/rules.mk similarity index 100% rename from keyboards/phantagom/baragon/keymaps/default/rules.mk rename to keyboards/handwired/phantagom/baragon/keymaps/default/rules.mk diff --git a/keyboards/phantagom/baragon/keymaps/via/keymap.c b/keyboards/handwired/phantagom/baragon/keymaps/via/keymap.c similarity index 100% rename from keyboards/phantagom/baragon/keymaps/via/keymap.c rename to keyboards/handwired/phantagom/baragon/keymaps/via/keymap.c diff --git a/keyboards/phantagom/baragon/keymaps/via/rules.mk b/keyboards/handwired/phantagom/baragon/keymaps/via/rules.mk similarity index 100% rename from keyboards/phantagom/baragon/keymaps/via/rules.mk rename to keyboards/handwired/phantagom/baragon/keymaps/via/rules.mk diff --git a/keyboards/phantagom/baragon/readme.md b/keyboards/handwired/phantagom/baragon/readme.md similarity index 100% rename from keyboards/phantagom/baragon/readme.md rename to keyboards/handwired/phantagom/baragon/readme.md diff --git a/keyboards/phantagom/baragon/rules.mk b/keyboards/handwired/phantagom/baragon/rules.mk similarity index 100% rename from keyboards/phantagom/baragon/rules.mk rename to keyboards/handwired/phantagom/baragon/rules.mk