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/bpiphany/ghost_squid | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/bpiphany/ghost_squid')
-rw-r--r-- | keyboards/bpiphany/ghost_squid/config.h | 9 | ||||
-rw-r--r-- | keyboards/bpiphany/ghost_squid/info.json | 8 | ||||
-rw-r--r-- | keyboards/bpiphany/ghost_squid/rules.mk | 6 |
3 files changed, 8 insertions, 15 deletions
diff --git a/keyboards/bpiphany/ghost_squid/config.h b/keyboards/bpiphany/ghost_squid/config.h index a57767cae9..f18ee18888 100644 --- a/keyboards/bpiphany/ghost_squid/config.h +++ b/keyboards/bpiphany/ghost_squid/config.h @@ -17,7 +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 8 @@ -25,11 +24,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define LED_PIN_ON_STATE 0 -#define LED_NUM_LOCK_PIN C5 -#define LED_CAPS_LOCK_PIN C6 -#define LED_SCROLL_LOCK_PIN B7 - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json index 2938b1b6eb..bed329ccaf 100644 --- a/keyboards/bpiphany/ghost_squid/info.json +++ b/keyboards/bpiphany/ghost_squid/info.json @@ -8,6 +8,14 @@ "pid": "0x6050", "device_version": "1.0.4" }, + "indicators": { + "caps_lock": "C6", + "num_lock": "C5", + "scroll_lock": "B7", + "on_state": 0 + }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "community_layouts": [ "fullsize_ansi", "fullsize_iso" diff --git a/keyboards/bpiphany/ghost_squid/rules.mk b/keyboards/bpiphany/ghost_squid/rules.mk index b4b4c1ef3e..2f6a5a7346 100644 --- a/keyboards/bpiphany/ghost_squid/rules.mk +++ b/keyboards/bpiphany/ghost_squid/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |