~ruther/qmk_firmware

cce7b91cb1c6f9805a962ca45e3b73a2295ed302 — QMK Bot 4 years ago 9579e92 + c65aecc
Merge remote-tracking branch 'origin/master' into develop
M keyboards/aeboards/ext65/rev2/config.h => keyboards/aeboards/ext65/rev2/config.h +0 -1
@@ 60,7 60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#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

M keyboards/clueboard/66_hotswap/gen1/config.h => keyboards/clueboard/66_hotswap/gen1/config.h +0 -1
@@ 106,7 106,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


M keyboards/dekunukem/duckypad/config.h => keyboards/dekunukem/duckypad/config.h +0 -6
@@ 41,18 41,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#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

M keyboards/handwired/pill60/config.h => keyboards/handwired/pill60/config.h +0 -7
@@ 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

M keyboards/handwired/riblee_f411/mcuconf.h => keyboards/handwired/riblee_f411/mcuconf.h +0 -3
@@ 20,6 20,3 @@

#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE

#undef I2C_DRIVER
#define I2C_DRIVER I2CD1

M keyboards/matrix/m20add/config.h => keyboards/matrix/m20add/config.h +0 -1
@@ 82,7 82,6 @@
#define DEBOUNCE    5

// i2c setting
#define USE_I2CV1
#define I2C1_SCL 8
#define I2C1_SDA 9
#define I2C1_CLOCK_SPEED 400000

M keyboards/matrix/noah/config.h => keyboards/matrix/noah/config.h +0 -1
@@ 26,7 26,6 @@
#define DEBOUNCE    5

// i2c setting
#define USE_I2CV1
#define I2C1_SCL 8
#define I2C1_SDA 9
#define I2C1_CLOCK_SPEED 400000

M keyboards/xelus/kangaroo/config.h => keyboards/xelus/kangaroo/config.h +0 -1
@@ 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

M keyboards/xelus/valor_frl_tkl/config.h => keyboards/xelus/valor_frl_tkl/config.h +0 -1
@@ 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

M keyboards/zoo/wampus/config.h => keyboards/zoo/wampus/config.h +0 -4
@@ 70,13 70,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

// 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