From c65aecc53adfc1c2cae11acdc4fb973792061767 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 25 Jan 2021 16:37:53 +1100 Subject: [PATCH] Remove redundant I2C config defines from keyboards (#11661) --- keyboards/aeboards/ext65/rev2/config.h | 1 - keyboards/clueboard/66_hotswap/gen1/config.h | 1 - keyboards/dekunukem/duckypad/config.h | 6 ------ keyboards/handwired/pill60/config.h | 7 ------- keyboards/handwired/riblee_f411/mcuconf.h | 3 --- keyboards/matrix/m20add/config.h | 1 - keyboards/matrix/noah/config.h | 1 - keyboards/xelus/kangaroo/config.h | 1 - keyboards/xelus/valor_frl_tkl/config.h | 1 - keyboards/zoo/wampus/config.h | 4 ---- 10 files changed, 26 deletions(-) diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h index 9db2b3138b6..541f07ee986 100644 --- a/keyboards/aeboards/ext65/rev2/config.h +++ b/keyboards/aeboards/ext65/rev2/config.h @@ -60,7 +60,6 @@ along with this program. If not, see . #define I2C1_SCL_PAL_MODE 1 #define I2C1_SDA_PAL_MODE 1 -#define I2C1_TIMINGR_PRESC 0U #define I2C1_TIMINGR_SCLDEL 3U #define I2C1_TIMINGR_SDADEL 1U #define I2C1_TIMINGR_SCLH 3U diff --git a/keyboards/clueboard/66_hotswap/gen1/config.h b/keyboards/clueboard/66_hotswap/gen1/config.h index 7c90d05b381..4f1cc481d2d 100644 --- a/keyboards/clueboard/66_hotswap/gen1/config.h +++ b/keyboards/clueboard/66_hotswap/gen1/config.h @@ -131,7 +131,6 @@ // 0b1110101 AD <-> SCL // 0b1110110 AD <-> SDA #define LED_DRIVER_ADDR_1 0b1110100 -#define I2C1_BANK GPIOB #define I2C1_SCL 8 #define I2C1_SDA 9 diff --git a/keyboards/dekunukem/duckypad/config.h b/keyboards/dekunukem/duckypad/config.h index 27806ab83df..9abfd0bd718 100644 --- a/keyboards/dekunukem/duckypad/config.h +++ b/keyboards/dekunukem/duckypad/config.h @@ -41,18 +41,12 @@ along with this program. If not, see . #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE #define RGB_MATRIX_STARTUP_HUE 221 -#define I2C1_SCL_BANK GPIOB #define I2C1_SCL 8 -#define I2C1_SDA_BANK GPIOB #define I2C1_SDA 9 #define I2C1_SCL_PAL_MODE 1 #define I2C1_SDA_PAL_MODE 1 -#define I2C1_OPMODE OPMODE_I2C -#define I2C1_CLOCK_SPEED 100000 -#define I2C1_DUTY_CYCLE STD_DUTY_CYCLE - #define OLED_DISPLAY_ADDRESS 0x3C #define OLED_DISPLAY_128X64 #define OLED_COM_PINS 0x12 diff --git a/keyboards/handwired/pill60/config.h b/keyboards/handwired/pill60/config.h index d9940c77c26..16147e584bb 100644 --- a/keyboards/handwired/pill60/config.h +++ b/keyboards/handwired/pill60/config.h @@ -44,10 +44,3 @@ #define ENCODERS_PAD_B \ { B8 } #define ENCODER_RESOLUTION 2 - -/* OLED */ -#define I2C_DRIVER I2CD1 -#define I2C1_SCL_BANK GPIOB -#define I2C1_SDA_BANK GPIOB -#define I2C1_SCL 6 -#define I2C1_SDA 7 diff --git a/keyboards/handwired/riblee_f411/mcuconf.h b/keyboards/handwired/riblee_f411/mcuconf.h index 51561d37efa..79a654f1a43 100644 --- a/keyboards/handwired/riblee_f411/mcuconf.h +++ b/keyboards/handwired/riblee_f411/mcuconf.h @@ -20,6 +20,3 @@ #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE - -#undef I2C_DRIVER -#define I2C_DRIVER I2CD1 diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h index 8c3f922ab91..a4b3a66480c 100644 --- a/keyboards/matrix/m20add/config.h +++ b/keyboards/matrix/m20add/config.h @@ -78,7 +78,6 @@ #define DEBOUNCE 5 // i2c setting -#define USE_I2CV1 #define I2C1_SCL 8 #define I2C1_SDA 9 #define I2C1_CLOCK_SPEED 400000 diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h index 5e5b49b6190..1b0f2515c7b 100644 --- a/keyboards/matrix/noah/config.h +++ b/keyboards/matrix/noah/config.h @@ -24,7 +24,6 @@ #define DEBOUNCE 5 // i2c setting -#define USE_I2CV1 #define I2C1_SCL 8 #define I2C1_SDA 9 #define I2C1_CLOCK_SPEED 400000 diff --git a/keyboards/xelus/kangaroo/config.h b/keyboards/xelus/kangaroo/config.h index 0c3e6e291b3..f6b17c24a37 100644 --- a/keyboards/xelus/kangaroo/config.h +++ b/keyboards/xelus/kangaroo/config.h @@ -49,7 +49,6 @@ #define I2C1_SCL_PAL_MODE 1 #define I2C1_SDA_PAL_MODE 1 -#define I2C1_TIMINGR_PRESC 0U #define I2C1_TIMINGR_SCLDEL 3U #define I2C1_TIMINGR_SDADEL 1U #define I2C1_TIMINGR_SCLH 3U diff --git a/keyboards/xelus/valor_frl_tkl/config.h b/keyboards/xelus/valor_frl_tkl/config.h index ff2ea6dd058..5319a95bae2 100644 --- a/keyboards/xelus/valor_frl_tkl/config.h +++ b/keyboards/xelus/valor_frl_tkl/config.h @@ -53,7 +53,6 @@ #define I2C1_SCL_PAL_MODE 1 #define I2C1_SDA_PAL_MODE 1 -#define I2C1_TIMINGR_PRESC 0U #define I2C1_TIMINGR_SCLDEL 3U #define I2C1_TIMINGR_SDADEL 1U #define I2C1_TIMINGR_SCLH 3U diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h index 1b67ac89a43..c3a13ec355e 100644 --- a/keyboards/zoo/wampus/config.h +++ b/keyboards/zoo/wampus/config.h @@ -70,13 +70,9 @@ along with this program. If not, see . // OLED defines #define OLED_TIMEOUT 60000 -/* Both pins are in bank B */ -#define I2C1_SCL 6 // B6 -#define I2C1_SDA 7 // B7 #define I2C1_SCL_PAL_MODE 1 #define I2C1_SDA_PAL_MODE 1 /* This configures the I2C clock to 400khz assuming a 48Mhz clock */ -#define I2C1_TIMINGR_PRESC 0U #define I2C1_TIMINGR_SCLDEL 3U #define I2C1_TIMINGR_SDADEL 1U #define I2C1_TIMINGR_SCLH 3U