From bc9d07a4d4acd1e612c1bb509372e40e60cd4d8d Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 25 Dec 2021 18:35:52 +0100 Subject: Configure SoftI2C SDA/SCL via kconfig only; remove external pull-up support --- src/driver/soft_i2c.cc | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'src/driver/soft_i2c.cc') diff --git a/src/driver/soft_i2c.cc b/src/driver/soft_i2c.cc index ada0481..ac4163d 100644 --- a/src/driver/soft_i2c.cc +++ b/src/driver/soft_i2c.cc @@ -237,26 +237,6 @@ ON_TIMER_INTERRUPT_tail #ifndef DRIVER_HARDWARE_I2C -#if CONFIG_driver_softi2c_pullup_dynamic_external -#ifdef MULTIPASS_ARCH_msp430fr5969lp -SoftI2C i2c(GPIO::p1_6, GPIO::p1_7, GPIO::p1_4, GPIO::p1_5); -#elif MULTIPASS_ARCH_msp430fr5994lp -SoftI2C i2c(GPIO::p5_0, GPIO::p5_1, GPIO::p8_2, GPIO::p8_3); -#else -#error "softi2c_pullup = external not supported on this architecture" -#endif /* MULTIPASS_ARCH_* */ -#else -#if MULTIPASS_ARCH_arduino_nano -SoftI2C i2c(GPIO::pc4, GPIO::pc5); -#elif MULTIPASS_ARCH_blinkenrocket -SoftI2C i2c(GPIO::pc4, GPIO::pc5); -#elif MULTIPASS_ARCH_msp430fr5969lp -SoftI2C i2c(GPIO::p1_6, GPIO::p1_7); -#elif MULTIPASS_ARCH_msp430fr5994lp -SoftI2C i2c(GPIO::p5_0, GPIO::p5_1); -#elif MULTIPASS_ARCH_posix -SoftI2C i2c(GPIO::px00, GPIO::px01); -#endif /* MULTIPASS_ARCH_* */ -#endif /* !CONFIG_driver_softi2c_pullup_dynamic_external */ +SoftI2C i2c(GPIO::CONFIG_driver_softi2c_sda, GPIO::CONFIG_driver_softi2c_scl); #endif /* !DRIVER_HARDWARE_I2C */ -- cgit v1.2.3