Переглянути джерело

fix: fix some compilation errors

Lesords 1 рік тому
батько
коміт
b48eb5b5ab

+ 2 - 9
examples/continuous_ranging/continuous_ranging.ino

@@ -1,13 +1,8 @@
 #include "Seeed_vl53l0x.h"
 Seeed_vl53l0x VL53L0X;
 
-#ifdef ARDUINO_SAMD_VARIANT_COMPLIANCE
-    #define SERIAL SerialUSB
-#else
-    #define SERIAL Serial
-#endif
-
-
+#undef SERIAL
+#define SERIAL Serial
 
 void setup() {
     VL53L0X_Error Status = VL53L0X_ERROR_NONE;
@@ -38,5 +33,3 @@ void loop() {
     }
     delay(100);
 }
-
-

+ 2 - 11
examples/high_accuracy_ranging/high_accuracy_ranging.ino

@@ -1,12 +1,8 @@
 #include "Seeed_vl53l0x.h"
 Seeed_vl53l0x VL53L0X;
 
-
-#ifdef ARDUINO_SAMD_VARIANT_COMPLIANCE
-    #define SERIAL SerialUSB
-#else
-    #define SERIAL Serial
-#endif
+#undef SERIAL
+#define SERIAL Serial
 
 void setup() {
     VL53L0X_Error Status = VL53L0X_ERROR_NONE;
@@ -27,7 +23,6 @@ void setup() {
     }
 }
 
-
 void loop() {
     VL53L0X_RangingMeasurementData_t RangingMeasurementData;
     VL53L0X_Error Status = VL53L0X_ERROR_NONE;
@@ -49,7 +44,3 @@ void loop() {
 
     delay(300);
 }
-
-
-
-

+ 2 - 13
examples/high_speed_ranging/high_speed_ranging.ino

@@ -1,12 +1,8 @@
 #include "Seeed_vl53l0x.h"
 Seeed_vl53l0x VL53L0X;
 
-
-#ifdef ARDUINO_SAMD_VARIANT_COMPLIANCE
-    #define SERIAL SerialUSB
-#else
-    #define SERIAL Serial
-#endif
+#undef SERIAL
+#define SERIAL Serial
 
 void setup() {
     VL53L0X_Error Status = VL53L0X_ERROR_NONE;
@@ -27,7 +23,6 @@ void setup() {
     }
 }
 
-
 void loop() {
     VL53L0X_RangingMeasurementData_t RangingMeasurementData;
     VL53L0X_Error Status = VL53L0X_ERROR_NONE;
@@ -49,9 +44,3 @@ void loop() {
 
     delay(300);
 }
-
-
-
-
-
-

+ 2 - 14
examples/long_distance_ranging/long_distance_ranging.ino

@@ -1,12 +1,8 @@
 #include "Seeed_vl53l0x.h"
 Seeed_vl53l0x VL53L0X;
 
-#ifdef ARDUINO_SAMD_VARIANT_COMPLIANCE
-    #define SERIAL SerialUSB
-#else
-    #define SERIAL Serial
-#endif
-
+#undef SERIAL
+#define SERIAL Serial
 
 void setup() {
     VL53L0X_Error Status = VL53L0X_ERROR_NONE;
@@ -27,7 +23,6 @@ void setup() {
     }
 }
 
-
 void loop() {
     VL53L0X_RangingMeasurementData_t RangingMeasurementData;
     VL53L0X_Error Status = VL53L0X_ERROR_NONE;
@@ -49,10 +44,3 @@ void loop() {
 
     delay(300);
 }
-
-
-
-
-
-
-

+ 2 - 16
examples/single_ranging/single_ranging.ino

@@ -1,14 +1,8 @@
 #include "Seeed_vl53l0x.h"
 Seeed_vl53l0x VL53L0X;
 
-
-#ifdef ARDUINO_SAMD_VARIANT_COMPLIANCE
-    #define SERIAL SerialUSB
-#else
-    #define SERIAL Serial
-#endif
-
-
+#undef SERIAL
+#define SERIAL Serial
 
 void setup() {
     VL53L0X_Error Status = VL53L0X_ERROR_NONE;
@@ -27,7 +21,6 @@ void setup() {
     }
 }
 
-
 void loop() {
     VL53L0X_RangingMeasurementData_t RangingMeasurementData;
     VL53L0X_Error Status = VL53L0X_ERROR_NONE;
@@ -49,10 +42,3 @@ void loop() {
 
     delay(300);
 }
-
-
-
-
-
-
-

+ 6 - 8
src/Seeed_vl53l0x.cpp

@@ -110,6 +110,7 @@ VL53L0X_Error Seeed_vl53l0x::VL53L0X_calibration_oprt() {
  * */
 VL53L0X_Error Seeed_vl53l0x::VL53L0X_calibration_set() {
     VL53L0X_Error Status = VL53L0X_ERROR_NONE;
+    return Status;
 }
 
 /** @brief Set limitation factor.
@@ -175,8 +176,6 @@ VL53L0X_Error Seeed_vl53l0x::check_version() {
 VL53L0X_Error Seeed_vl53l0x::VL53L0X_common_init() {
     VL53L0X_Error Status = VL53L0X_ERROR_NONE;
 
-    FixPoint1616_t LimitCheckCurrent;
-
     VL53L0X_IIC_init();
 
     Status = check_version();
@@ -440,7 +439,7 @@ VL53L0X_Error Seeed_vl53l0x::PerformContinuousRangingMeasurement(VL53L0X_Ranging
         RangingMeasurementData) {
     VL53L0X_Error Status = VL53L0X_ERROR_NONE;
     u8 stat = 0;
-    u32 stop_stat = 0;
+    // u32 stop_stat = 0;
     Status = VL53L0X_StartMeasurement(pMyDevice);
     if (VL53L0X_ERROR_NONE != Status) {
         return Status;
@@ -491,21 +490,20 @@ VL53L0X_Error Seeed_vl53l0x::PerformContinuousRangingMeasurement(VL53L0X_Ranging
     @return Error code, error if not equal to zero
  * */
 VL53L0X_Error Seeed_vl53l0x::PerformSingleRangingMeasurement(VL53L0X_RangingMeasurementData_t* RangingMeasurementData) {
-    FixPoint1616_t LimitCheckCurrent;
     VL53L0X_Error Status = VL53L0X_ERROR_NONE;
     u32 milli_value_start = 0, milli_value_stop = 0;
     //VL53L0X_RangingMeasurementData_t RangingMeasurementData;
-    int i = 0;
     if (Status == VL53L0X_ERROR_NONE) {
         milli_value_start = millis();
         Status = VL53L0X_PerformSingleRangingMeasurement(pMyDevice,
                  RangingMeasurementData);
         milli_value_stop = millis();
 
-        // Serial.print("time of mesurement: ");
-        // Serial.println(milli_value_stop-milli_value_start);
+        Serial.print("time of mesurement: ");
+        Serial.println(milli_value_stop-milli_value_start);
 
         return Status;
     }
-}
 
+    return Status;
+}

+ 3 - 1
src/Seeed_vl53l0x.h

@@ -62,12 +62,14 @@ typedef unsigned short u16;
 typedef char           s8;
 typedef unsigned char  u8;
 
+#if 0
 typedef enum {
     NO_ERROR = 0,
     ERROR_PARAM = -1,
     ERROR_COMM = -2,
     ERROR_OTHERS = -128,
 } err_t;
+#endif
 
 
 #define CHECK_RESULT(a,b)   do{if(a=b)  {    \
@@ -112,4 +114,4 @@ class Seeed_vl53l0x {
 };
 
 
-#endif
+#endif

+ 1 - 1
src/core/src/vl53l0x_api_core.cpp

@@ -1900,7 +1900,7 @@ VL53L0X_Error VL53L0X_calc_sigma_estimate(VL53L0X_DEV Dev,
         diff1_mcps <<= 8;
 
         /* FixPoint0824/FixPoint1616 = FixPoint2408 */
-        xTalkCorrection	 = abs(diff1_mcps / diff2_mcps);
+        xTalkCorrection	 = abs((double) diff1_mcps / diff2_mcps);
 
         /* FixPoint2408 << 8 = FixPoint1616 */
         xTalkCorrection <<= 8;

+ 1 - 1
src/platform/src/vl53l0x_platform.cpp

@@ -270,7 +270,7 @@ VL53L0X_Error  VL53L0X_RdDWord(VL53L0X_DEV Dev, uint8_t index, uint32_t* data) {
 #define VL53L0X_POLLINGDELAY_LOOPNB  250
 VL53L0X_Error VL53L0X_PollingDelay(VL53L0X_DEV Dev) {
     VL53L0X_Error status = VL53L0X_ERROR_NONE;
-    volatile uint32_t i;
+    uint32_t i;
     LOG_FUNCTION_START("");
 
     for (i = 0; i < VL53L0X_POLLINGDELAY_LOOPNB; i++) {