From 943dfe92cbc9ea042e98a2d5578e33acd5d3d71f Mon Sep 17 00:00:00 2001 From: Stephen Brawner Date: Fri, 25 Sep 2020 11:55:32 -0700 Subject: [PATCH 1/2] Apply patch and change esp32-camera repo --- components/espy_arduino_library.patch | 61 +++++++++++++++++++++++++++ tools/config.sh | 3 +- tools/update-components.sh | 4 +- 3 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 components/espy_arduino_library.patch diff --git a/components/espy_arduino_library.patch b/components/espy_arduino_library.patch new file mode 100644 index 000000000..473e1e4a5 --- /dev/null +++ b/components/espy_arduino_library.patch @@ -0,0 +1,61 @@ +From 9866e4c216d4c82275c6a35c23583b00fe62d3d7 Mon Sep 17 00:00:00 2001 +From: Stephen Brawner +Date: Fri, 25 Sep 2020 11:34:19 -0700 +Subject: [PATCH] Fixes + +--- + libraries/WiFi/src/ETH.cpp | 6 +++--- + libraries/WiFi/src/WiFiSTA.cpp | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libraries/WiFi/src/ETH.cpp b/libraries/WiFi/src/ETH.cpp +index 2ffea758..c1700f4c 100644 +--- a/libraries/WiFi/src/ETH.cpp ++++ b/libraries/WiFi/src/ETH.cpp +@@ -113,7 +113,7 @@ bool ETHClass::config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, I + { + esp_err_t err = ESP_OK; + tcpip_adapter_ip_info_t info; +- ++ + if(local_ip != (uint32_t)0x00000000){ + info.ip.addr = static_cast(local_ip); + info.gw.addr = static_cast(gateway); +@@ -193,8 +193,8 @@ IPAddress ETHClass::gatewayIP() + + IPAddress ETHClass::dnsIP(uint8_t dns_no) + { +- ip_addr_t dns_ip = dns_getserver(dns_no); +- return IPAddress(dns_ip.u_addr.ip4.addr); ++ const ip_addr_t* dns_ip = dns_getserver(dns_no); ++ return IPAddress(dns_ip->u_addr.ip4.addr); + } + + IPAddress ETHClass::broadcastIP() +diff --git a/libraries/WiFi/src/WiFiSTA.cpp b/libraries/WiFi/src/WiFiSTA.cpp +index db5e019a..dbab7cca 100644 +--- a/libraries/WiFi/src/WiFiSTA.cpp ++++ b/libraries/WiFi/src/WiFiSTA.cpp +@@ -424,7 +424,7 @@ IPAddress WiFiSTAClass::localIP() + uint8_t* WiFiSTAClass::macAddress(uint8_t* mac) + { + if(WiFiGenericClass::getMode() != WIFI_MODE_NULL){ +- esp_wifi_get_mac(WIFI_IF_STA, mac); ++ esp_wifi_get_mac(WIFI_IF_STA, mac); + } + else{ + esp_read_mac(mac, ESP_MAC_WIFI_STA); +@@ -488,8 +488,8 @@ IPAddress WiFiSTAClass::dnsIP(uint8_t dns_no) + if(WiFiGenericClass::getMode() == WIFI_MODE_NULL){ + return IPAddress(); + } +- ip_addr_t dns_ip = dns_getserver(dns_no); +- return IPAddress(dns_ip.u_addr.ip4.addr); ++ const ip_addr_t* dns_ip = dns_getserver(dns_no); ++ return IPAddress(dns_ip->u_addr.ip4.addr); + } + + /** +-- +2.25.1 + diff --git a/tools/config.sh b/tools/config.sh index 7db15d261..d83307dcc 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -19,7 +19,7 @@ AR_USER="espressif" AR_REPO="$AR_USER/arduino-esp32" IDF_REPO_URL="https://github.com/espressif/esp-idf.git" -CAMERA_REPO_URL="https://github.com/espressif/esp32-camera.git" +CAMERA_REPO_URL="https://github.com/jjsch-dev/esp32-camera.git" FACE_REPO_URL="https://github.com/espressif/esp-face.git" AR_REPO_URL="https://github.com/$AR_REPO.git" @@ -104,4 +104,3 @@ function git_create_pr(){ # git_create_pr local done_pr=`echo "$git_create_pr_res" | jq -r '.title'` if [ ! "$done_pr" == "" ] && [ ! "$done_pr" == "null" ]; then echo 1; else echo 0; fi } - diff --git a/tools/update-components.sh b/tools/update-components.sh index 52c5b6f65..e5ba3812d 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -8,13 +8,15 @@ source ./tools/config.sh if [ ! -d "$AR_COMPS/arduino" ]; then git clone $AR_REPO_URL "$AR_COMPS/arduino" + git -C "$AR_COMPS/arduino" apply ../espy_arduino_library.patch + git -C "$AR_COMPS/arduino" add libraries/WiFi/src + git -C "$AR_COMPS/arduino" commit -m "Applying compile fixes" else git -C "$AR_COMPS/arduino" fetch origin && \ git -C "$AR_COMPS/arduino" pull origin master fi if [ $? -ne 0 ]; then exit 1; fi git -C "$AR_COMPS/arduino" submodule update --init --recursive - # # CLONE/UPDATE ESP32-CAMERA # From dbc6a27ff33d4d8b0c480d8de3c14ea89edc5a88 Mon Sep 17 00:00:00 2001 From: Stephen Brawner <brawner@gmail.com> Date: Fri, 25 Sep 2020 15:36:09 -0700 Subject: [PATCH 2/2] Set camera repo --- tools/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index d83307dcc..27be1557b 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -19,7 +19,7 @@ AR_USER="espressif" AR_REPO="$AR_USER/arduino-esp32" IDF_REPO_URL="https://github.com/espressif/esp-idf.git" -CAMERA_REPO_URL="https://github.com/jjsch-dev/esp32-camera.git" +CAMERA_REPO_URL="https://github.com/brawner/esp32-camera.git" FACE_REPO_URL="https://github.com/espressif/esp-face.git" AR_REPO_URL="https://github.com/$AR_REPO.git"