diff options
Diffstat (limited to 'keyboards/tronguylabs')
-rw-r--r-- | keyboards/tronguylabs/m122_3270/blackpill/info.json | 5 | ||||
-rw-r--r-- | keyboards/tronguylabs/m122_3270/blackpill/rules.mk | 7 | ||||
-rw-r--r-- | keyboards/tronguylabs/m122_3270/bluepill/info.json | 4 | ||||
-rw-r--r-- | keyboards/tronguylabs/m122_3270/bluepill/rules.mk | 7 | ||||
-rw-r--r-- | keyboards/tronguylabs/m122_3270/config.h | 8 | ||||
-rw-r--r-- | keyboards/tronguylabs/m122_3270/info.json | 1 | ||||
-rw-r--r-- | keyboards/tronguylabs/m122_3270/teensy/info.json | 4 | ||||
-rw-r--r-- | keyboards/tronguylabs/m122_3270/teensy/rules.mk | 6 |
8 files changed, 11 insertions, 31 deletions
diff --git a/keyboards/tronguylabs/m122_3270/blackpill/info.json b/keyboards/tronguylabs/m122_3270/blackpill/info.json index e557e4d307..f5e8f4835d 100644 --- a/keyboards/tronguylabs/m122_3270/blackpill/info.json +++ b/keyboards/tronguylabs/m122_3270/blackpill/info.json @@ -1,5 +1,8 @@ { "usb": { "device_version": "0.0.2" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/tronguylabs/m122_3270/blackpill/rules.mk b/keyboards/tronguylabs/m122_3270/blackpill/rules.mk index 821cf29632..0a85fffb85 100644 --- a/keyboards/tronguylabs/m122_3270/blackpill/rules.mk +++ b/keyboards/tronguylabs/m122_3270/blackpill/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tronguylabs/m122_3270/bluepill/info.json b/keyboards/tronguylabs/m122_3270/bluepill/info.json index b377cdff00..86af52a58d 100644 --- a/keyboards/tronguylabs/m122_3270/bluepill/info.json +++ b/keyboards/tronguylabs/m122_3270/bluepill/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.3" - } + }, + "processor": "STM32F103", + "bootloader": "stm32duino" } diff --git a/keyboards/tronguylabs/m122_3270/bluepill/rules.mk b/keyboards/tronguylabs/m122_3270/bluepill/rules.mk index 023c22cd2c..e69de29bb2 100644 --- a/keyboards/tronguylabs/m122_3270/bluepill/rules.mk +++ b/keyboards/tronguylabs/m122_3270/bluepill/rules.mk @@ -1,7 +0,0 @@ -# Overrides for the Bluepill version - -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino diff --git a/keyboards/tronguylabs/m122_3270/config.h b/keyboards/tronguylabs/m122_3270/config.h index 801fc9ee50..e51a882c42 100644 --- a/keyboards/tronguylabs/m122_3270/config.h +++ b/keyboards/tronguylabs/m122_3270/config.h @@ -16,17 +16,9 @@ #pragma once -#include "config_common.h" // Both controllers draw 100 mA or less #define USB_MAX_POWER_CONSUMPTION 100 -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 20 - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 15 diff --git a/keyboards/tronguylabs/m122_3270/info.json b/keyboards/tronguylabs/m122_3270/info.json index f6fba523d6..23dc5366ed 100644 --- a/keyboards/tronguylabs/m122_3270/info.json +++ b/keyboards/tronguylabs/m122_3270/info.json @@ -6,6 +6,7 @@ "vid": "0x1209", "pid": "0x3270" }, + "debounce": 15, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tronguylabs/m122_3270/teensy/info.json b/keyboards/tronguylabs/m122_3270/teensy/info.json index 90ac25f360..def31867f6 100644 --- a/keyboards/tronguylabs/m122_3270/teensy/info.json +++ b/keyboards/tronguylabs/m122_3270/teensy/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.1" - } + }, + "processor": "at90usb1286", + "bootloader": "halfkay" } diff --git a/keyboards/tronguylabs/m122_3270/teensy/rules.mk b/keyboards/tronguylabs/m122_3270/teensy/rules.mk index 16c4501c04..0a85fffb85 100644 --- a/keyboards/tronguylabs/m122_3270/teensy/rules.mk +++ b/keyboards/tronguylabs/m122_3270/teensy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # |