Skip to content

Commit

Permalink
Removed unneccessary variable and white space, as suggested by code r…
Browse files Browse the repository at this point in the history
…eview
  • Loading branch information
arg7 committed Sep 16, 2024
1 parent 4943396 commit 1f3bef7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
7 changes: 3 additions & 4 deletions Tools/scripts/esp32_get_idf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand All @@ -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

Expand All @@ -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 ../..
Expand Down
2 changes: 0 additions & 2 deletions libraries/AP_HAL_ESP32/HAL_ESP32_Class.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
#include "RCInput.h"
#include "RCOutput.h"
#include "Storage.h"

#include "AnalogIn.h"

#include "Util.h"
#if AP_SIM_ENABLED
#include <AP_HAL/SIMState.h>
Expand Down

0 comments on commit 1f3bef7

Please sign in to comment.