diff options
author | Ryan <fauxpark@gmail.com> | 2021-01-25 16:37:53 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-25 16:37:53 +1100 |
commit | c65aecc53adfc1c2cae11acdc4fb973792061767 (patch) | |
tree | b90f4aeb00d05e2c4786b9d9e03680b8e8c58ad2 | |
parent | 66836effdae5e47231b59a92ed8726ad3267a055 (diff) | |
download | qmk_firmware-c65aecc53adfc1c2cae11acdc4fb973792061767.tar.gz qmk_firmware-c65aecc53adfc1c2cae11acdc4fb973792061767.zip |
Remove redundant I2C config defines from keyboards (#11661)
-rw-r--r-- | keyboards/aeboards/ext65/rev2/config.h | 1 | ||||
-rw-r--r-- | keyboards/clueboard/66_hotswap/gen1/config.h | 1 | ||||
-rw-r--r-- | keyboards/dekunukem/duckypad/config.h | 6 | ||||
-rw-r--r-- | keyboards/handwired/pill60/config.h | 7 | ||||
-rw-r--r-- | keyboards/handwired/riblee_f411/mcuconf.h | 3 | ||||
-rw-r--r-- | keyboards/matrix/m20add/config.h | 1 | ||||
-rw-r--r-- | keyboards/matrix/noah/config.h | 1 | ||||
-rw-r--r-- | keyboards/xelus/kangaroo/config.h | 1 | ||||
-rw-r--r-- | keyboards/xelus/valor_frl_tkl/config.h | 1 | ||||
-rw-r--r-- | keyboards/zoo/wampus/config.h | 4 |
10 files changed, 0 insertions, 26 deletions
diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h index 9db2b3138..541f07ee9 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 <http://www.gnu.org/licenses/>. | |||
60 | #define I2C1_SCL_PAL_MODE 1 | 60 | #define I2C1_SCL_PAL_MODE 1 |
61 | #define I2C1_SDA_PAL_MODE 1 | 61 | #define I2C1_SDA_PAL_MODE 1 |
62 | 62 | ||
63 | #define I2C1_TIMINGR_PRESC 0U | ||
64 | #define I2C1_TIMINGR_SCLDEL 3U | 63 | #define I2C1_TIMINGR_SCLDEL 3U |
65 | #define I2C1_TIMINGR_SDADEL 1U | 64 | #define I2C1_TIMINGR_SDADEL 1U |
66 | #define I2C1_TIMINGR_SCLH 3U | 65 | #define I2C1_TIMINGR_SCLH 3U |
diff --git a/keyboards/clueboard/66_hotswap/gen1/config.h b/keyboards/clueboard/66_hotswap/gen1/config.h index 7c90d05b3..4f1cc481d 100644 --- a/keyboards/clueboard/66_hotswap/gen1/config.h +++ b/keyboards/clueboard/66_hotswap/gen1/config.h | |||
@@ -131,7 +131,6 @@ | |||
131 | // 0b1110101 AD <-> SCL | 131 | // 0b1110101 AD <-> SCL |
132 | // 0b1110110 AD <-> SDA | 132 | // 0b1110110 AD <-> SDA |
133 | #define LED_DRIVER_ADDR_1 0b1110100 | 133 | #define LED_DRIVER_ADDR_1 0b1110100 |
134 | #define I2C1_BANK GPIOB | ||
135 | #define I2C1_SCL 8 | 134 | #define I2C1_SCL 8 |
136 | #define I2C1_SDA 9 | 135 | #define I2C1_SDA 9 |
137 | 136 | ||
diff --git a/keyboards/dekunukem/duckypad/config.h b/keyboards/dekunukem/duckypad/config.h index 27806ab83..9abfd0bd7 100644 --- a/keyboards/dekunukem/duckypad/config.h +++ b/keyboards/dekunukem/duckypad/config.h | |||
@@ -41,18 +41,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
41 | #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE | 41 | #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE |
42 | #define RGB_MATRIX_STARTUP_HUE 221 | 42 | #define RGB_MATRIX_STARTUP_HUE 221 |
43 | 43 | ||
44 | #define I2C1_SCL_BANK GPIOB | ||
45 | #define I2C1_SCL 8 | 44 | #define I2C1_SCL 8 |
46 | #define I2C1_SDA_BANK GPIOB | ||
47 | #define I2C1_SDA 9 | 45 | #define I2C1_SDA 9 |
48 | 46 | ||
49 | #define I2C1_SCL_PAL_MODE 1 | 47 | #define I2C1_SCL_PAL_MODE 1 |
50 | #define I2C1_SDA_PAL_MODE 1 | 48 | #define I2C1_SDA_PAL_MODE 1 |
51 | 49 | ||
52 | #define I2C1_OPMODE OPMODE_I2C | ||
53 | #define I2C1_CLOCK_SPEED 100000 | ||
54 | #define I2C1_DUTY_CYCLE STD_DUTY_CYCLE | ||
55 | |||
56 | #define OLED_DISPLAY_ADDRESS 0x3C | 50 | #define OLED_DISPLAY_ADDRESS 0x3C |
57 | #define OLED_DISPLAY_128X64 | 51 | #define OLED_DISPLAY_128X64 |
58 | #define OLED_COM_PINS 0x12 | 52 | #define OLED_COM_PINS 0x12 |
diff --git a/keyboards/handwired/pill60/config.h b/keyboards/handwired/pill60/config.h index d9940c77c..16147e584 100644 --- a/keyboards/handwired/pill60/config.h +++ b/keyboards/handwired/pill60/config.h | |||
@@ -44,10 +44,3 @@ | |||
44 | #define ENCODERS_PAD_B \ | 44 | #define ENCODERS_PAD_B \ |
45 | { B8 } | 45 | { B8 } |
46 | #define ENCODER_RESOLUTION 2 | 46 | #define ENCODER_RESOLUTION 2 |
47 | |||
48 | /* OLED */ | ||
49 | #define I2C_DRIVER I2CD1 | ||
50 | #define I2C1_SCL_BANK GPIOB | ||
51 | #define I2C1_SDA_BANK GPIOB | ||
52 | #define I2C1_SCL 6 | ||
53 | #define I2C1_SDA 7 | ||
diff --git a/keyboards/handwired/riblee_f411/mcuconf.h b/keyboards/handwired/riblee_f411/mcuconf.h index 51561d37e..79a654f1a 100644 --- a/keyboards/handwired/riblee_f411/mcuconf.h +++ b/keyboards/handwired/riblee_f411/mcuconf.h | |||
@@ -20,6 +20,3 @@ | |||
20 | 20 | ||
21 | #undef STM32_I2C_USE_I2C1 | 21 | #undef STM32_I2C_USE_I2C1 |
22 | #define STM32_I2C_USE_I2C1 TRUE | 22 | #define STM32_I2C_USE_I2C1 TRUE |
23 | |||
24 | #undef I2C_DRIVER | ||
25 | #define I2C_DRIVER I2CD1 | ||
diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h index 8c3f922ab..a4b3a6648 100644 --- a/keyboards/matrix/m20add/config.h +++ b/keyboards/matrix/m20add/config.h | |||
@@ -78,7 +78,6 @@ | |||
78 | #define DEBOUNCE 5 | 78 | #define DEBOUNCE 5 |
79 | 79 | ||
80 | // i2c setting | 80 | // i2c setting |
81 | #define USE_I2CV1 | ||
82 | #define I2C1_SCL 8 | 81 | #define I2C1_SCL 8 |
83 | #define I2C1_SDA 9 | 82 | #define I2C1_SDA 9 |
84 | #define I2C1_CLOCK_SPEED 400000 | 83 | #define I2C1_CLOCK_SPEED 400000 |
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h index 5e5b49b61..1b0f2515c 100644 --- a/keyboards/matrix/noah/config.h +++ b/keyboards/matrix/noah/config.h | |||
@@ -24,7 +24,6 @@ | |||
24 | #define DEBOUNCE 5 | 24 | #define DEBOUNCE 5 |
25 | 25 | ||
26 | // i2c setting | 26 | // i2c setting |
27 | #define USE_I2CV1 | ||
28 | #define I2C1_SCL 8 | 27 | #define I2C1_SCL 8 |
29 | #define I2C1_SDA 9 | 28 | #define I2C1_SDA 9 |
30 | #define I2C1_CLOCK_SPEED 400000 | 29 | #define I2C1_CLOCK_SPEED 400000 |
diff --git a/keyboards/xelus/kangaroo/config.h b/keyboards/xelus/kangaroo/config.h index 0c3e6e291..f6b17c24a 100644 --- a/keyboards/xelus/kangaroo/config.h +++ b/keyboards/xelus/kangaroo/config.h | |||
@@ -49,7 +49,6 @@ | |||
49 | #define I2C1_SCL_PAL_MODE 1 | 49 | #define I2C1_SCL_PAL_MODE 1 |
50 | #define I2C1_SDA_PAL_MODE 1 | 50 | #define I2C1_SDA_PAL_MODE 1 |
51 | 51 | ||
52 | #define I2C1_TIMINGR_PRESC 0U | ||
53 | #define I2C1_TIMINGR_SCLDEL 3U | 52 | #define I2C1_TIMINGR_SCLDEL 3U |
54 | #define I2C1_TIMINGR_SDADEL 1U | 53 | #define I2C1_TIMINGR_SDADEL 1U |
55 | #define I2C1_TIMINGR_SCLH 3U | 54 | #define I2C1_TIMINGR_SCLH 3U |
diff --git a/keyboards/xelus/valor_frl_tkl/config.h b/keyboards/xelus/valor_frl_tkl/config.h index ff2ea6dd0..5319a95ba 100644 --- a/keyboards/xelus/valor_frl_tkl/config.h +++ b/keyboards/xelus/valor_frl_tkl/config.h | |||
@@ -53,7 +53,6 @@ | |||
53 | #define I2C1_SCL_PAL_MODE 1 | 53 | #define I2C1_SCL_PAL_MODE 1 |
54 | #define I2C1_SDA_PAL_MODE 1 | 54 | #define I2C1_SDA_PAL_MODE 1 |
55 | 55 | ||
56 | #define I2C1_TIMINGR_PRESC 0U | ||
57 | #define I2C1_TIMINGR_SCLDEL 3U | 56 | #define I2C1_TIMINGR_SCLDEL 3U |
58 | #define I2C1_TIMINGR_SDADEL 1U | 57 | #define I2C1_TIMINGR_SDADEL 1U |
59 | #define I2C1_TIMINGR_SCLH 3U | 58 | #define I2C1_TIMINGR_SCLH 3U |
diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h index 1b67ac89a..c3a13ec35 100644 --- a/keyboards/zoo/wampus/config.h +++ b/keyboards/zoo/wampus/config.h | |||
@@ -70,13 +70,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
70 | 70 | ||
71 | // OLED defines | 71 | // OLED defines |
72 | #define OLED_TIMEOUT 60000 | 72 | #define OLED_TIMEOUT 60000 |
73 | /* Both pins are in bank B */ | ||
74 | #define I2C1_SCL 6 // B6 | ||
75 | #define I2C1_SDA 7 // B7 | ||
76 | #define I2C1_SCL_PAL_MODE 1 | 73 | #define I2C1_SCL_PAL_MODE 1 |
77 | #define I2C1_SDA_PAL_MODE 1 | 74 | #define I2C1_SDA_PAL_MODE 1 |
78 | /* This configures the I2C clock to 400khz assuming a 48Mhz clock */ | 75 | /* This configures the I2C clock to 400khz assuming a 48Mhz clock */ |
79 | #define I2C1_TIMINGR_PRESC 0U | ||
80 | #define I2C1_TIMINGR_SCLDEL 3U | 76 | #define I2C1_TIMINGR_SCLDEL 3U |
81 | #define I2C1_TIMINGR_SDADEL 1U | 77 | #define I2C1_TIMINGR_SDADEL 1U |
82 | #define I2C1_TIMINGR_SCLH 3U | 78 | #define I2C1_TIMINGR_SCLH 3U |