diff options
author | lokher <lokher@gmail.com> | 2022-12-06 17:10:48 +0800 |
---|---|---|
committer | lokher <lokher@gmail.com> | 2022-12-07 15:50:49 +0800 |
commit | a336c2c5005251e4cb0f3a62ccabdb4cfccad915 (patch) | |
tree | 3c948b631a5e3b6f940dabe02fad3c7487e6f350 /keyboards/tzarc/ghoul/rev1/stm32 | |
parent | 27fc28fd2ff52e079a5bc58d6aaea4c752420615 (diff) |
Merge upstream master to 2022 Q4 breaking change
Diffstat (limited to 'keyboards/tzarc/ghoul/rev1/stm32')
-rw-r--r-- | keyboards/tzarc/ghoul/rev1/stm32/board.h | 9 | ||||
-rw-r--r-- | keyboards/tzarc/ghoul/rev1/stm32/config.h | 47 | ||||
-rw-r--r-- | keyboards/tzarc/ghoul/rev1/stm32/halconf.h | 9 | ||||
-rw-r--r-- | keyboards/tzarc/ghoul/rev1/stm32/info.json | 15 | ||||
-rw-r--r-- | keyboards/tzarc/ghoul/rev1/stm32/mcuconf.h | 17 | ||||
-rw-r--r-- | keyboards/tzarc/ghoul/rev1/stm32/rules.mk | 2 |
6 files changed, 0 insertions, 99 deletions
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/board.h b/keyboards/tzarc/ghoul/rev1/stm32/board.h deleted file mode 100644 index 5379bd4a17..0000000000 --- a/keyboards/tzarc/ghoul/rev1/stm32/board.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) -// SPDX-License-Identifier: GPL-3.0-or-later -#pragma once - -#include_next "board.h" - -#ifdef BOARD_OTG_NOVBUSSENS -# undef BOARD_OTG_NOVBUSSENS -#endif diff --git a/keyboards/tzarc/ghoul/rev1/stm32/config.h b/keyboards/tzarc/ghoul/rev1/stm32/config.h deleted file mode 100644 index b9059f1837..0000000000 --- a/keyboards/tzarc/ghoul/rev1/stm32/config.h +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) -// SPDX-License-Identifier: GPL-3.0-or-later -#pragma once - -#include "config_common.h" - -// Matrix configuration -#define SPI_MATRIX_CHIP_SELECT_PIN C4 -#define SPI_MATRIX_DIVISOR 32 - -// Encoder -#define ENCODER_PUSHBUTTON_PIN C1 - -// SPI Configuration -#define SPI_DRIVER SPID1 -#define SPI_SCK_PIN A5 -#define SPI_SCK_PAL_MODE 5 -#define SPI_MOSI_PIN A6 -#define SPI_MOSI_PAL_MODE 5 -#define SPI_MISO_PIN A7 -#define SPI_MISO_PAL_MODE 5 - -// EEPROM/Flash configuration -#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 16 -#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN B3 -#define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR 16 -#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN A4 - -// RGB configuration -#define RGB_DI_PIN C6 -#define WS2812_PWM_DRIVER PWMD3 -#define WS2812_PWM_CHANNEL 1 -#define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 5 -#define RGB_ENABLE_PIN C0 - -// ADC Configuration -#define ADC_RESOLUTION ADC_CFGR1_RES_12BIT -#define ADC_SATURATION ((1 << 12) - 1) -#define ADC_CURRENT_PIN C5 // ADC12_IN15 -#define ADC_VOLTAGE_PIN B0 // ADC12_IN8 - -// Display Configuration -#define OLED_CS_PIN D2 -#define OLED_DC_PIN A8 -#define OLED_RST_PIN A0 diff --git a/keyboards/tzarc/ghoul/rev1/stm32/halconf.h b/keyboards/tzarc/ghoul/rev1/stm32/halconf.h deleted file mode 100644 index 66d4d70a9d..0000000000 --- a/keyboards/tzarc/ghoul/rev1/stm32/halconf.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) -// SPDX-License-Identifier: GPL-3.0-or-later -#pragma once - -#define HAL_USE_ADC TRUE -#define HAL_USE_SPI TRUE -#define HAL_USE_PWM TRUE - -#include_next <halconf.h> diff --git a/keyboards/tzarc/ghoul/rev1/stm32/info.json b/keyboards/tzarc/ghoul/rev1/stm32/info.json deleted file mode 100644 index 11dcde90c9..0000000000 --- a/keyboards/tzarc/ghoul/rev1/stm32/info.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "keyboard_name": "Ghoul_STM32", - "processor": "STM32F405", - "bootloader": "stm32-dfu", - "bootloader_instructions": "Press the 5 keys on the bottom row of the left side, or hold the boot switch and tap the reset switch, or hold the top-left key when plugging in the board.", - "encoder": { - "rotary": [ - { - "pin_a": "B10", - "pin_b": "B1", - "resolution": 2 - } - ] - } -} diff --git a/keyboards/tzarc/ghoul/rev1/stm32/mcuconf.h b/keyboards/tzarc/ghoul/rev1/stm32/mcuconf.h deleted file mode 100644 index fe307993c7..0000000000 --- a/keyboards/tzarc/ghoul/rev1/stm32/mcuconf.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) -// SPDX-License-Identifier: GPL-3.0-or-later -#pragma once - -#include_next <mcuconf.h> - -// Used for RGB -#undef STM32_ADC_USE_ADC1 -#define STM32_ADC_USE_ADC1 TRUE - -// Used for EEPROM -#undef STM32_SPI_USE_SPI1 -#define STM32_SPI_USE_SPI1 TRUE - -// Used for RGB -#undef STM32_PWM_USE_TIM3 -#define STM32_PWM_USE_TIM3 TRUE diff --git a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk deleted file mode 100644 index 69d4b426e1..0000000000 --- a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -WS2812_DRIVER = pwm -SRC += analog.c |