From df1b665a3cc5fdab60a0f6520a34d64da8f9f764 Mon Sep 17 00:00:00 2001 From: flabbergast Date: Tue, 10 Nov 2015 20:54:01 +0000 Subject: [PATCH] Infinity_chibios: improve comments. --- keyboard/infinity_chibios/Makefile | 8 +++++--- keyboard/infinity_chibios/config.h | 5 ++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/keyboard/infinity_chibios/Makefile b/keyboard/infinity_chibios/Makefile index 6fca4890..9999451c 100644 --- a/keyboard/infinity_chibios/Makefile +++ b/keyboard/infinity_chibios/Makefile @@ -25,6 +25,7 @@ CONFIG_H = config.h # /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) # - For Teensies, FAMILY = KINETIS and SERIES is either # KL2x (LC) or K20x (3.0,3.1,3.2). +# - For Infinity KB, SERIES = K20x MCU_FAMILY = KINETIS MCU_SERIES = K20x @@ -36,14 +37,14 @@ MCU_SERIES = K20x # - MKL26Z64 for Teensy LC # - MK20DX128 for Teensy 3.0 # - MK20DX256 for Teensy 3.1 and 3.2 -#MCU_LDSCRIPT = MK20DX128 +# - MK20DX128BLDR4 for Infinity with Kiibohd bootloader MCU_LDSCRIPT = MK20DX128BLDR4 # Startup code to use # - it should exist in /os/common/ports/ARMCMx/compilers/GCC/mk/ # - STARTUP = # - kl2x for Teensy LC -# - k20x5 for Teensy 3.0 +# - k20x5 for Teensy 3.0 and Infinity KB # - k20x7 for Teensy 3.1 and 3.2 MCU_STARTUP = k20x5 @@ -53,6 +54,7 @@ MCU_STARTUP = k20x5 # - PJRC_TEENSY_LC for Teensy LC # - PJRC_TEENSY_3 for Teensy 3.0 # - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2 +# - MCHCK_K20 for Infinity KB BOARD = MCHCK_K20 # Cortex version @@ -65,9 +67,9 @@ ARMV = 7 # Vector table for application # 0x00000000-0x00001000 area is occupied by bootlaoder.*/ +# The CORTEX_VTOR... is needed only for MCHCK/Infinity KB OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000 - # Build Options # comment out to disable the options. # diff --git a/keyboard/infinity_chibios/config.h b/keyboard/infinity_chibios/config.h index b4b7fcd3..cb902220 100644 --- a/keyboard/infinity_chibios/config.h +++ b/keyboard/infinity_chibios/config.h @@ -27,9 +27,8 @@ along with this program. If not, see . /* at most 32 characters or the ugly hack in usb_main.c borks */ #define MANUFACTURER "TMK" #define USBSTR_MANUFACTURER 'T', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00', '\xc6', '\x00' -#define PRODUCT "ChibiOS TMK test" -#define USBSTR_PRODUCT 'C', '\x00', 'h', '\x00', 'i', '\x00', 'b', '\x00', 'i', '\x00', 'O', '\x00', 'S', '\x00', ' ', '\x00', 'T', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00', 't', '\x00', 'e', '\x00', 's', '\x00', 't', '\x00' -#define DESCRIPTION "TMK keyboard firmware over ChibiOS" +#define PRODUCT "Infinity keyboard/TMK" +#define USBSTR_PRODUCT 'I', '\x00', 'n', '\x00', 'f', '\x00', 'i', '\x00', 'n', '\x00', 'i', '\x00', 't', '\x00', 'y', '\x00', ' ', '\x00', 'k', '\x00', 'e', '\x00', 'y', '\x00', 'b', '\x00', 'o', '\x00', 'a', '\x00', 'r', '\x00', 'd', '\x00', '/', '\x00', 'T', '\x00', 'M', '\x00', 'K', '\x00' /* key matrix size */ #define MATRIX_ROWS 9 -- 2.39.3