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/rart/rartland | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/rart/rartland')
| -rw-r--r-- | keyboards/rart/rartland/config.h | 25 | ||||
| -rw-r--r-- | keyboards/rart/rartland/info.json | 12 | ||||
| -rw-r--r-- | keyboards/rart/rartland/rules.mk | 8 |
3 files changed, 12 insertions, 33 deletions
diff --git a/keyboards/rart/rartland/config.h b/keyboards/rart/rartland/config.h index 934d41e7b2..aee0fdd862 100644 --- a/keyboards/rart/rartland/config.h +++ b/keyboards/rart/rartland/config.h @@ -16,11 +16,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 14 /* * Keyboard Matrix Assignments @@ -36,32 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { B4, A7, A5, A6, C3 } #define MATRIX_COL_PINS { B0, A1, B1, A2, B2, A3, B3, A4, C7, C6, D0, C5, D1, C4 } -#define LED_CAPS_LOCK_PIN A0 -#define LED_PIN_ON_STATE 0 - -#define ENCODERS_PAD_B { D5 } -#define ENCODERS_PAD_A { C2 } -#define ENCODER_RESOLUTION 2 //default/suggested - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* 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 */ #define LOCKING_RESYNC_ENABLE #define OLED_TIMEOUT 10000 - -/* #define RGB_DI_PIN D7 */ -/* #ifdef RGB_DI_PIN */ -/* #define RGBLED_NUM 11 */ -/* #define RGBLIGHT_HUE_STEP 8 */ -/* #define RGBLIGHT_SAT_STEP 8 */ -/* #define RGBLIGHT_VAL_STEP 8 */ -/* #define RGBLIGHT_LIMIT_VAL 240 */ -/* #define RGBLIGHT_SLEEP */ -/* #endif */ diff --git a/keyboards/rart/rartland/info.json b/keyboards/rart/rartland/info.json index 2e46454f85..5cfc6b7b70 100644 --- a/keyboards/rart/rartland/info.json +++ b/keyboards/rart/rartland/info.json @@ -8,6 +8,18 @@ "pid": "0x6065", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "D5", "pin_b": "C2", "resolution": 2} + ] + }, + "indicators": { + "caps_lock": "A0", + "on_state": 0 + }, + "processor": "atmega32a", + "bootloader": "usbasploader", + "community_layouts": ["65_ansi", "65_iso"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rartland/rules.mk b/keyboards/rart/rartland/rules.mk index a8e410c1ad..06d9ea1b91 100644 --- a/keyboards/rart/rartland/rules.mk +++ b/keyboards/rart/rartland/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # @@ -23,5 +17,3 @@ UNICODE_ENABLE = yes OLED_ENABLE = yes OLED_DRIVER = SSD1306 ENCODER_ENABLE = yes - -LAYOUTS = 65_ansi 65_iso |