Merge pull request #5 from jmchiappa/common-resources-conflict

fix issue when instantiating 2 differents ToF

Author: cparata

src/vl53l7cx_api.h

@@ -44,7 +44,7 @@
 
 
 
-#include "platform.h"
+#include "vl53l7cx_platform.h"
 
 /**
  * @brief Current driver version.
@@ -378,7 +378,8 @@ typedef struct {
 
 } VL53L7CX_ResultsData;
 
-
+#ifndef BLOCK_HEADER
+#define BLOCK_HEADER
 union Block_header {
   uint32_t bytes;
   struct {
@@ -387,5 +388,6 @@ union Block_header {
     uint32_t idx : 16;
   };
 };
+#endif
 
 #endif //VL53L7CX_API_H_

src/vl53l7cx_buffers.h

@@ -39,7 +39,7 @@
 #ifndef VL53L7CX_BUFFERS_H_
 #define VL53L7CX_BUFFERS_H_
 
-#include "platform.h"
+#include "vl53l7cx_platform.h"
 
 /**
  * @brief Inner internal number of targets.

src/vl53l7cx_class.h

@@ -40,7 +40,7 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "Arduino.h"
-#include "platform.h"
+#include "vl53l7cx_platform.h"
 #include "vl53l7cx_api.h"
 #include "vl53l7cx_plugin_detection_thresholds.h"
 #include "vl53l7cx_plugin_motion_indicator.h"

src/platform.cpp renamed to src/vl53l7cx_platform.cpp

@@ -35,15 +35,15 @@
  ******************************************************************************
  */
 
-#ifndef _PLATFORM_H_
-#define _PLATFORM_H_
+#ifndef _VL53L7_PLATFORM_H_
+#define _VL53L7_PLATFORM_H_
 #pragma once
 
 #include <stdint.h>
 #include <string.h>
 #include <Arduino.h>
 #include <Wire.h>
-#include "platform_config.h"
+#include "vl53l7cx_platform_config.h"
 
 
 #ifndef DEFAULT_I2C_BUFFER_LEN
@@ -78,4 +78,4 @@ typedef struct {
 
 } VL53L7CX_Platform;
 
-#endif  // _PLATFORM_H_
+#endif  // _VL53L7_PLATFORM_H_

src/platform.h renamed to src/vl53l7cx_platform.h

@@ -35,13 +35,13 @@
  ******************************************************************************
  */
 
-#ifndef _PLATFORM_CONFIG_H_
-#define _PLATFORM_CONFIG_H_
+#ifndef _VL53L7CX_PLATFORM_CONFIG_H_
+#define _VL53L7CX_PLATFORM_CONFIG_H_
 
-#if __has_include("platform_config_custom.h")
-  #include "platform_config_custom.h"
+#if __has_include("vl53l7cx_platform_config_custom.h")
+  #include "vl53l7cx_platform_config_custom.h"
 #else
-  #include "platform_config_default.h"
+  #include "vl53l7cx_platform_config_default.h"
 #endif
 
-#endif  // _PLATFORM_CONFIG_H_
+#endif  // _VL53L7CX_PLATFORM_CONFIG_H_

src/platform_config.h renamed to src/vl53l7cx_platform_config.h

@@ -35,8 +35,8 @@
  ******************************************************************************
  */
 
-#ifndef _PLATFORM_CONFIG_DEFAULT_H_
-#define _PLATFORM_CONFIG_DEFAULT_H_
+#ifndef _VL53L7CX_PLATFORM_CONFIG_DEFAULT_H_
+#define _VL53L7CX_PLATFORM_CONFIG_DEFAULT_H_
 
 /*
  * @brief If you want to customize these defines you can add in the application
@@ -80,4 +80,4 @@
 // #define VL53L7CX_DISABLE_TARGET_STATUS
 // #define VL53L7CX_DISABLE_MOTION_INDICATOR
 
-#endif  // _PLATFORM_CONFIG_DEFAULT_H_
+#endif  // _VL53L7CX_PLATFORM_CONFIG_DEFAULT_H_