fixed stm32 compile issue and __has_include compiler problem

u-fire · Nov 22, 2019 · f322e11 · f322e11
1 parent 7c45bf1
commit f322e11
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/library.json b/library.json
@@ -14,7 +14,7 @@
       "maintainer": true
     }
   ],
-  "version": "1.1.3",
+  "version": "1.1.4",
   "frameworks": "arduino",
   "platforms": "*"
 }
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Isolated ISE Probe Interface
-version=1.1.3
+version=1.1.4
 author=uFire
 maintainer=justin@ufire.co
 sentence=An isolated Ion Specific Electrode Probe Interface

diff --git a/src/uFire_ISE.cpp b/src/uFire_ISE.cpp
@@ -28,15 +28,15 @@
 uFire_ISE::uFire_ISE(uint8_t i2c_address)
 {
   _address = i2c_address;
-  #ifndef ARDUINO_SAMD_VARIANT_COMPLIANCE
+  #if !defined (ARDUINO_SAMD_VARIANT_COMPLIANCE) || !defined (_VARIANT_ARDUINO_STM32_)
   Wire.begin();
   #endif // ifndef ARDUINO_SAMD_VARIANT_COMPLIANCE
 }
 
 uFire_ISE::uFire_ISE()
 {
   _address = ISE_PROBE_I2C;
-  #ifndef ARDUINO_SAMD_VARIANT_COMPLIANCE
+  #if !defined (ARDUINO_SAMD_VARIANT_COMPLIANCE) || !defined (_VARIANT_ARDUINO_STM32_)
   Wire.begin();
   #endif // ifndef ARDUINO_SAMD_VARIANT_COMPLIANCE
 }

diff --git a/src/uFire_ORP_JSON.cpp b/src/uFire_ORP_JSON.cpp
@@ -1,4 +1,4 @@
-#if !defined (ESP8266)
+#ifdef __has_include
 #if __has_include("ArduinoJson.h")
 #include "uFire_ORP_JSON.h"
 #include <ArduinoJson.h>

diff --git a/src/uFire_ORP_MP.cpp b/src/uFire_ORP_MP.cpp
@@ -1,4 +1,4 @@
-#if !defined (ESP8266)
+#ifdef __has_include
 #if __has_include("ArduinoJson.h")
 #include "uFire_ORP_MP.h"
 #include <ArduinoJson.h>

diff --git a/src/uFire_pH_JSON.cpp b/src/uFire_pH_JSON.cpp
@@ -1,4 +1,4 @@
-#if !defined (ESP8266)
+#ifdef __has_include
 #if __has_include("ArduinoJson.h")
 #include "uFire_pH_JSON.h"
 #include <ArduinoJson.h>

diff --git a/src/uFire_pH_MP.cpp b/src/uFire_pH_MP.cpp
@@ -1,4 +1,4 @@
-#if !defined (ESP8266)
+#ifdef __has_include
 #if __has_include("ArduinoJson.h")
 #include "uFire_pH_MP.h"
 #include <ArduinoJson.h>