From f18bfc7f53113af49c1ecf29ff572edf3fd09069 Mon Sep 17 00:00:00 2001
From: jean-marc <jm.chiappa@gmail.com>
Date: Fri, 9 May 2025 09:06:05 +0200
Subject: [PATCH] fix issue when instantiating 2 differents ToF

---
 src/vl53l7cx_api.h                                   |  6 ++++--
 src/vl53l7cx_buffers.h                               |  2 +-
 src/vl53l7cx_class.h                                 |  2 +-
 src/{platform.cpp => vl53l7cx_platform.cpp}          |  0
 src/{platform.h => vl53l7cx_platform.h}              |  8 ++++----
 ...{platform_config.h => vl53l7cx_platform_config.h} | 12 ++++++------
 ..._default.h => vl53l7cx_platform_config_default.h} |  6 +++---
 7 files changed, 19 insertions(+), 17 deletions(-)
 rename src/{platform.cpp => vl53l7cx_platform.cpp} (100%)
 rename src/{platform.h => vl53l7cx_platform.h} (95%)
 rename src/{platform_config.h => vl53l7cx_platform_config.h} (88%)
 rename src/{platform_config_default.h => vl53l7cx_platform_config_default.h} (96%)

diff --git a/src/vl53l7cx_api.h b/src/vl53l7cx_api.h
index e90045e..a48ee47 100644
--- a/src/vl53l7cx_api.h
+++ b/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_
diff --git a/src/vl53l7cx_buffers.h b/src/vl53l7cx_buffers.h
index 446a73b..42981cf 100644
--- a/src/vl53l7cx_buffers.h
+++ b/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.
diff --git a/src/vl53l7cx_class.h b/src/vl53l7cx_class.h
index 7cc8c08..462eb72 100644
--- a/src/vl53l7cx_class.h
+++ b/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"
diff --git a/src/platform.cpp b/src/vl53l7cx_platform.cpp
similarity index 100%
rename from src/platform.cpp
rename to src/vl53l7cx_platform.cpp
diff --git a/src/platform.h b/src/vl53l7cx_platform.h
similarity index 95%
rename from src/platform.h
rename to src/vl53l7cx_platform.h
index f251f3b..d6b77dc 100644
--- a/src/platform.h
+++ b/src/vl53l7cx_platform.h
@@ -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_
diff --git a/src/platform_config.h b/src/vl53l7cx_platform_config.h
similarity index 88%
rename from src/platform_config.h
rename to src/vl53l7cx_platform_config.h
index c73a3c4..1fb387b 100644
--- a/src/platform_config.h
+++ b/src/vl53l7cx_platform_config.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_
diff --git a/src/platform_config_default.h b/src/vl53l7cx_platform_config_default.h
similarity index 96%
rename from src/platform_config_default.h
rename to src/vl53l7cx_platform_config_default.h
index 58ae195..b84e1ce 100644
--- a/src/platform_config_default.h
+++ b/src/vl53l7cx_platform_config_default.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_