Diff: inc/vl53l1_def.h

Revision:

7:1add29d51e72

Parent:

0:3ac96e360672

Child:

18:0696efe39d08

diff -r e6ab11fe9df8 -r 1add29d51e72 inc/vl53l1_def.h
--- a/inc/vl53l1_def.h	Thu May 13 08:29:16 2021 +0000
+++ b/inc/vl53l1_def.h	Tue Jun 08 10:34:47 2021 +0100
@@ -1,62 +1,12 @@
+
+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
 /******************************************************************************
- * Copyright (c) 2017, STMicroelectronics - All Rights Reserved
-
- This file is part of VL53L1 Core and is dual licensed,
- either 'STMicroelectronics
- Proprietary license'
- or 'BSD 3-clause "New" or "Revised" License' , at your option.
-
- ******************************************************************************
-
- 'STMicroelectronics Proprietary license'
-
- *******************************************************************************
-
- License terms: STMicroelectronics Proprietary in accordance with licensing
- terms at www.st.com/sla0081
-
- STMicroelectronics confidential
- Reproduction and Communication of this document is strictly prohibited unless
- specifically authorized in writing by STMicroelectronics.
-
-
- *******************************************************************************
-
- Alternatively, VL53L1 Core may be distributed under the terms of
- 'BSD 3-clause "New" or "Revised" License', in which case the following
- provisions apply instead of the ones mentioned above :
-
- *******************************************************************************
+ * Copyright (c) 2020, STMicroelectronics - All Rights Reserved
 
- License terms: BSD 3-clause "New" or "Revised" License.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- *******************************************************************************
+ This file is part of VL53L1 and is dual licensed,
+ either GPL-2.0+
+ or 'BSD 3-clause "New" or "Revised" License' , at your option.
+ ******************************************************************************
  */
 
 /**
@@ -87,9 +37,9 @@
 /** VL53L1 IMPLEMENTATION minor version */
 #define VL53L1_IMPLEMENTATION_VER_MINOR       6
 /** VL53L1 IMPLEMENTATION sub version */
-#define VL53L1_IMPLEMENTATION_VER_SUB         1
+#define VL53L1_IMPLEMENTATION_VER_SUB         5
 /** VL53L1 IMPLEMENTATION sub version */
-#define VL53L1_IMPLEMENTATION_VER_REVISION  2432
+#define VL53L1_IMPLEMENTATION_VER_REVISION  2496
 
 /****************************************
  * PRIVATE define do not edit
@@ -852,4 +802,3 @@
 
 
 #endif /* _VL53L1_DEF_H_ */
-