Merge pull request #11 from AndyEngland521/master

updating config block to only be called once

Author: AndyEngland521

README.md

@@ -1,9 +1,9 @@
-SparkFun VL53L1X Distance Sensor Library
-===========================================================
+SparkFun Qwiic 4m Distance Sensor with VL53L1X
+========================================
 
-![SparkFun VL53L1X Distance Sensor](https://cdn.sparkfun.com//assets/parts/1/2/8/6/3/14667-ToF_Laser_Distance_Sensor__Qwiic__-_VL53L1X-01.jpg)
+![SparkFun Distance Sensor Breakout - 4 Meter, VL53L1X (Qwiic)](https://cdn.sparkfun.com/assets/parts/1/2/9/4/8/14722-SparkFun_Distance_Sensor_Breakout_-_4_Meter__VL53L1X__Qwiic_-01.jpg)
 
-[*SparkX Qwiic Distance Sensor - VL532L1X (SPX-14667)*](https://www.sparkfun.com/products/14667)
+[*SparkFun Distance Sensor Breakout - 4 Meter, VL53L1X (Qwiic)(SEN-14722)*](https://www.sparkfun.com/products/14722)
 
 The VL53L1X is the latest Time Of Flight (ToF) sensor to be released. It uses a VCSEL (vertical cavity surface emitting laser) to emit a class 1 IR laser and time the reflection to the target. What does all this mean? You can measure the distance to an object up to 4 meters away with millimeter resolution! That’s pretty incredible.
 
@@ -12,32 +12,34 @@ We’re far from done: The VL53L1X is a highly complex sensor with a multitude o
 We’ve found the precision of the sensor to be 1mm but the accuracy is around +/-5mm.
 
 SparkFun labored with love to create this code. Feel like supporting open source hardware? 
-Buy a [breakout board](https://www.sparkfun.com/products/14667) from SparkFun!
-
-Library written by Nathan Seidle ([SparkFun](http://www.sparkfun.com)).
+Buy a [breakout board](https://www.sparkfun.com/products/14722) from SparkFun!
 
 Repository Contents
 -------------------
 
-* **/examples** - Example sketches for the library (.ino). Run these from the Arduino IDE. 
-* **/src** - Source files for the library (.cpp, .h).
-* **keywords.txt** - Keywords from this library that will be highlighted in the Arduino IDE. 
-* **library.properties** - General library properties for the Arduino package manager. 
+* **/Documents** - Datasheet and User Manual
+* **/Hardware** - Eagle design files (.brd, .sch)
+* **/Production** - .brd files
 
 Documentation
 --------------
+* **[Hookup Guide](https://learn.sparkfun.com/tutorials/qwiic-distance-sensor-vl53l1x-hookup-guide)**
 
-* **[Installing an Arduino Library Guide](https://learn.sparkfun.com/tutorials/installing-an-arduino-library)** - Basic information on how to install an Arduino library.
-* **[Product Repository](https://github.com/sparkfunX/Qwiic_Distance_VL53L1X)** - Main repository (including hardware files)
+Product Versions
+--------------
+* **[SEN-14722](https://www.sparkfun.com/products/14722)** - SparkFun red version
+* **[SPX-14667](https://www.sparkfun.com/products/14667)** - SparkX Version 
 
 License Information
 -------------------
 
 This product is _**open source**_! 
 
-Various bits of the code have different licenses applied. Anything SparkFun wrote is beerware; if you see me (or any other SparkFun employee) at the local, and you've found our code helpful, please buy us a round!
+Please review the LICENSE.md file for license information. 
+
+If you have any questions or concerns on licensing, please contact techsupport@sparkfun.com.
 
-Please use, reuse, and modify these files as you see fit. Please maintain attribution to SparkFun Electronics and release anything derivative under the same license.
+Please use, reuse, and modify these files as you see fit. Please maintain attribution to SparkFun Electronics and release any derivative under the same license.
 
 Distributed as-is; no warranty is given.
 

examples/Example1_ReadDistance/Example1_ReadDistance.ino

@@ -27,13 +27,10 @@ void setup(void)
 
   if (distanceSensor.begin() == false)
     Serial.println("Sensor offline!");
-
 }
 
 void loop(void)
 {
-  distanceSensor.startMeasurement(); //Write configuration bytes to initiate measurement
-
   //Poll for completion of measurement. Takes 40-50ms.
   while (distanceSensor.newDataReady() == false)
     delay(5);

examples/Example2_SetDistanceMode/Example2_SetDistanceMode.ino

@@ -34,13 +34,11 @@ void setup(void)
     Serial.println("Sensor offline!");
   }
   //Call setDistanceMode with 0, 1, or 2 to change the sensing range.
-  distanceSensor.setDistanceMode(shortRange);
+  distanceSensor.setDistanceMode(longRange);
 }
 
 void loop(void)
 {
-  distanceSensor.startMeasurement(); //Write configuration bytes to initiate measurement
-
   //Poll for completion of measurement. Takes 40-50ms.
   while (distanceSensor.newDataReady() == false)
     delay(5);

examples/Example3_StatusAndRate/Example3_StatusAndRate.ino

@@ -41,7 +41,6 @@ void setup(void)
 void loop(void)
 {
   long startTime = millis();
-  distanceSensor.startMeasurement(); //Write configuration block of 135 bytes to setup a measurement
 
   //Poll for completion of measurement. Takes 40-50ms.
   while (distanceSensor.newDataReady() == false)

src/SparkFun_VL53L1X_Arduino_Library.cpp

@@ -44,7 +44,7 @@
 //device against this set of bytes and write only the ones that are different but it's faster,
 //easier, and perhaps fewer code words to write the config block as is.
 //The block was obtained via inspection of the ST P-NUCLEO-53L1A1
-const PROGMEM uint8_t configBlock[] = {
+uint8_t configBlock[] = {
   0x29, 0x02, 0x10, 0x00, 0x28, 0xBC, 0x7A, 0x81, //8
   0x80, 0x07, 0x95, 0x00, 0xED, 0xFF, 0xF7, 0xFD, //16
   0x9E, 0x0E, 0x00, 0x10, 0x01, 0x00, 0x00, 0x00, //24
@@ -95,6 +95,13 @@ boolean VL53L1X::begin(uint8_t deviceAddress, TwoWire &wirePort)
   result = (result & 0xFE) | 0x01;
   writeRegister16(VL53L1_PAD_I2C_HV__EXTSUP_CONFIG, result);
 
+  //Gets trim resistors from chip
+  for (uint16_t i = 0; i < 36; i++) {
+	  uint8_t regVal = readRegister(i + 1);
+	  configBlock[i] = regVal;
+  }
+  startMeasurement();
+
   return (true); //Sensor online!
 }
 
@@ -106,7 +113,6 @@ boolean VL53L1X::begin(uint8_t deviceAddress, TwoWire &wirePort)
 void VL53L1X::startMeasurement(uint8_t offset)
 {
   uint8_t address = 1 + offset; //Start at memory location 0x01, add offset
-
   uint8_t leftToSend = sizeof(configBlock) - offset;
   while (leftToSend > 0)
   {
@@ -119,7 +125,7 @@ void VL53L1X::startMeasurement(uint8_t offset)
     _i2cPort->write(address);
 
     for (byte x = 0 ; x < toSend ; x++)
-      _i2cPort->write(pgm_read_byte_near(configBlock + address + x - 1 - offset));
+      _i2cPort->write(configBlock[address + x - 1 - offset]);
 
     _i2cPort->endTransmission();
 
@@ -388,5 +394,4 @@ boolean VL53L1X::writeRegister16(uint16_t addr, uint16_t val)
   if (_i2cPort->endTransmission() != 0)
     return (0); //Error: Sensor did not ACK
   return (1); //All done!
-}
-
+}