Merge branch 'master' into feature/esp32s2beta_update

This commit is contained in:
Angus Gratton
2019-08-08 13:44:24 +10:00
committed by Angus Gratton
2414 changed files with 160787 additions and 45783 deletions

View File

@@ -2,7 +2,7 @@
The Example contains of OpenSSL server demo.
To configure the project, run `make menuconfig` (or `idf.py menuconfig` if using CMake build system).
Open the project configuration menu (`idf.py menuconfig`):
* Configure Wi-Fi or Ethernet under "Example Connection Configuration" menu. See "Establishing Wi-Fi or Ethernet Connection" section in [examples/protocols/README.md](../README.md) for more details.

View File

@@ -1,8 +1,4 @@
set(COMPONENT_SRCS "openssl_server_example_main.c")
set(COMPONENT_ADD_INCLUDEDIRS ".")
# Embed the certificate & key data directly in the built binary
set(COMPONENT_EMBED_TXTFILES cacert.pem prvtkey.pem)
register_component()
idf_component_register(SRCS "openssl_server_example_main.c"
INCLUDE_DIRS "."
EMBED_TXTFILES cacert.pem prvtkey.pem)