diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2018-10-25 14:06:52 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2018-10-25 14:06:52 +0200 |
| commit | 8692f49bfc10f3fbe257646dbb6b06677cc88007 (patch) | |
| tree | 73925bd165d87e4fe4db304ffe2458d21a21cf85 | |
| parent | e3f0c6556f66e97b8cf47df4473da52242a58997 (diff) | |
.
| -rw-r--r-- | include/driver/soft_i2c.h | 4 | ||||
| -rw-r--r-- | src/driver/soft_i2c.cc | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/driver/soft_i2c.h b/include/driver/soft_i2c.h index f3ba14f..7960df2 100644 --- a/include/driver/soft_i2c.h +++ b/include/driver/soft_i2c.h @@ -6,7 +6,7 @@ class SoftI2C { SoftI2C(const SoftI2C ©); unsigned char sda, scl; -#if SOFTI2C_PULLUP_EXTERNAL || SOFTI2C_PULLUP_FIXED_GPIO +#if SOFTI2C_PULLUP_EXTERNAL unsigned char sda_pull, scl_pull; #endif @@ -16,7 +16,7 @@ class SoftI2C { unsigned char rx(bool send_ack); public: -#if SOFTI2C_PULLUP_EXTERNAL || SOFTI2C_PULLUP_FIXED_GPIO +#if SOFTI2C_PULLUP_EXTERNAL SoftI2C(unsigned char sda, unsigned char scl, unsigned char sda_pull, unsigned char scl_pull) : sda(sda), scl(scl), sda_pull(sda_pull), scl_pull(scl_pull) {} diff --git a/src/driver/soft_i2c.cc b/src/driver/soft_i2c.cc index 6523286..e16c4a1 100644 --- a/src/driver/soft_i2c.cc +++ b/src/driver/soft_i2c.cc @@ -46,10 +46,8 @@ signed char SoftI2C::setup() #endif #ifdef SOFTI2C_PULLUP_FIXED_GPIO #if MULTIPASS_ARCH_msp430fr5969lp - gpio.output(GPIO::p1_4); - gpio.output(GPIO::p1_5); - gpio.write(GPIO::p1_4, 1); - gpio.write(GPIO::p1_5, 1); + gpio.output(GPIO::p1_4, 1); + gpio.output(GPIO::p1_5, 1); #else #error "softi2c_pullup=gpio not supported on this architecture" #endif /* MULTIPASS_ARCH_* */ |