summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2021-12-31 15:30:52 +0100
committerDaniel Friesel <derf@finalrewind.org>2021-12-31 15:30:52 +0100
commit44c73e7330aaa7d1411a8fd48b85d1b95bdc2b6b (patch)
tree84d3efb8c107ac9410af3602e3035f8e4125b62d /src/app
parentd3e2b724b4f924b9839f2896db4455c2564cf29d (diff)
Use CONFIG_meta_driver_hardware_i2c instead of MULTIPASS_ARCH_HAS_I2C
Diffstat (limited to 'src/app')
-rw-r--r--src/app/bme680-max44009-logger/main.cc2
-rw-r--r--src/app/button-and-motion-logger/main.cc4
-rw-r--r--src/app/luxlog/main.cc4
-rw-r--r--src/app/mpu9250_motionlog/main.cc4
-rw-r--r--src/app/posix-argv-to-ssd1306/main.cc4
-rw-r--r--src/app/posix-stdin-to-ssd1306/main.cc4
-rw-r--r--src/app/ssd1306test/main.cc4
7 files changed, 13 insertions, 13 deletions
diff --git a/src/app/bme680-max44009-logger/main.cc b/src/app/bme680-max44009-logger/main.cc
index ac742d8..3634d30 100644
--- a/src/app/bme680-max44009-logger/main.cc
+++ b/src/app/bme680-max44009-logger/main.cc
@@ -6,7 +6,7 @@
#include "arch.h"
#include "driver/gpio.h"
#include "driver/stdout.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
#include "driver/i2c.h"
#else
#include "driver/soft_i2c.h"
diff --git a/src/app/button-and-motion-logger/main.cc b/src/app/button-and-motion-logger/main.cc
index ac60205..2f2405e 100644
--- a/src/app/button-and-motion-logger/main.cc
+++ b/src/app/button-and-motion-logger/main.cc
@@ -6,9 +6,9 @@
#include "arch.h"
#include "driver/gpio.h"
#include "driver/stdout.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
#include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
#include "driver/soft_i2c.h"
#endif
#include "driver/adc.h"
diff --git a/src/app/luxlog/main.cc b/src/app/luxlog/main.cc
index 7b17462..50aaa90 100644
--- a/src/app/luxlog/main.cc
+++ b/src/app/luxlog/main.cc
@@ -6,9 +6,9 @@
#include "arch.h"
#include "driver/gpio.h"
#include "driver/stdout.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
#include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
#include "driver/soft_i2c.h"
#endif
#include "driver/max44009.h"
diff --git a/src/app/mpu9250_motionlog/main.cc b/src/app/mpu9250_motionlog/main.cc
index 5000732..0bf6fee 100644
--- a/src/app/mpu9250_motionlog/main.cc
+++ b/src/app/mpu9250_motionlog/main.cc
@@ -6,9 +6,9 @@
#include "arch.h"
#include "driver/gpio.h"
#include "driver/stdout.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
#include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
#include "driver/soft_i2c.h"
#endif
#include "driver/mpu9250.h"
diff --git a/src/app/posix-argv-to-ssd1306/main.cc b/src/app/posix-argv-to-ssd1306/main.cc
index 267b3e1..e16d05e 100644
--- a/src/app/posix-argv-to-ssd1306/main.cc
+++ b/src/app/posix-argv-to-ssd1306/main.cc
@@ -5,9 +5,9 @@
*/
#include "arch.h"
#include "driver/stdout.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
#include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
#include "driver/soft_i2c.h"
#endif
#include "driver/ssd1306.h"
diff --git a/src/app/posix-stdin-to-ssd1306/main.cc b/src/app/posix-stdin-to-ssd1306/main.cc
index a3fd085..0077724 100644
--- a/src/app/posix-stdin-to-ssd1306/main.cc
+++ b/src/app/posix-stdin-to-ssd1306/main.cc
@@ -5,9 +5,9 @@
*/
#include "arch.h"
#include "driver/stdout.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
#include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
#include "driver/soft_i2c.h"
#endif
#include "driver/ssd1306.h"
diff --git a/src/app/ssd1306test/main.cc b/src/app/ssd1306test/main.cc
index 0fb807e..d82ce57 100644
--- a/src/app/ssd1306test/main.cc
+++ b/src/app/ssd1306test/main.cc
@@ -5,9 +5,9 @@
*/
#include "arch.h"
#include "driver/stdout.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
+#if defined(CONFIG_meta_driver_hardware_i2c)
#include "driver/i2c.h"
-#else
+#elif defined(CONFIG_driver_softi2c)
#include "driver/soft_i2c.h"
#endif
#include "driver/ssd1306.h"