diff options
| author | fauxpark <fauxpark@gmail.com> | 2022-09-30 05:19:53 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2022-09-30 05:19:53 +1000 |
| commit | dbb70871fcb98b98dd5544b53f4083dfc2aeefff (patch) | |
| tree | 75839f796a26c2f2908b584e3ca0a35457f83fe2 /keyboards/handwired/onekey/teensy_35 | |
| parent | dbe214c3268d9a316a137471a7679f7e45046e49 (diff) | |
| parent | 45b5ed5c6e1ecdf95e9ce0523a8ff49d45b8822f (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/handwired/onekey/teensy_35')
| -rw-r--r-- | keyboards/handwired/onekey/teensy_35/config.h | 3 | ||||
| -rw-r--r-- | keyboards/handwired/onekey/teensy_35/info.json | 8 | ||||
| -rw-r--r-- | keyboards/handwired/onekey/teensy_35/rules.mk | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/keyboards/handwired/onekey/teensy_35/config.h b/keyboards/handwired/onekey/teensy_35/config.h index 13eaf1a4f6..0f15fc87d8 100644 --- a/keyboards/handwired/onekey/teensy_35/config.h +++ b/keyboards/handwired/onekey/teensy_35/config.h @@ -19,9 +19,6 @@ // TODO: including this causes "error: expected identifier before '(' token" errors //#include "config_common.h" -#define MATRIX_COL_PINS { D5 } // 20/A6 -#define MATRIX_ROW_PINS { B2 } // 19/A5 - // i2c_master defines #define I2C1_SCL_PIN B0 // 16/A2 on pinout #define I2C1_SDA_PIN B1 // 17/A3 on pinout diff --git a/keyboards/handwired/onekey/teensy_35/info.json b/keyboards/handwired/onekey/teensy_35/info.json index 99b6a236c5..59cc1decdc 100644 --- a/keyboards/handwired/onekey/teensy_35/info.json +++ b/keyboards/handwired/onekey/teensy_35/info.json @@ -1,3 +1,9 @@ { - "keyboard_name": "Onekey Teensy 3.5" + "keyboard_name": "Onekey Teensy 3.5", + "processor": "MK64FX512", + "bootloader": "halfkay", + "matrix_pins": { + "cols": ["D5"], // 20/A6 + "rows": ["B2"] // 19/A5 + } } diff --git a/keyboards/handwired/onekey/teensy_35/rules.mk b/keyboards/handwired/onekey/teensy_35/rules.mk index 8ebefd03f5..a92b099328 100644 --- a/keyboards/handwired/onekey/teensy_35/rules.mk +++ b/keyboards/handwired/onekey/teensy_35/rules.mk @@ -1,8 +1,2 @@ -# MCU name -MCU = MK64FX512 - -# Bootloader selection -BOOTLOADER = halfkay - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |