Merge 557c0bd5ab into 9bea332a21

qmk via2json: Improve macro parsing (#24345 )
qmk new-keymap: validate keymap name (#23420 )
2024-11-22 03:19:24 +00:00 · 2024-11-20 22:22:13 -08:00 · 2024-11-21 17:20:05 +11:00 · 2024-11-21 17:18:51 +11:00 · 2024-09-24 01:38:03 -03:00 · 2024-09-08 15:49:12 -03:00
19 changed files with 598 additions and 9 deletions
--- a/keyboards/wiredin/protagonist/pro_h/config.h
+++ b/keyboards/wiredin/protagonist/pro_h/config.h
@ -0,0 +1,27 @@
+/* Copyright 2024 Gondolindrim <gondolindrim@acheronproject.com>
+
+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/>.
+*/
+
+#pragma once
+
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+
+#define WS2812_PWM_COMPLEMENTARY_OUTPUT
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
--- a/keyboards/wiredin/protagonist/pro_h/halconf.h
+++ b/keyboards/wiredin/protagonist/pro_h/halconf.h
@ -0,0 +1,22 @@
+/* Copyright 2024 Gondolindrim <gondolindrim@acheronproject.com>
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_PAL TRUE
+
+#include_next <halconf.h>
--- a/keyboards/wiredin/protagonist/pro_h/keyboard.json
+++ b/keyboards/wiredin/protagonist/pro_h/keyboard.json
@ -0,0 +1,119 @@
+{
+    "keyboard_name": "Protagonist PRO-H",
+    "manufacturer": "WiredIn",
+    "url": "", 
+    "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x5749",
+        "pid": "0x5048",
+        "device_version": "0.0.1"
+    }, 
+
+  
+    "matrix_pins": {
+        "cols": ["A4" , "A3" , "A2" , "A10", "A8" , "B12", "A15", "B3" , "B4" , "B5" , "C15", "C14", "B9" , "C13"],
+        "rows": ["B1" , "B10", "B14", "B8" , "A0", "A1"]
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey":  false,
+        "extrakey":  false,
+        "console":   false,
+        "rgblight":  true,
+        "backlight": false,
+        "nkro":      true
+    },
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 22,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "pwm"
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "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":[0,4], "x":4, "y":0}, 
+                {"matrix":[0,5], "x":5, "y":0}, 
+                {"matrix":[0,6], "x":6, "y":0}, 
+                {"matrix":[0,7], "x":7, "y":0}, 
+                {"matrix":[0,8], "x":8, "y":0}, 
+                {"matrix":[0,9], "x":9, "y":0}, 
+                {"matrix":[0,10], "x":10, "y":0}, 
+                {"matrix":[0,11], "x":11, "y":0}, 
+                {"matrix":[0,12], "x":12, "y":0}, 
+                {"matrix":[0,13], "x":13, "y":0}, 
+                {"matrix":[4,13], "x":14, "y":0}, 
+                {"matrix":[1,0], "x":0, "y":1, "w":1.5}, 
+                {"matrix":[1,1], "x":1.5, "y":1}, 
+                {"matrix":[1,2], "x":2.5, "y":1}, 
+                {"matrix":[1,3], "x":3.5, "y":1}, 
+                {"matrix":[1,4], "x":4.5, "y":1}, 
+                {"matrix":[1,5], "x":5.5, "y":1}, 
+                {"matrix":[1,6], "x":6.5, "y":1}, 
+                {"matrix":[1,7], "x":7.5, "y":1}, 
+                {"matrix":[1,8], "x":8.5, "y":1}, 
+                {"matrix":[1,9], "x":9.5, "y":1}, 
+                {"matrix":[1,10], "x":10.5, "y":1}, 
+                {"matrix":[1,11], "x":11.5, "y":1}, 
+                {"matrix":[1,12], "x":12.5, "y":1}, 
+                {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, 
+                {"matrix":[2,0], "x":0, "y":2, "w":1.75}, 
+                {"matrix":[2,1], "x":1.75, "y":2}, 
+                {"matrix":[2,2], "x":2.75, "y":2}, 
+                {"matrix":[2,3], "x":3.75, "y":2}, 
+                {"matrix":[2,4], "x":4.75, "y":2}, 
+                {"matrix":[2,5], "x":5.75, "y":2}, 
+                {"matrix":[2,6], "x":6.75, "y":2}, 
+                {"matrix":[2,7], "x":7.75, "y":2}, 
+                {"matrix":[2,8], "x":8.75, "y":2}, 
+                {"matrix":[2,9], "x":9.75, "y":2}, 
+                {"matrix":[2,10], "x":10.75, "y":2}, 
+                {"matrix":[2,11], "x":11.75, "y":2}, 
+                {"matrix":[2,13], "x":12.75, "y":2, "w":2.25}, 
+                {"matrix":[3,0], "x":0, "y":3, "w":2.25}, 
+                {"matrix":[3,2], "x":2.25, "y":3}, 
+                {"matrix":[3,3], "x":3.25, "y":3}, 
+                {"matrix":[3,4], "x":4.25, "y":3}, 
+                {"matrix":[3,5], "x":5.25, "y":3}, 
+                {"matrix":[3,6], "x":6.25, "y":3}, 
+                {"matrix":[3,7], "x":7.25, "y":3}, 
+                {"matrix":[3,8], "x":8.25, "y":3}, 
+                {"matrix":[3,9], "x":9.25, "y":3}, 
+                {"matrix":[3,10], "x":10.25, "y":3}, 
+                {"matrix":[3,11], "x":11.25, "y":3}, 
+                {"matrix":[3,12], "x":12.25, "y":3, "w":1.75}, 
+                {"matrix":[3,13], "x":14, "y":3}, 
+                {"matrix":[5,0], "x":0, "y":4, "w":1.5}, 
+                {"matrix":[5,1], "x":1.5, "y":4}, 
+                {"matrix":[5,2], "x":2.5, "y":4, "w":1.5}, 
+                {"matrix":[4,6], "x":4, "y":4, "w":7}, 
+                {"matrix":[4,10], "x":11, "y":4, "w":1.5}, 
+                {"matrix":[4,11], "x":12.5, "y":4}, 
+                {"matrix":[4,12], "x":13.5, "y":4, "w":1.5}
+                ]
+        }
+    }
+}
--- a/keyboards/wiredin/protagonist/pro_h/keymaps/default/keymap.c
+++ b/keyboards/wiredin/protagonist/pro_h/keymaps/default/keymap.c
@ -0,0 +1,33 @@
+/* Copyright 2020 Gondolindrim
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT( /* Base */
+    QK_GESC, 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_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_CAPS, KC_A   , KC_S   , KC_D   , KC_F  , KC_G    , KC_H   , KC_J   , KC_K   , KC_L   , KC_COLN, KC_QUOT,          KC_ENT ,
+    KC_LSFT,          KC_Z   , KC_X   , KC_C  , KC_V    , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,         
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, MO(1)  , KC_RCTL
+),
+[1] = LAYOUT(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
+)
+};
--- a/keyboards/wiredin/protagonist/pro_h/keymaps/via/keymap.c
+++ b/keyboards/wiredin/protagonist/pro_h/keymaps/via/keymap.c
@ -0,0 +1,33 @@
+/* Copyright 2020 Gondolindrim
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT( /* Base */
+    QK_GESC, 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_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_CAPS, KC_A   , KC_S   , KC_D   , KC_F  , KC_G    , KC_H   , KC_J   , KC_K   , KC_L   , KC_COLN, KC_QUOT,          KC_ENT ,
+    KC_LSFT,          KC_Z   , KC_X   , KC_C  , KC_V    , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,         
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, MO(1)  , KC_RCTL
+),
+[1] = LAYOUT(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
+)
+};
--- a/keyboards/wiredin/protagonist/pro_h/keymaps/via/rules.mk
+++ b/keyboards/wiredin/protagonist/pro_h/keymaps/via/rules.mk
@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/wiredin/protagonist/pro_h/mcuconf.h
+++ b/keyboards/wiredin/protagonist/pro_h/mcuconf.h
@ -0,0 +1,22 @@
+/* Copyright 2024 Gondolindrim <gondolindrim@acheronproject.com>
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
--- a/keyboards/wiredin/protagonist/pro_h/rules.mk
+++ b/keyboards/wiredin/protagonist/pro_h/rules.mk
@ -0,0 +1 @@
+# This file intentionally left blank
--- a/keyboards/wiredin/protagonist/pro_s/config.h
+++ b/keyboards/wiredin/protagonist/pro_s/config.h
@ -0,0 +1,28 @@
+/* Copyright 2024 Gondolindrim <gondolindrim@acheronproject.com>
+
+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/>.
+*/
+
+#pragma once
+
+#define BACKLIGHT_PWM_DRIVER    PWMD3
+#define BACKLIGHT_PWM_CHANNEL   4
+#define BACKLIGHT_PWM_PAL_MOPDE 2
+
+#define WS2812_PWM_COMPLEMENTARY_OUTPUT
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
--- a/keyboards/wiredin/protagonist/pro_s/halconf.h
+++ b/keyboards/wiredin/protagonist/pro_s/halconf.h
@ -0,0 +1,22 @@
+/* Copyright 2024 Gondolindrim <gondolindrim@acheronproject.com>
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_PAL TRUE
+
+#include_next <halconf.h>
--- a/keyboards/wiredin/protagonist/pro_s/keyboard.json
+++ b/keyboards/wiredin/protagonist/pro_s/keyboard.json
@ -0,0 +1,125 @@
+{
+    "keyboard_name": "Protagonist PRO-S",
+    "manufacturer": "WiredIn",
+    "url": "", 
+    "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x5749",
+        "pid": "0x5053",
+        "device_version": "0.0.1"
+    }, 
+  
+    "matrix_pins": {
+        "cols": ["A3" , "A2" , "A1" , "B14", "B12", "A10", "A8" , "B4" , "B3" , "A15", "C15", "C14", "C13", "B8"],
+        "rows": ["A4" , "A7" , "B0" , "B5" , "B9" , "A0" , "B10"]
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey":  false,
+        "extrakey":  false,
+        "console":   false,
+        "rgblight":  true,
+        "backlight": true,
+        "nkro":      true
+    },
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B1",
+        "levels": 20,
+        "as_caps_lock": true
+    },
+    "rgblight": {
+        "led_count": 22,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "pwm"
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "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":[0,4], "x":4, "y":0}, 
+            {"matrix":[0,5], "x":5, "y":0}, 
+            {"matrix":[0,6], "x":6, "y":0}, 
+            {"matrix":[0,7], "x":7, "y":0}, 
+            {"matrix":[0,8], "x":8, "y":0}, 
+            {"matrix":[0,9], "x":9, "y":0}, 
+            {"matrix":[0,10], "x":10, "y":0}, 
+            {"matrix":[0,11], "x":11, "y":0}, 
+            {"matrix":[0,12], "x":12, "y":0}, 
+            {"matrix":[0,13], "x":13, "y":0}, 
+            {"matrix":[4,13], "x":14, "y":0}, 
+            {"matrix":[1,0], "x":0, "y":1, "w":1.5}, 
+            {"matrix":[1,1], "x":1.5, "y":1}, 
+            {"matrix":[1,2], "x":2.5, "y":1}, 
+            {"matrix":[1,3], "x":3.5, "y":1}, 
+            {"matrix":[1,4], "x":4.5, "y":1}, 
+            {"matrix":[1,5], "x":5.5, "y":1}, 
+            {"matrix":[1,6], "x":6.5, "y":1}, 
+            {"matrix":[1,7], "x":7.5, "y":1}, 
+            {"matrix":[1,8], "x":8.5, "y":1}, 
+            {"matrix":[1,9], "x":9.5, "y":1}, 
+            {"matrix":[1,10], "x":10.5, "y":1}, 
+            {"matrix":[1,11], "x":11.5, "y":1}, 
+            {"matrix":[1,12], "x":12.5, "y":1}, 
+            {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, 
+            {"matrix":[2,0], "x":0, "y":2, "w":1.75}, 
+            {"matrix":[2,1], "x":1.75, "y":2}, 
+            {"matrix":[2,2], "x":2.75, "y":2}, 
+            {"matrix":[2,3], "x":3.75, "y":2}, 
+            {"matrix":[2,4], "x":4.75, "y":2}, 
+            {"matrix":[2,5], "x":5.75, "y":2}, 
+            {"matrix":[2,6], "x":6.75, "y":2}, 
+            {"matrix":[2,7], "x":7.75, "y":2}, 
+            {"matrix":[2,8], "x":8.75, "y":2}, 
+            {"matrix":[2,9], "x":9.75, "y":2}, 
+            {"matrix":[2,10], "x":10.75, "y":2}, 
+            {"matrix":[2,11], "x":11.75, "y":2}, 
+            {"matrix":[2,12], "x":12.75, "y":2}, 
+            {"matrix":[2,13], "x":13.75, "y":2, "w":1.25}, 
+            {"matrix":[6,0], "x":0, "y":3, "w":1.25}, 
+            {"matrix":[6,1], "x":1.25, "y":3}, 
+            {"matrix":[6,2], "x":2.25, "y":3}, 
+            {"matrix":[6,3], "x":3.25, "y":3}, 
+            {"matrix":[6,4], "x":4.25, "y":3}, 
+            {"matrix":[3,5], "x":5.25, "y":3}, 
+            {"matrix":[3,6], "x":6.25, "y":3}, 
+            {"matrix":[3,7], "x":7.25, "y":3}, 
+            {"matrix":[3,8], "x":8.25, "y":3}, 
+            {"matrix":[3,9], "x":9.25, "y":3}, 
+            {"matrix":[3,10], "x":10.25, "y":3}, 
+            {"matrix":[3,11], "x":11.25, "y":3}, 
+            {"matrix":[3,12], "x":12.25, "y":3, "w":1.75}, 
+            {"matrix":[3,13], "x":14, "y":3}, 
+            {"matrix":[5,0], "x":0, "y":4, "w":1.5}, 
+            {"matrix":[5,1], "x":1.5, "y":4}, 
+            {"matrix":[5,2], "x":2.5, "y":4, "w":1.5}, 
+            {"matrix":[4,6], "x":4, "y":4, "w":7}, 
+            {"matrix":[4,10], "x":11, "y":4, "w":1.5}, 
+            {"matrix":[4,11], "x":12.5, "y":4}, 
+            {"matrix":[4,12], "x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}   
--- a/keyboards/wiredin/protagonist/pro_s/keymaps/default/keymap.c
+++ b/keyboards/wiredin/protagonist/pro_s/keymaps/default/keymap.c
@ -0,0 +1,33 @@
+/* Copyright 2020 Gondolindrim
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT( /* Base */
+    QK_GESC, 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_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_CAPS, KC_A   , KC_S   , KC_D   , KC_F  , KC_G    , KC_H   , KC_J   , KC_K   , KC_L   , KC_COLN, KC_QUOT, KC_NUHS, KC_ENT ,
+    KC_LSFT, KC_NUBS, KC_Z   , KC_X   , KC_C  , KC_V    , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,         
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, MO(1)  , KC_RCTL
+),
+[1] = LAYOUT(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
+)
+};
--- a/keyboards/wiredin/protagonist/pro_s/keymaps/via/keymap.c
+++ b/keyboards/wiredin/protagonist/pro_s/keymaps/via/keymap.c
@ -0,0 +1,33 @@
+/* Copyright 2020 Gondolindrim
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT( /* Base */
+    QK_GESC, 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_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_CAPS, KC_A   , KC_S   , KC_D   , KC_F  , KC_G    , KC_H   , KC_J   , KC_K   , KC_L   , KC_COLN, KC_QUOT, KC_NUHS, KC_ENT ,
+    KC_LSFT, KC_NUBS, KC_Z   , KC_X   , KC_C  , KC_V    , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,         
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, MO(1)  , KC_RCTL
+),
+[1] = LAYOUT(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
+)
+};
--- a/keyboards/wiredin/protagonist/pro_s/keymaps/via/rules.mk
+++ b/keyboards/wiredin/protagonist/pro_s/keymaps/via/rules.mk
@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/wiredin/protagonist/pro_s/mcuconf.h
+++ b/keyboards/wiredin/protagonist/pro_s/mcuconf.h
@ -0,0 +1,28 @@
+/* Copyright 2024 Gondolindrim <gondolindrim@acheronproject.com>
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_ADVANCED
+#define STM32_PWM_USE_ADVANCED TRUE
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
--- a/keyboards/wiredin/protagonist/pro_s/rules.mk
+++ b/keyboards/wiredin/protagonist/pro_s/rules.mk
@ -0,0 +1 @@
+# This file intentionally left blank
--- a/keyboards/wiredin/protagonist/readme.md
+++ b/keyboards/wiredin/protagonist/readme.md
@ -0,0 +1,32 @@
+# WiredIn Protagonist
+
+* Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim)
+* Hardware Supported: proprietary PCB using STM32F411 microcontroller;
+* Hardware Availability: the Protagonist is scheduled to enter Group Buy in february 2024.
+
+The Protagonist is a 60% keyboard designed by WiredIn and PCB designed by [Gondolindrim](http://github.com/Gondolindrim), who is also the firwmare maintainer.
+
+As of january 2024, there is no way to obtain a Protagonist. The keyboard is scheduled to enter Group Buy in february 2024.
+
+## How to flash
+
+### Enter bootloader
+
+The DFU state in the bootloader can be accessed in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (escape in the default keymap) and plug in the keyboard;
+* **Physical reset button**: press the button on the back of the PCB and hold it for 5 seconds;
+* **Keycode in layout**: Press the key mapped to `RESET`; in the default layout, that is top left key ('escape') in layer 1.
+
+### How to compile and flash
+
+The Protagonist has two PCB versions: PRO-S (solderable) and PRO-H (hotswap). After checking what PCB you own and setting up your build environment, you can compile the Iron 165R2 default keymap by using one of the options below.
+
+    make wiredin/protagonist/<version>:default
+
+Where `<version>` can be `pro_s` or `pro_h`. And use dfu-util in the command line or through a GUI like QMK toolbox to upload the firmware to the PCB. To directly flash the PCB after it is put into a DFU state, use:
+
+
+    make wiredin/protagonist/<version>: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).
--- a/lib/python/qmk/cli/new/keymap.py
+++ b/lib/python/qmk/cli/new/keymap.py
@ -1,5 +1,6 @@
 """This script automates the copying of the default keymap into your own keymap.
 """
+import re
 import shutil

 from milc import cli
@ -13,6 +14,13 @@ from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.userspace import UserspaceDefs


+def validate_keymap_name(name):
+    """Returns True if the given keymap name contains only a-z, 0-9 and underscore characters.
+    """
+    regex = re.compile(r'^[a-zA-Z0-9][a-zA-Z0-9_]+$')
+    return bool(regex.match(name))
+
+
 def prompt_keyboard():
    prompt = """{fg_yellow}Select Keyboard{style_reset_all}
 If you`re unsure you can view a full list of supported keyboards with {fg_yellow}qmk list-keyboards{style_reset_all}.
@ -60,6 +68,10 @@ def new_keymap(cli):
        cli.log.error(f'Default keymap {{fg_cyan}}{keymap_path_default}{{fg_reset}} does not exist!')
        return False

+    if not validate_keymap_name(user_name):
+        cli.log.error('Keymap names must contain only {fg_cyan}a-z{fg_reset}, {fg_cyan}0-9{fg_reset} and {fg_cyan}_{fg_reset}! Please choose a different name.')
+        return False
+
    if keymap_path_new.exists():
        cli.log.error(f'Keymap {{fg_cyan}}{user_name}{{fg_reset}} already exists! Please choose a different name.')
        return False
--- a/lib/python/qmk/cli/via2json.py
+++ b/lib/python/qmk/cli/via2json.py
@ -29,6 +29,7 @@ def _convert_macros(via_macros):
    if len(via_macros) == 0:
        return list()
    split_regex = re.compile(r'(}\,)|(\,{)')
+    macro_group_regex = re.compile(r'({.+?})')
    macros = list()
    for via_macro in via_macros:
        # Split VIA macro to its elements
@ -38,13 +39,28 @@ def _convert_macros(via_macros):
        macro_data = list()
        for m in macro:
            if '{' in m or '}' in m:
-                # Found keycode(s)
-                keycodes = m.split(',')
-                # Remove whitespaces and curly braces from around keycodes
-                keycodes = list(map(lambda s: s.strip(' {}'), keycodes))
-                # Remove the KC prefix
-                keycodes = list(map(lambda s: s.replace('KC_', ''), keycodes))
-                macro_data.append({"action": "tap", "keycodes": keycodes})
+                # Split macro groups
+                macro_groups = macro_group_regex.findall(m)
+                for macro_group in macro_groups:
+                    # Remove whitespaces and curly braces from around group
+                    macro_group = macro_group.strip(' {}')
+
+                    macro_action = 'tap'
+                    macro_keycodes = []
+
+                    if macro_group[0] == '+':
+                        macro_action = 'down'
+                        macro_keycodes.append(macro_group[1:])
+                    elif macro_group[0] == '-':
+                        macro_action = 'up'
+                        macro_keycodes.append(macro_group[1:])
+                    else:
+                        macro_keycodes.extend(macro_group.split(',') if ',' in macro_group else [macro_group])
+
+                    # Remove the KC prefixes
+                    macro_keycodes = list(map(lambda s: s.replace('KC_', ''), macro_keycodes))
+
+                    macro_data.append({"action": macro_action, "keycodes": macro_keycodes})
            else:
                # Found text
                macro_data.append(m)
@ -54,13 +70,13 @@ def _convert_macros(via_macros):


 def _fix_macro_keys(keymap_data):
-    macro_no = re.compile(r'MACRO0?([0-9]{1,2})')
+    macro_no = re.compile(r'MACRO0?\(([0-9]{1,2})\)')
    for i in range(0, len(keymap_data)):
        for j in range(0, len(keymap_data[i])):
            kc = keymap_data[i][j]
            m = macro_no.match(kc)
            if m:
-                keymap_data[i][j] = f'MACRO_{m.group(1)}'
+                keymap_data[i][j] = f'MC_{m.group(1)}'
    return keymap_data
Author	SHA1	Message	Date
Álvaro A. Volpato	720d9df91b	Merge `557c0bd5ab` into `9bea332a21`	2024-11-20 22:22:13 -08:00
Ryan	9bea332a21	`qmk via2json`: Improve macro parsing (#24345 )	2024-11-21 17:20:05 +11:00
Ryan	8cbcdcac62	`qmk new-keymap`: validate keymap name (#23420 )	2024-11-21 17:18:51 +11:00
Gondolindrim	557c0bd5ab	Solderable proto testing	2024-09-24 01:38:03 -03:00
Gondolindrim	4f30fb499b	Merge branch 'master' of https://github.com/qmk/qmk_firmware into protagonist	2024-09-08 15:49:12 -03:00
Gondolindrim	19ba77a0eb	Add first support for Protagonist PCBs	2024-01-18 19:08:41 -03:00