Merge pull request #8 from dizcza/master

esp-idf millis fixes
lewisxhe · Feb 8, 2024 · e2d3207 · e2d3207
2 parents b50ac6f + c23eb16
commit e2d3207
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/src/SensorLib.h b/src/SensorLib.h
@@ -142,8 +142,8 @@ typedef struct __SensorLibPins {
 #define LOG(fmt, ...) LOG_PORT.printf("[%s] " fmt "\n", __func__, ##__VA_ARGS__)
 #define LOG_BIN(x)    LOG_PORT.println(x,BIN);
 #else
-#define LOG(fmt, ...)
-#define LOG_BIN(x)
+#define LOG(fmt, ...) printf("[%s] " fmt "\n", __func__, ##__VA_ARGS__)
+#define LOG_BIN(x)    printf("[%s] 0x%X\n", __func__, x)
 #endif
 
 #ifndef lowByte

diff --git a/src/SensorQMI8658.hpp b/src/SensorQMI8658.hpp
@@ -210,7 +210,7 @@ class SensorQMI8658 :
 
     bool reset(bool waitResult = true, uint32_t timeout = 500)
     {
-        int val;
+        int val = 0;  // initialize with some value to avoid compilation errors
         writeRegister(QMI8658_REG_RESET, QMI8658_REG_RESET_DEFAULT);
         // Maximum 15ms for the Reset process to be finished
         if (waitResult) {

diff --git a/src/platform/esp_arduino.cpp b/src/platform/esp_arduino.cpp
@@ -11,6 +11,8 @@
 #include "driver/gpio.h"
 #include "esp_timer.h"
 #include "freertos/FreeRTOS.h"
+#include <rom/ets_sys.h>
+
 
 void pinMode(uint32_t gpio, uint8_t mode)
 {
@@ -43,32 +45,22 @@ int digitalRead(uint32_t gpio)
 
 void delay(uint32_t ms)
 {
-    vTaskDelay(ms / portTICK_PERIOD_MS);
+    vTaskDelay(pdMS_TO_TICKS(ms));
+    ets_delay_us((ms % portTICK_PERIOD_MS) * 1000UL);
 }
 
 uint32_t millis()
 {
-    return esp_timer_get_time();
+    return (uint32_t) (esp_timer_get_time() / 1000LL);
 }
 
 uint32_t micros()
 {
-    return (esp_timer_get_time() / 1000ULL);
+    return (uint32_t) esp_timer_get_time();
 }
 
 void delayMicroseconds(uint32_t us)
 {
-    uint64_t m = (uint64_t)esp_timer_get_time();
-    if (us) {
-        uint64_t e = (m + us);
-        if (m > e) {
-            while ((uint64_t)esp_timer_get_time() > e) {
-                asm volatile ("nop");
-            }
-        }
-        while ((uint64_t)esp_timer_get_time() < e) {
-            asm volatile ("nop");
-        }
-    }
+    ets_delay_us(us);
 }
-#endif
+#endif