From e35acdf6e2b22fc900458bc984bbcd5e3a9b79bb Mon Sep 17 00:00:00 2001 From: AndyEngland521 Date: Wed, 2 Jan 2019 12:27:40 -0700 Subject: [PATCH] updating to fix a few typos, fixing issues filed by matthias --- .../Example1_ReadDistance.ino | 2 +- .../Example1_ReadDistance.ino | 53 ------------- .../Example2_SetDistanceMode.ino | 2 +- .../Example3_StatusAndRate.ino | 2 +- .../Example4_SetIntermeasurementPeriod.ino | 2 +- .../Example5_LCDDemo/Example5_LCDDemo.ino | 2 +- keywords.txt | 76 +++++++++---------- library.properties | 2 +- src/SparkFun_VL53L1X.cpp | 9 ++- 9 files changed, 51 insertions(+), 99 deletions(-) rename examples/Example1_ReadDistance/{Example1_ReadDistance/Example1_ReadDistance => }/Example1_ReadDistance.ino (97%) delete mode 100644 examples/Example1_ReadDistance/Example1_ReadDistance/Example1_ReadDistance.ino diff --git a/examples/Example1_ReadDistance/Example1_ReadDistance/Example1_ReadDistance/Example1_ReadDistance.ino b/examples/Example1_ReadDistance/Example1_ReadDistance.ino similarity index 97% rename from examples/Example1_ReadDistance/Example1_ReadDistance/Example1_ReadDistance/Example1_ReadDistance.ino rename to examples/Example1_ReadDistance/Example1_ReadDistance.ino index 3e839c8..7496b06 100644 --- a/examples/Example1_ReadDistance/Example1_ReadDistance/Example1_ReadDistance/Example1_ReadDistance.ino +++ b/examples/Example1_ReadDistance/Example1_ReadDistance.ino @@ -29,7 +29,7 @@ void setup(void) Serial.begin(9600); Serial.println("VL53L1X Qwiic Test"); - if (distanceSensor.init() == false) + if (distanceSensor.begin() == false) Serial.println("Sensor online!"); } diff --git a/examples/Example1_ReadDistance/Example1_ReadDistance/Example1_ReadDistance.ino b/examples/Example1_ReadDistance/Example1_ReadDistance/Example1_ReadDistance.ino deleted file mode 100644 index bb1841b..0000000 --- a/examples/Example1_ReadDistance/Example1_ReadDistance/Example1_ReadDistance.ino +++ /dev/null @@ -1,53 +0,0 @@ -/* - Reading distance from the laser based VL53L1X - By: Nathan Seidle - SparkFun Electronics - Date: April 4th, 2018 - License: This code is public domain but you buy me a beer if you use this and we meet someday (Beerware license). - - SparkFun labored with love to create this code. Feel like supporting open source hardware? - Buy a board from SparkFun! https://www.sparkfun.com/products/14667 - - This example prints the distance to an object. - - Are you getting weird readings? Be sure the vacuum tape has been removed from the sensor. -*/ - -#include -//#include "vl53l1x_class.h" -#include "SparkFun_VL53L1X.h" - -SFEVL53L1X distanceSensor(Wire, 2, 3); -int distance; - -void setup(void) -{ - Wire.begin(); - - Serial.begin(9600); - Serial.println("VL53L1X Qwiic Test"); - - if (distanceSensor.init() == 0) - { - Serial.println("Sensor online!"); - } -} - -void loop(void) -{ - distanceSensor.startRanging(); //Write configuration bytes to initiate measurement - distance = distanceSensor.getDistance(); //Get the result of the measurement from the sensor - distanceSensor.stopRanging(); //Write configuration bytes to initiate measurement - - float distanceInches = distance * 0.0393701; //calculate Feet - float distanceFeet = distanceInches / 12.0; - - Serial.print("Distance(mm): "); - Serial.print(distance); - Serial.print("\tDistance(ft): "); - Serial.print(distanceFeet, 2); - - Serial.println(); - -} - diff --git a/examples/Example2_SetDistanceMode/Example2_SetDistanceMode.ino b/examples/Example2_SetDistanceMode/Example2_SetDistanceMode.ino index 927fd16..7b82532 100644 --- a/examples/Example2_SetDistanceMode/Example2_SetDistanceMode.ino +++ b/examples/Example2_SetDistanceMode/Example2_SetDistanceMode.ino @@ -29,7 +29,7 @@ void setup(void) Serial.begin(9600); Serial.println("VL53L1X Qwiic Test"); - if (distanceSensor.init() == false) + if (distanceSensor.begin() == false) { Serial.println("Sensor online!"); } diff --git a/examples/Example3_StatusAndRate/Example3_StatusAndRate.ino b/examples/Example3_StatusAndRate/Example3_StatusAndRate.ino index d031c79..cc3116f 100644 --- a/examples/Example3_StatusAndRate/Example3_StatusAndRate.ino +++ b/examples/Example3_StatusAndRate/Example3_StatusAndRate.ino @@ -34,7 +34,7 @@ void setup(void) Serial.begin(9600); Serial.println("VL53L1X Qwiic Test"); - if (distanceSensor.init() == false) + if (distanceSensor.begin() == false) Serial.println("Sensor online!"); for (int x = 0 ; x < HISTORY_SIZE ; x++) diff --git a/examples/Example4_SetIntermeasurementPeriod/Example4_SetIntermeasurementPeriod.ino b/examples/Example4_SetIntermeasurementPeriod/Example4_SetIntermeasurementPeriod.ino index d16633e..1e74315 100644 --- a/examples/Example4_SetIntermeasurementPeriod/Example4_SetIntermeasurementPeriod.ino +++ b/examples/Example4_SetIntermeasurementPeriod/Example4_SetIntermeasurementPeriod.ino @@ -29,7 +29,7 @@ void setup(void) Serial.begin(9600); Serial.println("VL53L1X Qwiic Test"); - if (distanceSensor.init() == false) + if (distanceSensor.begin() == false) Serial.println("Sensor online!"); distanceSensor.setIntermeasurementPeriod(40); diff --git a/examples/Example5_LCDDemo/Example5_LCDDemo.ino b/examples/Example5_LCDDemo/Example5_LCDDemo.ino index defa28c..879a90c 100644 --- a/examples/Example5_LCDDemo/Example5_LCDDemo.ino +++ b/examples/Example5_LCDDemo/Example5_LCDDemo.ino @@ -68,7 +68,7 @@ void setup(void) lcd.print("Distance: 3426 "); lcd.print("12 mph "); - if (distanceSensor.init() == false) + if (distanceSensor.begin() == false) { Serial.println("Sensor offline!"); } diff --git a/keywords.txt b/keywords.txt index 083ca7b..8b58f34 100644 --- a/keywords.txt +++ b/keywords.txt @@ -12,49 +12,49 @@ VL53L1X KEYWORD1 # Methods and Functions (KEYWORD2) ####################################### -init KEYWORD2 - -startRanging KEYWORD2 -checkForDataReady KEYWORD2 -setTimingBudgetInMs KEYWORD2 -getTimingBudgetInMs KEYWORD2 -setDistanceModeLong KEYWORD2 +init KEYWORD2 +begin KEYWORD2 +startRanging KEYWORD2 +checkForDataReady KEYWORD2 +setTimingBudgetInMs KEYWORD2 +getTimingBudgetInMs KEYWORD2 +setDistanceModeLong KEYWORD2 setDistanceModeShort KEYWORD2 -getDistanceMode KEYWORD2 -setIntermeasurementPeriod KEYWORD2 -getIntermeasurementPeriod KEYWORD2 -checkBootState KEYWORD2 -getSensorID KEYWORD2 -getDistance KEYWORD2 -getSignalPerSpad KEYWORD2 -getAmbientPerSpad KEYWORD2 -getSignalRate KEYWORD2 -getSpadNb KEYWORD2 -getAmbientRate KEYWORD2 -getRangeStatus KEYWORD2 -setOffset KEYWORD2 -getOffset KEYWORD2 -setXTalk KEYWORD2 -getXTalk KEYWORD2 +getDistanceMode KEYWORD2 +setIntermeasurementPeriod KEYWORD2 +getIntermeasurementPeriod KEYWORD2 +checkBootState KEYWORD2 +getSensorID KEYWORD2 +getDistance KEYWORD2 +getSignalPerSpad KEYWORD2 +getAmbientPerSpad KEYWORD2 +getSignalRate KEYWORD2 +getSpadNb KEYWORD2 +getAmbientRate KEYWORD2 +getRangeStatus KEYWORD2 +setOffset KEYWORD2 +getOffset KEYWORD2 +setXTalk KEYWORD2 +getXTalk KEYWORD2 setDistanceThreshold KEYWORD2 -getDistanceThresholdWindow KEYWORD2 +getDistanceThresholdWindow KEYWORD2 getDistanceThresholdLow KEYWORD2 -getDistanceThresholdHigh KEYWORD2 -setROI KEYWORD2 -getROIX KEYWORD2 -getROIY KEYWORD2 -setSignalThreshold KEYWORD2 -getSignalThreshold KEYWORD2 -setSigmaThreshold KEYWORD2 -getSigmaThreshold KEYWORD2 +getDistanceThresholdHigh KEYWORD2 +setROI KEYWORD2 +getROIX KEYWORD2 +getROIY KEYWORD2 +setSignalThreshold KEYWORD2 +getSignalThreshold KEYWORD2 +setSigmaThreshold KEYWORD2 +getSigmaThreshold KEYWORD2 startTemperatureUpdate KEYWORD2 -calibrateOffset KEYWORD2 -calibrateXTalk KEYWORD2 +calibrateOffset KEYWORD2 +calibrateXTalk KEYWORD2 -readRegister KEYWORD2 -readRegister16 KEYWORD2 -writeRegister KEYWORD2 -writeRegister16 KEYWORD2 +readRegister KEYWORD2 +readRegister16 KEYWORD2 +writeRegister KEYWORD2 +writeRegister16 KEYWORD2 ####################################### # Constants (LITERAL1) diff --git a/library.properties b/library.properties index d880626..361b522 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=SparkFun VL53L1X 4m Laser Distance Sensor -version=1.1.0 +version=1.1.1 author=SparkFun Electronics maintainer=SparkFun Electronics sentence=Library for the SparkFun Qwiic 4m Distance Sensor - VL53L1X diff --git a/src/SparkFun_VL53L1X.cpp b/src/SparkFun_VL53L1X.cpp index aa1b913..f610589 100644 --- a/src/SparkFun_VL53L1X.cpp +++ b/src/SparkFun_VL53L1X.cpp @@ -3,7 +3,7 @@ #include "SparkFun_VL53L1X.h" #include "vl53l1x_class.h" -SFEVL53L1X::SFEVL53L1X(TwoWire &i2cPort = Wire, int shutdownPin, int interruptPin) +SFEVL53L1X::SFEVL53L1X(TwoWire &i2cPort, int shutdownPin, int interruptPin) { *_i2cPort = i2cPort; _shutdownPin = shutdownPin; @@ -16,6 +16,11 @@ bool SFEVL53L1X::init() return _device->VL53L1X_SensorInit(); } +bool SFEVL53L1X::begin() +{ + return _device->VL53L1X_SensorInit(); +} + /*Checks the ID of the device, returns true if ID is correct*/ bool SFEVL53L1X::checkID() @@ -225,7 +230,7 @@ void SFEVL53L1X::setOffset(int16_t offset) int16_t SFEVL53L1X::getOffset() { - uint16_t temp; + int16_t temp; _device->VL53L1X_GetOffset(&temp); return temp; }