From e585d5246b7391d35a5dc4b1ce2f79a310570f5e Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Sat, 10 Apr 2021 11:09:57 +0200
Subject: Allow software and hardware i2c to be used together (e.g. on
 different pins)

---
 src/app/i2cdetect/main.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/app/i2cdetect')

diff --git a/src/app/i2cdetect/main.cc b/src/app/i2cdetect/main.cc
index fb6f54c..95a34bb 100644
--- a/src/app/i2cdetect/main.cc
+++ b/src/app/i2cdetect/main.cc
@@ -6,9 +6,10 @@
 #include "arch.h"
 #include "driver/gpio.h"
 #include "driver/stdout.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(DRIVER_SOFTI2C)
+#ifdef DRIVER_HARDWARE_I2C
 #include "driver/i2c.h"
-#else
+#endif
+#ifdef DRIVER_SOFTI2C
 #include "driver/soft_i2c.h"
 #endif
 
-- 
cgit v1.2.3