diff --git a/ESP-IDF_Robot/build/.ninja_lock b/ESP-IDF_Robot/build/.ninja_lock new file mode 100644 index 000000000..e69de29bb diff --git a/ESP-IDF_Robot/build/CMakeFiles/git-data/HEAD b/ESP-IDF_Robot/build/CMakeFiles/git-data/HEAD index b870d8262..b3440b61b 100644 --- a/ESP-IDF_Robot/build/CMakeFiles/git-data/HEAD +++ b/ESP-IDF_Robot/build/CMakeFiles/git-data/HEAD @@ -1 +1 @@ -ref: refs/heads/main +4c2820d377d1375e787bcef612f0c32c1427d183 diff --git a/ESP-IDF_Robot/build/CMakeFiles/git-data/grabRef.cmake b/ESP-IDF_Robot/build/CMakeFiles/git-data/grabRef.cmake index a22234cc4..77b1fca59 100644 --- a/ESP-IDF_Robot/build/CMakeFiles/git-data/grabRef.cmake +++ b/ESP-IDF_Robot/build/CMakeFiles/git-data/grabRef.cmake @@ -18,7 +18,7 @@ set(HEAD_HASH) file(READ "/home/alex/github/ESP-Nodes/ESP-IDF_Robot/build/CMakeFiles/git-data/HEAD" HEAD_CONTENTS LIMIT 1024) string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS) -set(GIT_DIR "/home/alex/github/ESP-Nodes/.git") +set(GIT_DIR "/home/alex/esp/v5.4.1/esp-idf/.git") # handle git-worktree if(EXISTS "${GIT_DIR}/commondir") file(READ "${GIT_DIR}/commondir" GIT_DIR_NEW LIMIT 1024) diff --git a/ESP-IDF_Robot/build/CMakeFiles/git-data/head-ref b/ESP-IDF_Robot/build/CMakeFiles/git-data/head-ref index efe9c9a03..b3440b61b 100644 --- a/ESP-IDF_Robot/build/CMakeFiles/git-data/head-ref +++ b/ESP-IDF_Robot/build/CMakeFiles/git-data/head-ref @@ -1 +1 @@ -91f73f50dd0c916eb7bdef9e6945673db889686b +4c2820d377d1375e787bcef612f0c32c1427d183 diff --git a/ESP-IDF_Robot/main/ultrasonic.c b/ESP-IDF_Robot/main/ultrasonic.c index fe380b17e..37d5925e9 100644 --- a/ESP-IDF_Robot/main/ultrasonic.c +++ b/ESP-IDF_Robot/main/ultrasonic.c @@ -50,7 +50,7 @@ #define ROUNDTRIP_M 5800.0f #define ROUNDTRIP_CM 58 -#if HELPER_TARGET_IS_ESP32 +/*#if HELPER_TARGET_IS_ESP32 static portMUX_TYPE mux = portMUX_INITIALIZER_UNLOCKED; #define PORT_ENTER_CRITICAL portENTER_CRITICAL(&mux) #define PORT_EXIT_CRITICAL portEXIT_CRITICAL(&mux) @@ -67,7 +67,7 @@ static portMUX_TYPE mux = portMUX_INITIALIZER_UNLOCKED; #define CHECK_ARG(VAL) do { if (!(VAL)) return ESP_ERR_INVALID_ARG; } while (0) #define CHECK(x) do { esp_err_t __; if ((__ = x) != ESP_OK) return __; } while (0) -#define RETURN_CRITICAL(RES) do { PORT_EXIT_CRITICAL; return RES; } while(0) +#define RETURN_CRITICAL(RES) do { PORT_EXIT_CRITICAL; return RES; } while(0)*/ esp_err_t ultrasonic_init(const ultrasonic_sensor_t *dev) {