summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
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.cc2
-rw-r--r--src/app/ccs811test/main.cc2
-rw-r--r--src/app/datalogger/main.cc4
-rw-r--r--src/app/i2cbench/main.cc2
-rw-r--r--src/app/i2cdetect/main.cc2
-rw-r--r--src/app/luxlog/main.cc2
-rw-r--r--src/app/mpu9250_motionlog/main.cc2
-rw-r--r--src/app/ssd1306test/main.cc2
9 files changed, 10 insertions, 10 deletions
diff --git a/src/app/bme680-max44009-logger/main.cc b/src/app/bme680-max44009-logger/main.cc
index 5ea1cee..ac742d8 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(DRIVER_SOFTI2C)
+#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
#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 99172bf..ac60205 100644
--- a/src/app/button-and-motion-logger/main.cc
+++ b/src/app/button-and-motion-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(DRIVER_SOFTI2C)
+#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
#include "driver/i2c.h"
#else
#include "driver/soft_i2c.h"
diff --git a/src/app/ccs811test/main.cc b/src/app/ccs811test/main.cc
index bd53999..da51546 100644
--- a/src/app/ccs811test/main.cc
+++ b/src/app/ccs811test/main.cc
@@ -6,7 +6,7 @@
#include "arch.h"
#include "driver/gpio.h"
#include "driver/stdout.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(DRIVER_SOFTI2C)
+#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
#include "driver/i2c.h"
#else
#include "driver/soft_i2c.h"
diff --git a/src/app/datalogger/main.cc b/src/app/datalogger/main.cc
index 46ff6b0..0119d27 100644
--- a/src/app/datalogger/main.cc
+++ b/src/app/datalogger/main.cc
@@ -9,7 +9,7 @@
#if defined(DRIVER_I2C)
#include "driver/i2c.h"
-#elif defined(DRIVER_SOFTI2C)
+#elif defined(CONFIG_driver_softi2c)
#include "driver/soft_i2c.h"
#endif
@@ -159,7 +159,7 @@ int main(void)
gpio.setup();
kout.setup();
-#if defined(DRIVER_I2C) || defined(DRIVER_SOFTI2C)
+#if defined(DRIVER_I2C) || defined(CONFIG_driver_softi2c)
if (i2c.setup() != 0) {
kout << "I2C setup FAILED" << endl;
return 1;
diff --git a/src/app/i2cbench/main.cc b/src/app/i2cbench/main.cc
index ba24bc3..db2ad51 100644
--- a/src/app/i2cbench/main.cc
+++ b/src/app/i2cbench/main.cc
@@ -6,7 +6,7 @@
#include "arch.h"
#include "driver/gpio.h"
#include "driver/stdout.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(DRIVER_SOFTI2C)
+#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
#include "driver/i2c.h"
#else
#include "driver/soft_i2c.h"
diff --git a/src/app/i2cdetect/main.cc b/src/app/i2cdetect/main.cc
index 95a34bb..ab954d7 100644
--- a/src/app/i2cdetect/main.cc
+++ b/src/app/i2cdetect/main.cc
@@ -9,7 +9,7 @@
#ifdef DRIVER_HARDWARE_I2C
#include "driver/i2c.h"
#endif
-#ifdef DRIVER_SOFTI2C
+#ifdef CONFIG_driver_softi2c
#include "driver/soft_i2c.h"
#endif
diff --git a/src/app/luxlog/main.cc b/src/app/luxlog/main.cc
index ebaecfb..7b17462 100644
--- a/src/app/luxlog/main.cc
+++ b/src/app/luxlog/main.cc
@@ -6,7 +6,7 @@
#include "arch.h"
#include "driver/gpio.h"
#include "driver/stdout.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(DRIVER_SOFTI2C)
+#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
#include "driver/i2c.h"
#else
#include "driver/soft_i2c.h"
diff --git a/src/app/mpu9250_motionlog/main.cc b/src/app/mpu9250_motionlog/main.cc
index 7b47f71..6b7e80e 100644
--- a/src/app/mpu9250_motionlog/main.cc
+++ b/src/app/mpu9250_motionlog/main.cc
@@ -6,7 +6,7 @@
#include "arch.h"
#include "driver/gpio.h"
#include "driver/stdout.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(DRIVER_SOFTI2C)
+#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
#include "driver/i2c.h"
#else
#include "driver/soft_i2c.h"
diff --git a/src/app/ssd1306test/main.cc b/src/app/ssd1306test/main.cc
index 909d26d..c8a5703 100644
--- a/src/app/ssd1306test/main.cc
+++ b/src/app/ssd1306test/main.cc
@@ -6,7 +6,7 @@
#include "arch.h"
#include "driver/gpio.h"
#include "driver/stdout.h"
-#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(DRIVER_SOFTI2C)
+#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(CONFIG_driver_softi2c)
#include "driver/i2c.h"
#else
#include "driver/soft_i2c.h"