From a58f6ef1ecfa5735e754c40f53924ec161693db7 Mon Sep 17 00:00:00 2001 From: TW59420 <1393018289@qq.com> Date: Wed, 29 Nov 2023 10:52:02 +0800 Subject: [PATCH 01/26] add 3key keyboards --- keyboards/mwstudio/mmk_3/config.h | 30 +++++++++++ keyboards/mwstudio/mmk_3/halconf.h | 25 +++++++++ keyboards/mwstudio/mmk_3/info.json | 46 ++++++++++++++++ .../mwstudio/mmk_3/keymaps/default/keymap.c | 27 ++++++++++ keyboards/mwstudio/mmk_3/keymaps/via/keymap.c | 54 +++++++++++++++++++ keyboards/mwstudio/mmk_3/keymaps/via/rules.mk | 2 + keyboards/mwstudio/mmk_3/mcuconf.h | 23 ++++++++ keyboards/mwstudio/mmk_3/mmk_3.c | 17 ++++++ keyboards/mwstudio/mmk_3/readme.md | 22 ++++++++ keyboards/mwstudio/mmk_3/rules.mk | 3 ++ 10 files changed, 249 insertions(+) create mode 100644 keyboards/mwstudio/mmk_3/config.h create mode 100644 keyboards/mwstudio/mmk_3/halconf.h create mode 100644 keyboards/mwstudio/mmk_3/info.json create mode 100644 keyboards/mwstudio/mmk_3/keymaps/default/keymap.c create mode 100644 keyboards/mwstudio/mmk_3/keymaps/via/keymap.c create mode 100644 keyboards/mwstudio/mmk_3/keymaps/via/rules.mk create mode 100644 keyboards/mwstudio/mmk_3/mcuconf.h create mode 100644 keyboards/mwstudio/mmk_3/mmk_3.c create mode 100644 keyboards/mwstudio/mmk_3/readme.md create mode 100644 keyboards/mwstudio/mmk_3/rules.mk diff --git a/keyboards/mwstudio/mmk_3/config.h b/keyboards/mwstudio/mmk_3/config.h new file mode 100644 index 000000000000..5f076cfb9159 --- /dev/null +++ b/keyboards/mwstudio/mmk_3/config.h @@ -0,0 +1,30 @@ +/* Copyright 2023 TW59420 + * + * 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 . + */ + +#pragma once + +#include "config_common.h" + +#define FORCE_NKRO +#define RGBLIGHT_LAYERS + +#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 + +#define WS2812_PWM_DRIVER PWMD4 // default: PWMD2 +#define WS2812_PWM_CHANNEL 3 // default: 2 +#define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. diff --git a/keyboards/mwstudio/mmk_3/halconf.h b/keyboards/mwstudio/mmk_3/halconf.h new file mode 100644 index 000000000000..4fc87f4b3231 --- /dev/null +++ b/keyboards/mwstudio/mmk_3/halconf.h @@ -0,0 +1,25 @@ +/* Copyright 2022 TW59420 + * + * 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 . + */ + +#pragma once + +#define HAL_USE_PWM TRUE +// #define HAL_USE_PAL TRUE +// #define HAL_USE_GPT TRUE +// #define HAL_USE_I2C TRUE + +#include_next + diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/info.json new file mode 100644 index 000000000000..ab7a59a10810 --- /dev/null +++ b/keyboards/mwstudio/mmk_3/info.json @@ -0,0 +1,46 @@ +{ + "manufacturer": "MWStudio", + "maintainer": "TW59420", + "keyboard_name": "3Key", + "usb": { + "pid": "0x4287", + "vid": "0x4249", + "device_version": "1.0.0" + }, + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "encoder": false + }, + "matrix_pins": { + "cols": ["A3", "A4", "A5" ], + "rows": ["A6" ] + }, + "processor": "STM32F103", + "bootloader": "stm32duino", + "url": "", + "rgblight": { + "led_count": 5, + "pin": "B8", + "hue_steps": 10, + "saturation_steps": 17, + "brightness_steps": 17, + "animations": { + "all": true + } + }, + "layouts": { + "LAYOUT_3key": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 } + ] + } + } +} diff --git a/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c b/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c new file mode 100644 index 000000000000..48255f9a38db --- /dev/null +++ b/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c @@ -0,0 +1,27 @@ +/* Copyright 2023 TW59420 + * + * 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 . + */ + +#include QMK_KEYBOARD_H +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_3key( + KC_LCTL, KC_C, KC_V + ), + + [1] = LAYOUT_3key( + KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/mwstudio/mmk_3/keymaps/via/keymap.c b/keyboards/mwstudio/mmk_3/keymaps/via/keymap.c new file mode 100644 index 000000000000..36f10a2fc053 --- /dev/null +++ b/keyboards/mwstudio/mmk_3/keymaps/via/keymap.c @@ -0,0 +1,54 @@ +/* Copyright 2023 TW59420 + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const rgblight_segment_t PROGMEM my_layer0_layer[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_WHITE} ); +const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_BLUE} ); +const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_PURPLE} ); +const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_RED} ); + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_3key( + KC_LCTL, KC_C, KC_V + ), + + [1] = LAYOUT_3key( + KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +//Now define the array of layers. Later layers take precedence +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( + my_layer0_layer, + my_layer1_layer, + my_layer2_layer, + my_layer3_layer +); + +void keyboard_post_init_user(void) { + // Enable the LED layers + rgblight_layers = my_rgb_layers; +} + +layer_state_t layer_state_set_user(layer_state_t state) { + rgblight_set_layer_state(0, layer_state_cmp(state, 0)); + rgblight_set_layer_state(1, layer_state_cmp(state, 1)); + rgblight_set_layer_state(2, layer_state_cmp(state, 2)); + rgblight_set_layer_state(3, layer_state_cmp(state, 3)); + return state; +} \ No newline at end of file diff --git a/keyboards/mwstudio/mmk_3/keymaps/via/rules.mk b/keyboards/mwstudio/mmk_3/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/mwstudio/mmk_3/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/mwstudio/mmk_3/mcuconf.h b/keyboards/mwstudio/mmk_3/mcuconf.h new file mode 100644 index 000000000000..fb1d1e81f6bd --- /dev/null +++ b/keyboards/mwstudio/mmk_3/mcuconf.h @@ -0,0 +1,23 @@ +/* Copyright 2023 TW59420 + * + * 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 . + */ +#pragma once + +#include_next + +#undef STM32_PWM_USE_TIM4 +#define STM32_PWM_USE_TIM4 TRUE + + diff --git a/keyboards/mwstudio/mmk_3/mmk_3.c b/keyboards/mwstudio/mmk_3/mmk_3.c new file mode 100644 index 000000000000..2ac370234b03 --- /dev/null +++ b/keyboards/mwstudio/mmk_3/mmk_3.c @@ -0,0 +1,17 @@ +/* Copyright 2023 TW59420 + * + * 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 . + */ +#include "quantum.h" + diff --git a/keyboards/mwstudio/mmk_3/readme.md b/keyboards/mwstudio/mmk_3/readme.md new file mode 100644 index 000000000000..2d31bea612c6 --- /dev/null +++ b/keyboards/mwstudio/mmk_3/readme.md @@ -0,0 +1,22 @@ +# 3Key + +![3Key](https://imgur.com/a/qPK5GmI) + +Support APM32F103C8T6 keyboard. + +* Keyboard Maintainer: [TW59420](https://github.com/TW59420) +* Hardware Supported: APM32F103C8T6 + +Make example for this keyboard (after setting up your build environment): + + make mwstudio/3key:default + +Flashing example for this keyboard: + + make mwstudio/3key: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 +* **Physical reset button**: Short press the button on the back of the PCB to enter the Bootloader and flash the firmware +* **Keycode in layout**: Press the key mapped to RESET if it is available diff --git a/keyboards/mwstudio/mmk_3/rules.mk b/keyboards/mwstudio/mmk_3/rules.mk new file mode 100644 index 000000000000..44d94c4db75f --- /dev/null +++ b/keyboards/mwstudio/mmk_3/rules.mk @@ -0,0 +1,3 @@ + +RGBLIGHT_ENABLE = yes +WS2812_DRIVER = pwm \ No newline at end of file From b6531478e6b037bd3ecec8ff29f6fd193f0dae22 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Wed, 29 Nov 2023 10:56:48 +0800 Subject: [PATCH 02/26] Update info.json --- keyboards/mwstudio/mmk_3/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/info.json index ab7a59a10810..091a4fd1fb3b 100644 --- a/keyboards/mwstudio/mmk_3/info.json +++ b/keyboards/mwstudio/mmk_3/info.json @@ -3,8 +3,8 @@ "maintainer": "TW59420", "keyboard_name": "3Key", "usb": { - "pid": "0x4287", - "vid": "0x4249", + "pid": "0x3001", + "vid": "0x7BA1", "device_version": "1.0.0" }, "diode_direction": "ROW2COL", From 7cd6421ed82a7f1f4406190b4536b2d476a20d58 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 08:36:41 +0800 Subject: [PATCH 03/26] Update keyboards/mwstudio/mmk_3/halconf.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/mwstudio/mmk_3/halconf.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/halconf.h b/keyboards/mwstudio/mmk_3/halconf.h index 4fc87f4b3231..0af31c573521 100644 --- a/keyboards/mwstudio/mmk_3/halconf.h +++ b/keyboards/mwstudio/mmk_3/halconf.h @@ -17,9 +17,6 @@ #pragma once #define HAL_USE_PWM TRUE -// #define HAL_USE_PAL TRUE -// #define HAL_USE_GPT TRUE -// #define HAL_USE_I2C TRUE #include_next From f739607f5ec2b7620d3c4da811c70454051a1f07 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 08:37:04 +0800 Subject: [PATCH 04/26] Update keyboards/mwstudio/mmk_3/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/mwstudio/mmk_3/info.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/info.json index 091a4fd1fb3b..acb9702570ee 100644 --- a/keyboards/mwstudio/mmk_3/info.json +++ b/keyboards/mwstudio/mmk_3/info.json @@ -10,12 +10,10 @@ "diode_direction": "ROW2COL", "features": { "bootmagic": true, - "command": false, - "console": false, "extrakey": true, - "mousekey": false, + "mousekey": true, "nkro": true, - "encoder": false + "rgblight": true }, "matrix_pins": { "cols": ["A3", "A4", "A5" ], From 09e4915cb0607b120ad772aaa7bb7ac4ae457194 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 08:37:23 +0800 Subject: [PATCH 05/26] Update keyboards/mwstudio/mmk_3/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/mwstudio/mmk_3/info.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/info.json index acb9702570ee..9ca21d1aa16c 100644 --- a/keyboards/mwstudio/mmk_3/info.json +++ b/keyboards/mwstudio/mmk_3/info.json @@ -29,7 +29,16 @@ "saturation_steps": 17, "brightness_steps": 17, "animations": { - "all": true + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true } }, "layouts": { From 783c8f0a6d56d007008250301b34b4c14f4b1ad8 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 08:37:30 +0800 Subject: [PATCH 06/26] Update keyboards/mwstudio/mmk_3/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/mwstudio/mmk_3/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/info.json index 9ca21d1aa16c..4304a8a2ee5a 100644 --- a/keyboards/mwstudio/mmk_3/info.json +++ b/keyboards/mwstudio/mmk_3/info.json @@ -42,7 +42,7 @@ } }, "layouts": { - "LAYOUT_3key": { + "LAYOUT": { "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 }, From 4891b0a60885d4afc7e845f3ea39c535d6ae8294 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 08:38:01 +0800 Subject: [PATCH 07/26] Update keyboards/mwstudio/mmk_3/readme.md Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/mwstudio/mmk_3/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mwstudio/mmk_3/readme.md b/keyboards/mwstudio/mmk_3/readme.md index 2d31bea612c6..62e58704d79f 100644 --- a/keyboards/mwstudio/mmk_3/readme.md +++ b/keyboards/mwstudio/mmk_3/readme.md @@ -1,6 +1,6 @@ # 3Key -![3Key](https://imgur.com/a/qPK5GmI) +![3Key](https://i.imgur.com/WuwlVknh.jpeg) Support APM32F103C8T6 keyboard. From e1e688c2b26bc5d52600fc67253cacfe9dd8a065 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 08:39:56 +0800 Subject: [PATCH 08/26] Update keyboards/mwstudio/mmk_3/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/mwstudio/mmk_3/rules.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/rules.mk b/keyboards/mwstudio/mmk_3/rules.mk index 44d94c4db75f..7ff128fa692e 100644 --- a/keyboards/mwstudio/mmk_3/rules.mk +++ b/keyboards/mwstudio/mmk_3/rules.mk @@ -1,3 +1 @@ - -RGBLIGHT_ENABLE = yes -WS2812_DRIVER = pwm \ No newline at end of file +# This file intentionally left blank \ No newline at end of file From ab3573df371e0fa2e6c4818436a60efc1e984eb7 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 08:40:07 +0800 Subject: [PATCH 09/26] Update keyboards/mwstudio/mmk_3/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/mwstudio/mmk_3/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/info.json index 4304a8a2ee5a..d127eb320449 100644 --- a/keyboards/mwstudio/mmk_3/info.json +++ b/keyboards/mwstudio/mmk_3/info.json @@ -22,6 +22,9 @@ "processor": "STM32F103", "bootloader": "stm32duino", "url": "", + "ws2812": { + "driver": "pwm" + }, "rgblight": { "led_count": 5, "pin": "B8", From 885baba7c695e2f8f0f1fb4428fc7715560d4e17 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 08:40:48 +0800 Subject: [PATCH 10/26] Update keyboards/mwstudio/mmk_3/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/mwstudio/mmk_3/config.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/config.h b/keyboards/mwstudio/mmk_3/config.h index 5f076cfb9159..39f69cc89698 100644 --- a/keyboards/mwstudio/mmk_3/config.h +++ b/keyboards/mwstudio/mmk_3/config.h @@ -16,11 +16,6 @@ #pragma once -#include "config_common.h" - -#define FORCE_NKRO -#define RGBLIGHT_LAYERS - #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 #define WS2812_PWM_DRIVER PWMD4 // default: PWMD2 From 02a1e5f7b39997f4ddf4d5f910221d7080a6bdc4 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 08:41:17 +0800 Subject: [PATCH 11/26] Delete keyboards/mwstudio/mmk_3/mmk_3.c --- keyboards/mwstudio/mmk_3/mmk_3.c | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 keyboards/mwstudio/mmk_3/mmk_3.c diff --git a/keyboards/mwstudio/mmk_3/mmk_3.c b/keyboards/mwstudio/mmk_3/mmk_3.c deleted file mode 100644 index 2ac370234b03..000000000000 --- a/keyboards/mwstudio/mmk_3/mmk_3.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2023 TW59420 - * - * 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 . - */ -#include "quantum.h" - From 8d6ba0ec892a624af60fab1dc51c7af0ba77dc1a Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 08:42:20 +0800 Subject: [PATCH 12/26] Update info.json --- keyboards/mwstudio/mmk_3/info.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/info.json index d127eb320449..dfccb43833c6 100644 --- a/keyboards/mwstudio/mmk_3/info.json +++ b/keyboards/mwstudio/mmk_3/info.json @@ -32,16 +32,16 @@ "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 + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true } }, "layouts": { From 2631e576df2189dd892f2d8b76729b7dacc12b79 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 08:44:27 +0800 Subject: [PATCH 13/26] Update keyboards/mwstudio/mmk_3/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/mwstudio/mmk_3/keymaps/default/keymap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c b/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c index 48255f9a38db..ceccb9376dea 100644 --- a/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c +++ b/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c @@ -17,11 +17,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_3key( + [0] = LAYOUT( KC_LCTL, KC_C, KC_V - ), - - [1] = LAYOUT_3key( - KC_TRNS, KC_TRNS, KC_TRNS ) }; From 8a5baeb4f2c50de8c30a5d1f3a3e49c33604323f Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 09:36:43 +0800 Subject: [PATCH 14/26] Update keymap.c --- keyboards/mwstudio/mmk_3/keymaps/via/keymap.c | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/keymaps/via/keymap.c b/keyboards/mwstudio/mmk_3/keymaps/via/keymap.c index 36f10a2fc053..44891f49198f 100644 --- a/keyboards/mwstudio/mmk_3/keymaps/via/keymap.c +++ b/keyboards/mwstudio/mmk_3/keymaps/via/keymap.c @@ -16,28 +16,35 @@ #include QMK_KEYBOARD_H -const rgblight_segment_t PROGMEM my_layer0_layer[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_WHITE} ); -const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_BLUE} ); -const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_PURPLE} ); -const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_RED} ); +const rgblight_segment_t PROGMEM my_layer0_dfu[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_WHITE} ); +const rgblight_segment_t PROGMEM my_layer1_val[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_BLUE} ); +const rgblight_segment_t PROGMEM my_layer2_sat[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_PURPLE} ); +const rgblight_segment_t PROGMEM my_layer3_hue[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_RED} ); const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_3key( - KC_LCTL, KC_C, KC_V + [0] = LAYOUT( + LT(3, KC_LCTL), LT(1, KC_C), LT(2, KC_V) ), - [1] = LAYOUT_3key( - KC_TRNS, KC_TRNS, KC_TRNS + [1] = LAYOUT( + RGB_VAD, KC_TRNS, RGB_VAI + ), + + [2] = LAYOUT( + RGB_SAD, RGB_SAI, KC_TRNS + ), + + [3] = LAYOUT( + KC_TRNS, RGB_HUD, RGB_HUI ) }; -//Now define the array of layers. Later layers take precedence const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( - my_layer0_layer, - my_layer1_layer, - my_layer2_layer, - my_layer3_layer + my_layer0_dfu, + my_layer1_val, + my_layer2_sat, + my_layer3_hue ); void keyboard_post_init_user(void) { @@ -51,4 +58,4 @@ layer_state_t layer_state_set_user(layer_state_t state) { rgblight_set_layer_state(2, layer_state_cmp(state, 2)); rgblight_set_layer_state(3, layer_state_cmp(state, 3)); return state; -} \ No newline at end of file +} From 6e0013aab01e0fdbd5b01069a6b7901defe67a86 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 09:37:17 +0800 Subject: [PATCH 15/26] Update keymap.c --- keyboards/mwstudio/mmk_3/keymaps/default/keymap.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c b/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c index ceccb9376dea..3ccf449dbff9 100644 --- a/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c +++ b/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c @@ -18,6 +18,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_LCTL, KC_C, KC_V + LT(3, KC_LCTL), LT(1, KC_C), LT(2, KC_V) + ), + + [1] = LAYOUT( + RGB_VAD, KC_TRNS, RGB_VAI + ), + + [2] = LAYOUT( + RGB_SAD, RGB_SAI, KC_TRNS + ), + + [3] = LAYOUT( + KC_TRNS, RGB_HUD, RGB_HUI ) }; From d0c58badc440ed20d81a3e89a29ccc2aea052205 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sat, 2 Dec 2023 09:37:49 +0800 Subject: [PATCH 16/26] Update config.h --- keyboards/mwstudio/mmk_3/config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/mwstudio/mmk_3/config.h b/keyboards/mwstudio/mmk_3/config.h index 39f69cc89698..d08fe234a0f4 100644 --- a/keyboards/mwstudio/mmk_3/config.h +++ b/keyboards/mwstudio/mmk_3/config.h @@ -16,6 +16,7 @@ #pragma once +#define RGBLIGHT_LAYERS #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 #define WS2812_PWM_DRIVER PWMD4 // default: PWMD2 From 2dcb0c47b971f6c9be30bdb9f97b601bf384a03b Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sun, 3 Dec 2023 22:10:29 +0800 Subject: [PATCH 17/26] Update keyboards/mwstudio/mmk_3/info.json Co-authored-by: Ryan --- keyboards/mwstudio/mmk_3/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/info.json index dfccb43833c6..282db334e6bf 100644 --- a/keyboards/mwstudio/mmk_3/info.json +++ b/keyboards/mwstudio/mmk_3/info.json @@ -23,11 +23,11 @@ "bootloader": "stm32duino", "url": "", "ws2812": { - "driver": "pwm" + "driver": "pwm", + "pin": "B8" }, "rgblight": { "led_count": 5, - "pin": "B8", "hue_steps": 10, "saturation_steps": 17, "brightness_steps": 17, From f8c6a8a9d44133836a45dbaec16e5cde51f592ca Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:12:03 +0800 Subject: [PATCH 18/26] Update keyboards/mwstudio/mmk_3/readme.md Co-authored-by: Ryan --- keyboards/mwstudio/mmk_3/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/readme.md b/keyboards/mwstudio/mmk_3/readme.md index 62e58704d79f..997dbc382ac3 100644 --- a/keyboards/mwstudio/mmk_3/readme.md +++ b/keyboards/mwstudio/mmk_3/readme.md @@ -9,11 +9,11 @@ Support APM32F103C8T6 keyboard. Make example for this keyboard (after setting up your build environment): - make mwstudio/3key:default + make mwstudio/mmk_3:default Flashing example for this keyboard: - make mwstudio/3key:default:flash + make mwstudio/mmk_3: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). From 1ec28913c752b9dba8caedc2ba7ffa73ffa00000 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Mon, 4 Dec 2023 20:13:16 +0800 Subject: [PATCH 19/26] Update info.json --- keyboards/mwstudio/mmk_3/info.json | 43 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/info.json index 282db334e6bf..8f1f93cfda30 100644 --- a/keyboards/mwstudio/mmk_3/info.json +++ b/keyboards/mwstudio/mmk_3/info.json @@ -1,36 +1,22 @@ { "manufacturer": "MWStudio", + "keyboard_name": "MMK_3", "maintainer": "TW59420", - "keyboard_name": "3Key", - "usb": { - "pid": "0x3001", - "vid": "0x7BA1", - "device_version": "1.0.0" - }, + "bootloader": "stm32duino", "diode_direction": "ROW2COL", "features": { "bootmagic": true, "extrakey": true, - "mousekey": true, + "mousekey": false, "nkro": true, "rgblight": true }, "matrix_pins": { - "cols": ["A3", "A4", "A5" ], - "rows": ["A6" ] + "cols": ["A3", "A4", "A5"], + "rows": ["A6"] }, "processor": "STM32F103", - "bootloader": "stm32duino", - "url": "", - "ws2812": { - "driver": "pwm", - "pin": "B8" - }, "rgblight": { - "led_count": 5, - "hue_steps": 10, - "saturation_steps": 17, - "brightness_steps": 17, "animations": { "alternating": true, "breathing": true, @@ -38,16 +24,29 @@ "knight": true, "rainbow_mood": true, "rainbow_swirl": true, - "rgb_test": true, "snake": true, "static_gradient": true, "twinkle": true - } + }, + "brightness_steps": 17, + "hue_steps": 10, + "led_count": 5, + "saturation_steps": 17 + }, + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x3001", + "vid": "0x7BA1" }, + "ws2812": { + "driver": "pwm", + "pin": "B8" "layouts": { + }, "LAYOUT": { "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 }, { "matrix": [0, 2], "x": 2, "y": 0 } ] From 389f4c1aa9744080d8dab01e0ad3d7f36780ffb6 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Tue, 5 Dec 2023 11:31:46 +0800 Subject: [PATCH 20/26] Update info.json --- keyboards/mwstudio/mmk_3/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/info.json index 8f1f93cfda30..45857708c961 100644 --- a/keyboards/mwstudio/mmk_3/info.json +++ b/keyboards/mwstudio/mmk_3/info.json @@ -28,6 +28,7 @@ "static_gradient": true, "twinkle": true }, + "pin": "B8", "brightness_steps": 17, "hue_steps": 10, "led_count": 5, @@ -40,8 +41,7 @@ "vid": "0x7BA1" }, "ws2812": { - "driver": "pwm", - "pin": "B8" + "driver": "pwm" "layouts": { }, "LAYOUT": { From 7fc29ab07fff28b6e41b86815545a0f4981a9728 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Tue, 5 Dec 2023 13:56:32 +0800 Subject: [PATCH 21/26] Update keyboards/mwstudio/mmk_3/config.h Co-authored-by: Drashna Jaelre --- keyboards/mwstudio/mmk_3/config.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/config.h b/keyboards/mwstudio/mmk_3/config.h index d08fe234a0f4..0265d3ed6e39 100644 --- a/keyboards/mwstudio/mmk_3/config.h +++ b/keyboards/mwstudio/mmk_3/config.h @@ -19,8 +19,8 @@ #define RGBLIGHT_LAYERS #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 -#define WS2812_PWM_DRIVER PWMD4 // default: PWMD2 -#define WS2812_PWM_CHANNEL 3 // default: 2 -#define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DRIVER PWMD4 +#define WS2812_PWM_CHANNEL 3 +#define WS2812_PWM_PAL_MODE 1 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_DMA_CHANNEL 2 From 911c74998271758b8116e41a1fffaf15acce3f1a Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Tue, 5 Dec 2023 13:56:43 +0800 Subject: [PATCH 22/26] Update keyboards/mwstudio/mmk_3/info.json Co-authored-by: Drashna Jaelre --- keyboards/mwstudio/mmk_3/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/info.json index 45857708c961..d76d110be7a4 100644 --- a/keyboards/mwstudio/mmk_3/info.json +++ b/keyboards/mwstudio/mmk_3/info.json @@ -28,7 +28,6 @@ "static_gradient": true, "twinkle": true }, - "pin": "B8", "brightness_steps": 17, "hue_steps": 10, "led_count": 5, From 6f14f336dc6ad1b6d85481a2f2beba4504cd30c9 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Tue, 5 Dec 2023 13:56:49 +0800 Subject: [PATCH 23/26] Update keyboards/mwstudio/mmk_3/info.json Co-authored-by: Drashna Jaelre --- keyboards/mwstudio/mmk_3/info.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/info.json index d76d110be7a4..7cfd81d1d3ed 100644 --- a/keyboards/mwstudio/mmk_3/info.json +++ b/keyboards/mwstudio/mmk_3/info.json @@ -41,8 +41,9 @@ }, "ws2812": { "driver": "pwm" - "layouts": { + "pin": "B8", }, + "layouts": { "LAYOUT": { "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, From d47c20ae7e6a50a72a6827f0e03f5c99538743d0 Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Tue, 5 Dec 2023 14:24:03 +0800 Subject: [PATCH 24/26] format keymap.c --- keyboards/mwstudio/mmk_3/keymaps/via/keymap.c | 40 ++++++------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/keymaps/via/keymap.c b/keyboards/mwstudio/mmk_3/keymaps/via/keymap.c index 44891f49198f..c48cc10e3699 100644 --- a/keyboards/mwstudio/mmk_3/keymaps/via/keymap.c +++ b/keyboards/mwstudio/mmk_3/keymaps/via/keymap.c @@ -16,36 +16,22 @@ #include QMK_KEYBOARD_H -const rgblight_segment_t PROGMEM my_layer0_dfu[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_WHITE} ); -const rgblight_segment_t PROGMEM my_layer1_val[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_BLUE} ); -const rgblight_segment_t PROGMEM my_layer2_sat[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_PURPLE} ); -const rgblight_segment_t PROGMEM my_layer3_hue[] = RGBLIGHT_LAYER_SEGMENTS( {3, 2, HSV_RED} ); +const rgblight_segment_t PROGMEM my_layer0_dfu[] = RGBLIGHT_LAYER_SEGMENTS({3, 2, HSV_WHITE}); +const rgblight_segment_t PROGMEM my_layer1_val[] = RGBLIGHT_LAYER_SEGMENTS({3, 2, HSV_BLUE}); +const rgblight_segment_t PROGMEM my_layer2_sat[] = RGBLIGHT_LAYER_SEGMENTS({3, 2, HSV_PURPLE}); +const rgblight_segment_t PROGMEM my_layer3_hue[] = RGBLIGHT_LAYER_SEGMENTS({3, 2, HSV_RED}); const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - LT(3, KC_LCTL), LT(1, KC_C), LT(2, KC_V) - ), - - [1] = LAYOUT( - RGB_VAD, KC_TRNS, RGB_VAI - ), - - [2] = LAYOUT( - RGB_SAD, RGB_SAI, KC_TRNS - ), - - [3] = LAYOUT( - KC_TRNS, RGB_HUD, RGB_HUI - ) -}; - -const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( - my_layer0_dfu, - my_layer1_val, - my_layer2_sat, - my_layer3_hue -); + [0] = LAYOUT(LT(3, KC_LCTL), LT(1, KC_C), LT(2, KC_V)), + + [1] = LAYOUT(RGB_VAD, KC_TRNS, RGB_VAI), + + [2] = LAYOUT(RGB_SAD, RGB_SAI, KC_TRNS), + + [3] = LAYOUT(KC_TRNS, RGB_HUD, RGB_HUI)}; + +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_layer0_dfu, my_layer1_val, my_layer2_sat, my_layer3_hue); void keyboard_post_init_user(void) { // Enable the LED layers From 2f49d214e5b7b0be16e119ab69fb277fed9e3f0f Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Tue, 5 Dec 2023 14:24:23 +0800 Subject: [PATCH 25/26] Update keymap.c --- .../mwstudio/mmk_3/keymaps/default/keymap.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c b/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c index 3ccf449dbff9..b4cc8ae31573 100644 --- a/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c +++ b/keyboards/mwstudio/mmk_3/keymaps/default/keymap.c @@ -17,19 +17,10 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - LT(3, KC_LCTL), LT(1, KC_C), LT(2, KC_V) - ), + [0] = LAYOUT(LT(3, KC_LCTL), LT(1, KC_C), LT(2, KC_V)), - [1] = LAYOUT( - RGB_VAD, KC_TRNS, RGB_VAI - ), + [1] = LAYOUT(RGB_VAD, KC_TRNS, RGB_VAI), - [2] = LAYOUT( - RGB_SAD, RGB_SAI, KC_TRNS - ), + [2] = LAYOUT(RGB_SAD, RGB_SAI, KC_TRNS), - [3] = LAYOUT( - KC_TRNS, RGB_HUD, RGB_HUI - ) -}; + [3] = LAYOUT(KC_TRNS, RGB_HUD, RGB_HUI)}; From 517f7049e59895cb4d684ac04ac6b2549cfbd4bc Mon Sep 17 00:00:00 2001 From: TW59420 <40019210+TW59420@users.noreply.github.com> Date: Sun, 10 Dec 2023 11:24:14 +0800 Subject: [PATCH 26/26] Update keyboards/mwstudio/mmk_3/info.json Co-authored-by: Joel Challis --- keyboards/mwstudio/mmk_3/info.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/info.json index 7cfd81d1d3ed..c63bd69f6281 100644 --- a/keyboards/mwstudio/mmk_3/info.json +++ b/keyboards/mwstudio/mmk_3/info.json @@ -28,10 +28,8 @@ "static_gradient": true, "twinkle": true }, - "brightness_steps": 17, "hue_steps": 10, - "led_count": 5, - "saturation_steps": 17 + "led_count": 5 }, "url": "", "usb": {