From c5336741201cb3053bee86cb1540ea8a0c8638b7 Mon Sep 17 00:00:00 2001 From: Mahavir Jain Date: Wed, 10 Jun 2020 15:29:34 +0530 Subject: [PATCH] simple_ota_example: add SPIRAM enabled configuration This commit adds one example test case for OTA with SPIRAM enabled configuration. Additionally it also keeps `SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY` enabled to catch any issues of sort "cache disabled but cached region accessed". https://github.com/espressif/esp-idf/issues/5354 --- .../ota/simple_ota_example/example_test.py | 36 +++++++++++++++++++ .../simple_ota_example/sdkconfig.ci.spiram | 13 +++++++ 2 files changed, 49 insertions(+) create mode 100644 examples/system/ota/simple_ota_example/sdkconfig.ci.spiram diff --git a/examples/system/ota/simple_ota_example/example_test.py b/examples/system/ota/simple_ota_example/example_test.py index fd9adb4f98..d0a1037dd1 100644 --- a/examples/system/ota/simple_ota_example/example_test.py +++ b/examples/system/ota/simple_ota_example/example_test.py @@ -128,5 +128,41 @@ def test_examples_protocol_simple_ota_example(env, extra_data): dut1.expect("Starting OTA example", timeout=30) +@ttfw_idf.idf_example_test(env_tag="Example_EthKitV1") +def test_examples_protocol_simple_ota_example_ethernet_with_spiram_config(env, extra_data): + """ + steps: | + 1. join AP + 2. Fetch OTA image over HTTPS + 3. Reboot with the new OTA image + """ + dut1 = env.get_dut("simple_ota_example", "examples/system/ota/simple_ota_example", dut_class=ttfw_idf.ESP32DUT, app_config_name='spiram') + # check and log bin size + binary_file = os.path.join(dut1.app.binary_path, "simple_ota.bin") + bin_size = os.path.getsize(binary_file) + ttfw_idf.log_performance("simple_ota_bin_size", "{}KB".format(bin_size // 1024)) + ttfw_idf.check_performance("simple_ota_bin_size", bin_size // 1024, dut1.TARGET) + # start test + host_ip = get_my_ip() + thread1 = Thread(target=start_https_server, args=(dut1.app.binary_path, host_ip, 8000)) + thread1.daemon = True + thread1.start() + dut1.start_app() + dut1.expect("Loaded app from partition at offset 0x10000", timeout=30) + try: + ip_address = dut1.expect(re.compile(r" eth ip: ([^,]+),"), timeout=30) + print("Connected to AP with IP: {}".format(ip_address)) + except DUT.ExpectTimeout: + raise ValueError('ENV_TEST_FAILURE: Cannot connect to AP') + thread1.close() + dut1.expect("Starting OTA example", timeout=30) + + print("writing to device: {}".format("https://" + host_ip + ":8000/simple_ota.bin")) + dut1.write("https://" + host_ip + ":8000/simple_ota.bin") + dut1.expect("Loaded app from partition at offset 0x110000", timeout=60) + dut1.expect("Starting OTA example", timeout=30) + + if __name__ == '__main__': test_examples_protocol_simple_ota_example() + test_examples_protocol_simple_ota_example_ethernet_with_spiram_config() diff --git a/examples/system/ota/simple_ota_example/sdkconfig.ci.spiram b/examples/system/ota/simple_ota_example/sdkconfig.ci.spiram new file mode 100644 index 0000000000..d2e75f2693 --- /dev/null +++ b/examples/system/ota/simple_ota_example/sdkconfig.ci.spiram @@ -0,0 +1,13 @@ +CONFIG_EXAMPLE_FIRMWARE_UPGRADE_URL="FROM_STDIN" +CONFIG_EXAMPLE_SKIP_COMMON_NAME_CHECK=y +CONFIG_ESP32_SPIRAM_SUPPORT=y +CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y +CONFIG_EXAMPLE_CONNECT_ETHERNET=y +CONFIG_EXAMPLE_CONNECT_WIFI=n +CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y +CONFIG_EXAMPLE_ETH_PHY_IP101=y +CONFIG_EXAMPLE_ETH_MDC_GPIO=23 +CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 +CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 +CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_EXAMPLE_CONNECT_IPV6=y