diff options
Diffstat (limited to 'keyboards/handwired/macroboard')
-rw-r--r-- | keyboards/handwired/macroboard/config.h | 4 | ||||
-rw-r--r-- | keyboards/handwired/macroboard/f401/info.json | 13 | ||||
-rw-r--r-- | keyboards/handwired/macroboard/f401/keyboard.json | 23 | ||||
-rw-r--r-- | keyboards/handwired/macroboard/f401/rules.mk | 13 | ||||
-rw-r--r-- | keyboards/handwired/macroboard/f411/info.json | 13 | ||||
-rw-r--r-- | keyboards/handwired/macroboard/f411/keyboard.json | 27 | ||||
-rw-r--r-- | keyboards/handwired/macroboard/f411/rules.mk | 14 |
7 files changed, 52 insertions, 55 deletions
diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h index 95e7d9d1aa..b8e437bddf 100644 --- a/keyboards/handwired/macroboard/config.h +++ b/keyboards/handwired/macroboard/config.h @@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 // 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_DMA_STREAM STM32_DMA1_STREAM6 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #define WS2812_PWM_TARGET_PERIOD 800000 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/handwired/macroboard/f401/info.json b/keyboards/handwired/macroboard/f401/info.json deleted file mode 100644 index 5108d8ce50..0000000000 --- a/keyboards/handwired/macroboard/f401/info.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "matrix_pins": { - "cols": ["A5", "A6", "A7", "B0", "B1", "B10"], - "rows": ["A4", "A3", "A2", "A1", "A0"] - }, - "diode_direction": "COL2ROW", - "ws2812": { - "driver": "pwm" - }, - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F401" -} diff --git a/keyboards/handwired/macroboard/f401/keyboard.json b/keyboards/handwired/macroboard/f401/keyboard.json new file mode 100644 index 0000000000..d5e217b2f3 --- /dev/null +++ b/keyboards/handwired/macroboard/f401/keyboard.json @@ -0,0 +1,23 @@ +{ + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, + "matrix_pins": { + "cols": ["A5", "A6", "A7", "B0", "B1", "B10"], + "rows": ["A4", "A3", "A2", "A1", "A0"] + }, + "diode_direction": "COL2ROW", + "ws2812": { + "driver": "pwm" + }, + "development_board": "blackpill_f401", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + } +} diff --git a/keyboards/handwired/macroboard/f401/rules.mk b/keyboards/handwired/macroboard/f401/rules.mk deleted file mode 100644 index bc0cd6b97f..0000000000 --- a/keyboards/handwired/macroboard/f401/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/info.json deleted file mode 100644 index d7ff61f52b..0000000000 --- a/keyboards/handwired/macroboard/f411/info.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "matrix_pins": { - "cols": ["B12", "B13", "B14", "B15", "A8", "A10"], - "rows": ["A15", "B3", "B4", "B5", "B7"] - }, - "diode_direction": "COL2ROW", - "ws2812": { - "driver": "pwm" - }, - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" -} diff --git a/keyboards/handwired/macroboard/f411/keyboard.json b/keyboards/handwired/macroboard/f411/keyboard.json new file mode 100644 index 0000000000..8b1155d774 --- /dev/null +++ b/keyboards/handwired/macroboard/f411/keyboard.json @@ -0,0 +1,27 @@ +{ + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, + "matrix_pins": { + "cols": ["B12", "B13", "B14", "B15", "A8", "A10"], + "rows": ["A15", "B3", "B4", "B5", "B7"] + }, + "diode_direction": "COL2ROW", + "audio": { + "driver": "pwm_hardware" + }, + "ws2812": { + "driver": "pwm" + }, + "development_board": "blackpill_f411", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "audio": true + } +} diff --git a/keyboards/handwired/macroboard/f411/rules.mk b/keyboards/handwired/macroboard/f411/rules.mk deleted file mode 100644 index cdf33bfea5..0000000000 --- a/keyboards/handwired/macroboard/f411/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output -AUDIO_DRIVER = pwm_hardware -KEYBOARD_SHARED_EP = yes |