diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
| commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
| tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/zoo | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/zoo')
| -rw-r--r-- | keyboards/zoo/wampus/config.h | 17 | ||||
| -rw-r--r-- | keyboards/zoo/wampus/info.json | 12 | ||||
| -rw-r--r-- | keyboards/zoo/wampus/rules.mk | 8 |
3 files changed, 12 insertions, 25 deletions
diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h index bd378f415a..739358f693 100644 --- a/keyboards/zoo/wampus/config.h +++ b/keyboards/zoo/wampus/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 /* * Keyboard Matrix Assignments @@ -39,15 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define LED_NUM_LOCK_PIN B0 -#define LED_CAPS_LOCK_PIN B8 -#define LED_SCROLL_LOCK_PIN B9 - -// In-switch LED defines -#define BACKLIGHT_PIN A6 -#define BACKLIGHT_LEVELS 3 -#define BACKLIGHT_BREATHING - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 @@ -81,9 +67,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define I2C1_TIMINGR_SCLH 3U #define I2C1_TIMINGR_SCLL 9U -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json index bb74820d41..74bf17b603 100644 --- a/keyboards/zoo/wampus/info.json +++ b/keyboards/zoo/wampus/info.json @@ -8,6 +8,18 @@ "pid": "0xE600", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "breathing": true + }, + "indicators": { + "caps_lock": "B8", + "num_lock": "B0", + "scroll_lock": "B9" + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "community_layouts": ["alice", "alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { "layout": [ diff --git a/keyboards/zoo/wampus/rules.mk b/keyboards/zoo/wampus/rules.mk index b00c869401..81a2dca23f 100644 --- a/keyboards/zoo/wampus/rules.mk +++ b/keyboards/zoo/wampus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # @@ -21,5 +15,3 @@ OLED_ENABLE = no # Enables the use of OLED displays # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE - -LAYOUTS = alice alice_split_bs |