From 1f3bef77946761e2bbcdd07d0da35f88136ab4ba Mon Sep 17 00:00:00 2001 From: ARg Date: Mon, 16 Sep 2024 11:39:05 +0200 Subject: [PATCH] Removed unneccessary variable and white space, as suggested by code review --- Tools/scripts/esp32_get_idf.sh | 7 +++---- libraries/AP_HAL_ESP32/HAL_ESP32_Class.cpp | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Tools/scripts/esp32_get_idf.sh b/Tools/scripts/esp32_get_idf.sh index 2637c05418f3be..10fe0dbac423b9 100755 --- a/Tools/scripts/esp32_get_idf.sh +++ b/Tools/scripts/esp32_get_idf.sh @@ -2,7 +2,6 @@ # if you have modules/esp_idf setup as a submodule, then leave it as a submodule and switch branches COMMIT="cc3203dc4f087ab41b434afff1ed7520c6d90993" -CHECKOUT="cc3203d" if [ ! -d modules ]; then echo "this script needs to be run from the root of your repo, sorry, giving up." @@ -29,7 +28,7 @@ else echo "found empty IDF, cloning" # add esp_idf as almost submodule, depths uses less space git clone -b 'release/v5.3' https://github.com/espressif/esp-idf.git esp_idf - git checkout $CHECKOUT + git checkout $COMMIT fi fi @@ -43,13 +42,13 @@ else echo "looks like an idf, but not v5.3 branch, or wrong commit , trying to switch branch and reflect upstream"; ../../Tools/gittools/submodule-sync.sh >/dev/null git fetch ; git checkout -f release/v5.3 - git checkout $CHECKOUT + git checkout $COMMIT # retry same as above echo `git rev-parse HEAD` if [ `git rev-parse HEAD` == '$COMMIT' ]; then echo "IDF version 'release/5.3' found OK, great."; - git checkout $CHECKOUT + git checkout $COMMIT fi fi cd ../.. diff --git a/libraries/AP_HAL_ESP32/HAL_ESP32_Class.cpp b/libraries/AP_HAL_ESP32/HAL_ESP32_Class.cpp index 04803a38c9454b..fb37729dec4446 100644 --- a/libraries/AP_HAL_ESP32/HAL_ESP32_Class.cpp +++ b/libraries/AP_HAL_ESP32/HAL_ESP32_Class.cpp @@ -26,9 +26,7 @@ #include "RCInput.h" #include "RCOutput.h" #include "Storage.h" - #include "AnalogIn.h" - #include "Util.h" #if AP_SIM_ENABLED #include