From 0d0664a2149d93d1898615cfa5e02a9c2110345f Mon Sep 17 00:00:00 2001 From: Kaleb Elwert Date: Wed, 4 Apr 2018 15:13:42 -0700 Subject: [PATCH] Various tweaks for some Input:Club build processes --- keyboards/ergodox_infinity/rules.mk | 2 ++ keyboards/infinity60/config.h | 4 +--- keyboards/infinity60/rules.mk | 5 ++++- keyboards/whitefox/config.h | 2 -- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/keyboards/ergodox_infinity/rules.mk b/keyboards/ergodox_infinity/rules.mk index c243c258..1cc95193 100644 --- a/keyboards/ergodox_infinity/rules.mk +++ b/keyboards/ergodox_infinity/rules.mk @@ -58,6 +58,8 @@ OPT_DEFS += -DCORTEX_VTOR_INIT=0x00002000 # comment out to disable the options. # +DFU_ARGS = -d 1c11:b007 + BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) diff --git a/keyboards/infinity60/config.h b/keyboards/infinity60/config.h index bffe6489..8306c8f7 100644 --- a/keyboards/infinity60/config.h +++ b/keyboards/infinity60/config.h @@ -24,10 +24,8 @@ along with this program. If not, see . #define VENDOR_ID 0x1c11 #define PRODUCT_ID 0xb04d #define DEVICE_VER 0x0001 -/* in python2: list(u"whatever".encode('utf-16-le')) */ -/* at most 32 characters or the ugly hack in usb_main.c borks */ #define MANUFACTURER Input Club -#define PRODUCT Infinity_60%/QMK +#define PRODUCT Infinity_60%_LED/QMK /* key matrix size */ #define MATRIX_ROWS 9 #define MATRIX_COLS 7 diff --git a/keyboards/infinity60/rules.mk b/keyboards/infinity60/rules.mk index f689b547..8cb2b375 100644 --- a/keyboards/infinity60/rules.mk +++ b/keyboards/infinity60/rules.mk @@ -56,6 +56,9 @@ OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000 # Build Options # comment out to disable the options. # + +DFU_ARGS = -d 1c11:b007 + BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.) MOUSEKEY_ENABLE = yes # Mouse keys @@ -66,4 +69,4 @@ SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover CUSTOM_MATRIX = yes # Custom matrix file -LAYOUTS = 60_ansi_split_bs_rshift \ No newline at end of file +LAYOUTS = 60_ansi_split_bs_rshift diff --git a/keyboards/whitefox/config.h b/keyboards/whitefox/config.h index 9989a92d..e508c3e9 100644 --- a/keyboards/whitefox/config.h +++ b/keyboards/whitefox/config.h @@ -24,8 +24,6 @@ along with this program. If not, see . #define VENDOR_ID 0x1c11 #define PRODUCT_ID 0xb04d #define DEVICE_VER 0x0001 -/* in python2: list(u"whatever".encode('utf-16-le')) */ -/* at most 32 characters or the ugly hack in usb_main.c borks */ #define MANUFACTURER Input Club #define PRODUCT WhiteFox/QMK