Skip to content

Commit e43ecb9

Browse files
dhrishiRob Walker
dhrishi
and
Rob Walker
authored
ESP32 - Upgrade CHIP to ESP-IDF release v4.1 (project-chip#2558)
* ESP32 - Upgrade CHIP to ESP-IDF release v4.1 * update workflows to 0.4.4 * move to 0.4.7 * upload logs from the correct place * no realpath on macos, write my own * turn off ipv6 scoping in lwip * restyle * * fix flashing scripts to work on MacOS * expand app partition to full extent of 2MB part * undo attempted log fixup * move docker images up to 4.7 * restyled Co-authored-by: Rob Walker <robert_g_walker@apple.com>
1 parent 5d4da3f commit e43ecb9

35 files changed

+326
-166
lines changed

‎.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"dockerfile": "Dockerfile",
1414
"args": {
1515
// "BUILD_VERSION": "$(cat integrations/docker/images/chip-build/version)" // trying to get this to work
16-
"BUILD_VERSION": "0.4.6"
16+
"BUILD_VERSION": "0.4.7"
1717
}
1818
},
1919
"remoteUser": "vscode",

‎.github/workflows/android.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333

3434
container:
35-
image: connectedhomeip/chip-build-android:0.4.6
35+
image: connectedhomeip/chip-build-android:0.4.7
3636
volumes:
3737
- "/tmp/log_output:/tmp/test_logs"
3838

‎.github/workflows/bloat_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525

2626
container:
27-
image: connectedhomeip/chip-build:0.4.6
27+
image: connectedhomeip/chip-build:0.4.7
2828

2929
steps:
3030
- name: Checkout

‎.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535

3636
container:
37-
image: connectedhomeip/chip-build:0.4.6
37+
image: connectedhomeip/chip-build:0.4.7
3838
volumes:
3939
- "/tmp/log_output:/tmp/test_logs"
4040

‎.github/workflows/examples-autotools.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929

3030
container:
31-
image: connectedhomeip/chip-build-esp32:0.4.6
31+
image: connectedhomeip/chip-build-esp32:0.4.7
3232
volumes:
3333
- "/tmp/bloat_reports:/tmp/bloat_reports"
3434
- "/tmp/output_binaries:/tmp/output_binaries"

‎.github/workflows/examples-gn.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929

3030
container:
31-
image: connectedhomeip/chip-build-esp32:0.4.6
31+
image: connectedhomeip/chip-build-esp32:0.4.7
3232
volumes:
3333
- "/tmp/bloat_reports:/tmp/bloat_reports"
3434
- "/tmp/output_binaries:/tmp/output_binaries"

‎.github/workflows/examples.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232

3333
container:
34-
image: connectedhomeip/chip-build-nrf-platform:0.4.1
34+
image: connectedhomeip/chip-build-nrf-platform:0.4.7
3535
volumes:
3636
- "/tmp/bloat_reports:/tmp/bloat_reports"
3737
- "/tmp/output_binaries:/tmp/output_binaries"
@@ -82,7 +82,7 @@ jobs:
8282
runs-on: ubuntu-latest
8383

8484
container:
85-
image: connectedhomeip/chip-build:0.4.6
85+
image: connectedhomeip/chip-build:0.4.7
8686
volumes:
8787
- "/tmp/bloat_reports:/tmp/bloat_reports"
8888
- "/tmp/output_binaries:/tmp/output_binaries"
@@ -130,7 +130,7 @@ jobs:
130130
runs-on: ubuntu-latest
131131

132132
container:
133-
image: connectedhomeip/chip-build-efr32:0.4.6
133+
image: connectedhomeip/chip-build-efr32:0.4.7
134134
volumes:
135135
- "/tmp/bloat_reports:/tmp/bloat_reports"
136136
- "/tmp/output_binaries:/tmp/output_binaries"
@@ -167,7 +167,7 @@ jobs:
167167
runs-on: ubuntu-latest
168168

169169
container:
170-
image: connectedhomeip/chip-build-nrf-platform:0.4.6
170+
image: connectedhomeip/chip-build-nrf-platform:0.4.7
171171
volumes:
172172
- "/tmp/bloat_reports:/tmp/bloat_reports"
173173
- "/tmp/output_binaries:/tmp/output_binaries"

‎.github/workflows/qemu.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929

3030
container:
31-
image: connectedhomeip/chip-build-esp32-qemu:0.4.6
31+
image: connectedhomeip/chip-build-esp32-qemu:0.4.7
3232
volumes:
3333
- "/tmp/log_output:/tmp/test_logs"
3434

‎examples/wifi-echo/server/esp32/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/third_party/connectedhomeip/config/esp32
2626
$(PROJECT_PATH)/../../../common/QRCode \
2727
$(PROJECT_PATH)/../../../common/screen-framework \
2828

29-
CXXFLAGS += -std=c++11 -Os
30-
CPPFLAGS += -Os
31-
CFLAGS += -Os
29+
CXXFLAGS += -std=c++11 -Os -DLWIP_IPV6_SCOPES=0
30+
CPPFLAGS += -Os -DLWIP_IPV6_SCOPES=0
31+
CFLAGS += -Os -DLWIP_IPV6_SCOPES=0
3232

3333
CHIP_BUILD_WITH_GN ?= ""
3434

‎examples/wifi-echo/server/esp32/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ Development Framework and the xtensa-esp32-elf toolchain.
3333
The VSCode devcontainer has these components pre-installed, so you can skip this
3434
step. To install these components manually, follow these steps:
3535

36-
- Clone the Expressif ESP-IDF and checkout version 4.0
36+
- Clone the Espressif ESP-IDF and checkout release tag v4.1
3737

3838
$ mkdir ${HOME}/tools
3939
$ cd ${HOME}/tools
4040
$ git clone https://github.com/espressif/esp-idf.git
4141
$ cd esp-idf
42-
$ git checkout release/v4.0
42+
$ git checkout tags/v4.1
4343
$ git submodule update --init
4444
$ export IDF_PATH=${HOME}/tools/esp-idf
4545
$ ./install.sh

‎examples/wifi-echo/server/esp32/main/EchoClient.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "freertos/FreeRTOS.h"
2525
#include "freertos/task.h"
2626
#include "nvs_flash.h"
27-
#include "tcpip_adapter.h"
2827
#include <string.h>
2928
#include <sys/param.h>
3029

‎examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "RendezvousSession.h"
2828
#include "esp_heap_caps.h"
2929
#include "esp_log.h"
30+
#include "esp_netif.h"
3031
#include <platform/CHIPDeviceLayer.h>
3132
#include <support/CodeUtils.h>
3233

@@ -56,11 +57,11 @@ void EchoDeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, int
5657
ESP_LOGI(TAG, "Current free heap: %d\n", heap_caps_get_free_size(MALLOC_CAP_8BIT));
5758
if (event->InternetConnectivityChange.IPv4 == kConnectivity_Established)
5859
{
59-
tcpip_adapter_ip_info_t ipInfo;
60-
if (tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ipInfo) == ESP_OK)
60+
esp_netif_ip_info_t ipInfo;
61+
if (esp_netif_get_ip_info(esp_netif_get_handle_from_ifkey("WIFI_STA_DEF"), &ipInfo) == ESP_OK)
6162
{
6263
char ipAddrStr[INET_ADDRSTRLEN];
63-
IPAddress::FromIPv4(ipInfo.ip).ToString(ipAddrStr, sizeof(ipAddrStr));
64+
esp_ip4addr_ntoa(&ipInfo.ip, ipAddrStr, sizeof(ipAddrStr));
6465
ESP_LOGI(TAG, "Server ready at: %s:%d", ipAddrStr, CHIP_PORT);
6566

6667
// Since the commissioner device does not yet have a mechanism to discover the IP address

‎examples/wifi-echo/server/esp32/main/EchoServer.cpp

+3-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "freertos/FreeRTOS.h"
2323
#include "freertos/task.h"
2424
#include "nvs_flash.h"
25-
#include "tcpip_adapter.h"
2625

2726
#include <algorithm>
2827
#include <stdint.h>
@@ -254,12 +253,9 @@ void PairingComplete(Optional<NodeId> peerNodeId, uint16_t peerKeyId, uint16_t l
254253
// The echo server assumes the platform's networking has been setup already
255254
void startServer()
256255
{
257-
CHIP_ERROR err = CHIP_NO_ERROR;
258-
struct netif * ipV6NetIf = NULL;
259-
tcpip_adapter_get_netif(TCPIP_ADAPTER_IF_AP, (void **) &ipV6NetIf);
260-
261-
err = sessions.Init(kLocalNodeId, &DeviceLayer::SystemLayer,
262-
UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv6).SetInterfaceId(ipV6NetIf),
256+
CHIP_ERROR err = CHIP_NO_ERROR;
257+
err = sessions.Init(kLocalNodeId, &DeviceLayer::SystemLayer,
258+
UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv6).SetInterfaceId(NULL),
263259
UdpListenParameters(&DeviceLayer::InetLayer).SetAddressType(kIPAddressType_IPv4));
264260
SuccessOrExit(err);
265261

‎examples/wifi-echo/server/esp32/main/wifi-echo.cpp

+5-7
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,16 @@
2727
#include "RendezvousSession.h"
2828
#include "ScreenManager.h"
2929
#include "WiFiWidget.h"
30-
#include "esp_event_loop.h"
3130
#include "esp_heap_caps_init.h"
3231
#include "esp_log.h"
32+
#include "esp_netif.h"
3333
#include "esp_spi_flash.h"
3434
#include "esp_system.h"
3535
#include "esp_wifi.h"
3636
#include "freertos/FreeRTOS.h"
3737
#include "freertos/task.h"
3838
#include "nvs_flash.h"
3939

40-
#include "tcpip_adapter.h"
41-
4240
#include <cmath>
4341
#include <cstdio>
4442
#include <string>
@@ -348,10 +346,10 @@ void SetupPretendDevices()
348346

349347
void GetGatewayIP(char * ip_buf, size_t ip_len)
350348
{
351-
tcpip_adapter_ip_info_t ip;
352-
tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ip);
353-
IPAddress::FromIPv4(ip.ip).ToString(ip_buf, ip_len);
354-
ESP_LOGE(TAG, "Got gateway ip %s", ip_buf);
349+
esp_netif_ip_info_t ipInfo;
350+
esp_netif_get_ip_info(esp_netif_get_handle_from_ifkey("WIFI_AP_DEF"), &ipInfo);
351+
esp_ip4addr_ntoa(&ipInfo.ip, ip_buf, ip_len);
352+
ESP_LOGI(TAG, "Got gateway ip %s", ip_buf);
355353
}
356354

357355
bool isRendezvousBLE()

‎integrations/docker/images/build-all.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# temporary wrapper build script until we can build something better
2121
# https://github.com/project-chip/connectedhomeip/issues/710
2222
#
23-
23+
set -e
2424
find . -name Dockerfile | while read -r dockerfile; do
2525
dir=${dockerfile%/*}
2626
(cd "$dir" && ./build.sh "$@") || exit $?

‎integrations/docker/images/chip-build-esp32/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN set -x \
77
&& DEBIAN_FRONTEND=noninteractive apt-get install -y python \
88
&& mkdir -p /opt/expressif \
99
&& cd /opt/expressif \
10-
&& git clone --progress -b release/v4.0 https://github.com/espressif/esp-idf.git \
10+
&& git clone --progress -b v4.1 https://github.com/espressif/esp-idf.git \
1111
&& cd esp-idf \
1212
&& git submodule update --init --progress \
1313
&& IDF_TOOLS_PATH=/opt/expressif/tools ./install.sh \

‎integrations/docker/images/chip-build/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.4.6
1+
0.4.7

‎scripts/tools/build_esp32_flash_image.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
here=$(cd "$(dirname "$0")" && pwd)
3030
build_dir="$(dirname "$1")"
31-
bootload_file="$build_dir"/bootloader/bootloader.bin
32-
partitions_file="$build_dir"/partitions_singleapp.bin
31+
bootload_file="$build_dir"/bootloader.bin
32+
partitions_file="$build_dir"/partitions.bin
3333

3434
"$here"/flash_image_builder.sh 0x400000 "$2" 0x1000="$bootload_file" 0x8000="$partitions_file" 0x10000="$1"

‎scripts/tools/esp32_qemu_run.sh

+25
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,31 @@ die() {
3838
exit 1
3939
}
4040

41+
realpath() {
42+
path=$1 # input
43+
44+
[[ -z $path ]] && return 0
45+
46+
# trim trailing slashes
47+
while [[ ${#path} -gt 1 && $path = */ ]]; do
48+
path=${path%/}
49+
done
50+
51+
# if we're at root we're done
52+
if [[ $path = / ]]; then
53+
echo "$path"
54+
return 0
55+
fi
56+
57+
[[ $path != /* ]] && path=$PWD/$path
58+
59+
if [[ -d $path ]]; then
60+
(cd "$path" && pwd)
61+
else
62+
echo "$(realpath "${path%/*}")/${path##*/}"
63+
fi
64+
}
65+
4166
[[ $# -eq 1 ]] || usage "Incorrect number of arguments"
4267

4368
[[ -n $QEMU_ESP32 ]] || die "Environment variable QEMU_ESP32 is undefined."

‎scripts/tools/flash_image_builder.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
# source binaries at specific offset in the image
2323
#
2424

25+
set -e
26+
2527
usage() {
2628
exitcode=0
2729
if [[ -n "$1" ]]; then
@@ -54,8 +56,8 @@ for item in "${@:3}"; do
5456
[[ -r $file ]] || usage "Cannot read file $file"
5557
[[ $written -le $offset ]] || usage "Writing $file at $offset will overwrite previous segment"
5658

57-
filesize=$(stat -c%s "$file")
58-
written=$((written + filesize))
59+
read -r _perms _ _user _group filesize _rest < <(ls -l "$file")
60+
((written += filesize))
5961
[[ $written -lt $image_size ]] || usage "Writing $file at $offset will overflow image"
6062

6163
dd if="$file" of="$2" conv=notrunc bs="$offset" seek=1

‎src/lib/support/CHIPArgParser.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1007,10 +1007,10 @@ bool ParseSubnetId(const char * str, uint16_t & subnetId)
10071007
*/
10081008
bool ParseHexString(const char * hexStr, uint32_t strLen, uint8_t * outBuf, uint32_t outBufSize, uint32_t & outDataLen)
10091009
{
1010-
bool isFirstNibble = true;
1011-
uint8_t firstNibbleVal;
1012-
const char * p = hexStr;
1013-
uint32_t dataLen = 0;
1010+
bool isFirstNibble = true;
1011+
uint8_t firstNibbleVal = 0;
1012+
const char * p = hexStr;
1013+
uint32_t dataLen = 0;
10141014

10151015
outDataLen = 0;
10161016

‎src/platform/ESP32/CHIPDevicePlatformEvent.h

+20-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,26 @@ struct ChipDevicePlatformEvent final
5252
{
5353
union
5454
{
55-
system_event_t ESPSystemEvent;
55+
struct
56+
{
57+
esp_event_base_t Base;
58+
int32_t Id;
59+
union
60+
{
61+
ip_event_got_ip_t IpGotIp;
62+
ip_event_got_ip6_t IpGotIp6;
63+
ip_event_ap_staipassigned_t IpApStaIpAssigned;
64+
wifi_event_sta_scan_done_t WifiStaScanDone;
65+
wifi_event_sta_connected_t WifiStaConnected;
66+
wifi_event_sta_disconnected_t WifiStaDisconnected;
67+
wifi_event_sta_authmode_change_t WifiStaAuthModeChange;
68+
wifi_event_sta_wps_er_pin_t WifiStaWpsErPin;
69+
wifi_event_sta_wps_fail_reason_t WifiStaWpsErFailed;
70+
wifi_event_ap_staconnected_t WifiApStaConnected;
71+
wifi_event_ap_stadisconnected_t WifiApStaDisconnected;
72+
wifi_event_ap_probe_req_rx_t WifiApProbeReqRecved;
73+
} Data;
74+
} ESPSystemEvent;
5675
};
5776
};
5877

0 commit comments

Comments
 (0)