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/handwired/rs60 | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/handwired/rs60')
| -rw-r--r-- | keyboards/handwired/rs60/config.h | 9 | ||||
| -rw-r--r-- | keyboards/handwired/rs60/info.json | 8 | ||||
| -rw-r--r-- | keyboards/handwired/rs60/rules.mk | 8 |
3 files changed, 8 insertions, 17 deletions
diff --git a/keyboards/handwired/rs60/config.h b/keyboards/handwired/rs60/config.h index 506b0bff0d..b9bf17a4a0 100644 --- a/keyboards/handwired/rs60/config.h +++ b/keyboards/handwired/rs60/config.h @@ -16,19 +16,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 12 - /* key matrix pins */ #define MATRIX_ROW_PINS { B5, B6, B4, B2, E6 } #define MATRIX_COL_PINS { C6, D4, D0, D1, D2, D3, F4, F5, F6, F7, B1, B3} -#define QMK_ESC_OUTPUT C6 -#define QMK_ESC_INPUT B4 -#define QMK_LED B0 -// #define QMK_SPEAKER C6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/rs60/info.json b/keyboards/handwired/rs60/info.json index cbf81141aa..ddd2cff353 100644 --- a/keyboards/handwired/rs60/info.json +++ b/keyboards/handwired/rs60/info.json @@ -8,6 +8,14 @@ "pid": "0x4260", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "B4", + "esc_output": "C6", + "led": "B0" + }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", + "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { "layout": [ diff --git a/keyboards/handwired/rs60/rules.mk b/keyboards/handwired/rs60/rules.mk index d14abe406b..c827f15dcf 100644 --- a/keyboards/handwired/rs60/rules.mk +++ b/keyboards/handwired/rs60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # @@ -16,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not be enabled AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port. - -LAYOUTS = ortho_5x12 |