v0.3: fixed some compilation issues for ESP8266

Author: SMFSW

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "Arduino Wrapper for Wire librarry (for SAM, ESP8266...
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.2
+PROJECT_NUMBER         = 0.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Release Notes.txt

@@ -13,6 +13,11 @@ Feel free to share your thoughts @ xgarmanboziax@gmail.com about:
 ------------
 
 ** Actual:
+v0.3	09 Jul 2017:
+- surrounded c libs with extern C
+- added I2C_OK undef when WireWrapper is included for ESP8266 (ESP8266 core use an equal I2C_OK def too)
+- No call to Wire.end on ESP8266 (no function for that)
+
 v0.2	31 Jan 2017:
 fixes for issue #1 (https://github.com/SMFSW/WireWrapper/issues/1)
 - refactored I2C_SPEED enum names for coherence with I2C specifications

WireWrapper.cpp

@@ -1,6 +1,6 @@
 /*!\file WireWrapper.c
 ** \author SMFSW
-** \version 0.2
+** \version 0.3
 ** \copyright MIT SMFSW (2017)
 ** \brief arduino master i2c in plain c code
 **/

WireWrapper.h

@@ -1,12 +1,12 @@
 /*!\file WireWrapper.h
 ** \author SMFSW
-** \version 0.2
+** \version 0.3
 ** \copyright MIT SMFSW (2017)
 ** \brief arduino i2c in plain c declarations
 **/
 /****************************************************************/
 #ifndef __WIREWRAPPER_H__
-	#define __WIREWRAPPER_H__		"v0.2"
+	#define __WIREWRAPPER_H__		"v0.3"
 /****************************************************************/
 
 #if defined(DOXY)
@@ -24,14 +24,13 @@
 	#include <WProgram.h>
 #endif
 
-#include <inttypes.h>
+extern "C" {
 #include <stdbool.h>
+#include <inttypes.h>
+}
 
 #include <Wire.h>
 
-#ifdef __cplusplus
-extern "C"{
-#endif
 
 #define DEF_CI2C_NB_RETRIES		3		//!< Default cI2C transaction retries
 #define DEF_CI2C_TIMEOUT		100		//!< Default cI2C timeout
@@ -58,6 +57,9 @@ typedef enum __attribute__((__packed__)) enI2C_SPEED {
 	I2C_HS = 3400		//!< I2C High Speed (3.4MHz)
 } I2C_SPEED;
 
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ESP8266_ESP01)
+#undef I2C_OK	//!\note I2C_OK already defined on ESP8266 (same value), undef before I2C_STATUS enum declaration
+#endif
 
 /*! \enum enI2C_STATUS
  *  \brief I2C slave status
@@ -184,7 +186,7 @@ extern void I2C_init(uint16_t speed);
  */
 inline void __attribute__((__always_inline__)) I2C_uninit()
 {
-	#if !defined(__TINY__)
+	#if !defined(__TINY__) && !defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ESP8266_ESP01)
 	Wire.end();
 	#endif
 }
@@ -260,9 +262,4 @@ inline I2C_STATUS __attribute__((__always_inline__)) I2C_read_next(I2C_SLAVE * s
 	return I2C_read(slave, slave->reg_addr, data, bytes);
 }
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif

library.properties

@@ -1,7 +1,7 @@
 name=WireWrapper
-version=0.2
-author=SMFSW
-maintainer=SMFSW
+version=0.3
+author=SMFSW <xgarmanboziax@gmail.com>
+maintainer=SMFSW <xgarmanboziax@gmail.com>
 sentence=Arduino Wrapper for Wire librarry (for SAM, ESP8266...)
 paragraph=A wrapper for Wire library meant to be put in place of cI2C library on SAM, ESP8266... targets
 category=Communication