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/s_ol | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/s_ol')
| -rw-r--r-- | keyboards/s_ol/0xc_pad/config.h | 1 | ||||
| -rw-r--r-- | keyboards/s_ol/0xc_pad/info.json | 5 | ||||
| -rw-r--r-- | keyboards/s_ol/0xc_pad/rules.mk | 6 |
3 files changed, 3 insertions, 9 deletions
diff --git a/keyboards/s_ol/0xc_pad/config.h b/keyboards/s_ol/0xc_pad/config.h index 7a6d897e47..d99a5188bf 100644 --- a/keyboards/s_ol/0xc_pad/config.h +++ b/keyboards/s_ol/0xc_pad/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" /* ws2812 RGB LED */ #define RGB_DI_PIN C7 diff --git a/keyboards/s_ol/0xc_pad/info.json b/keyboards/s_ol/0xc_pad/info.json index 4462b983ec..decf0ae1cb 100644 --- a/keyboards/s_ol/0xc_pad/info.json +++ b/keyboards/s_ol/0xc_pad/info.json @@ -1,7 +1,6 @@ { "keyboard_name": "0xC.pad", "url": "https://s-ol.nu/0xC.pad", - "debounce": 5, "diode_direction": "ROW2COL", "matrix_pins": { "rows": ["B7", "B6", "B5", "B4"], @@ -29,5 +28,7 @@ "vid": "0x732D", "pid": "0x0C70", "device_version": "0.0.1" - } + }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu" } diff --git a/keyboards/s_ol/0xc_pad/rules.mk b/keyboards/s_ol/0xc_pad/rules.mk index 1322621d85..d17272fe99 100644 --- a/keyboards/s_ol/0xc_pad/rules.mk +++ b/keyboards/s_ol/0xc_pad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |