Skip to content

Commit f900379

Browse files
authored
Merge branch 'wolfSSL:master' into bench_PR
2 parents fadc529 + a363898 commit f900379

27 files changed

+2450
-4106
lines changed

.gitignore

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,3 +304,18 @@ tpm/evp_tpm
304304
**/main/build/CMakeFiles/*
305305
**/build/*
306306

307+
# VisualGDB
308+
**/.visualgdb
309+
310+
# Espressif sdk config default should be saved in sdkconfig.defaults
311+
# we won't track the actual working sdkconfig files
312+
/ESP32/**/sdkconfig
313+
/ESP32/**/sdkconfig.old
314+
/ESP32/**/sdkconfig.bak
315+
316+
# the solution files are not needed (Visual Studio will generated them)
317+
/ESP32/**/*.sln
318+
319+
# auto-created CMake backups
320+
**/CMakeLists.txt.old
321+

ESP32/README.md

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# wolfSSL ESP32 Examples
22

3+
These are wolfSSL TLS 1.3 clients and servers for both wired and wireless Internet.
4+
5+
Note: wolfSSL v5.5.4 or newer is needed to use these examples with ESP-IDF v5.
6+
7+
See the [setup scripts](https://github.com/wolfSSL/wolfssl/tree/master/IDE/Espressif/ESP-IDF) to install.
8+
9+
310
## ESP32 TLS 1.3 Server
411

512
- [Wireless STA server](./TLS13-wifi_station-server/README.md)
@@ -39,7 +46,7 @@ coming soon:
3946
## ESP-IDF
4047

4148
Although the examples were created using VisualGDB extension for Visual Studio, the
42-
examples can be compiled using the ESP-IDF.
49+
examples can of course be compiled using the ESP-IDF `idf.py`.
4350

4451
Once the EDP-IDF is installed, use the [setp_win.bat](https://github.com/wolfSSL/wolfssl/blob/master/IDE/Espressif/ESP-IDF/setup_win.bat) to copy wolfSSL files to
4552
the `esp-idf\components` directory, typically in
@@ -54,12 +61,39 @@ cd wolfssl\IDE\Espressif\ESP-IDF\
5461
.\setup_win.bat
5562
```
5663

57-
# Tips
64+
Build with VisualGDB toolchain from WSL
65+
```
66+
. /mnt/c/SysGCC/esp32/esp-idf/v5.0/export.sh
67+
idf.py -b 115200 -p /dev/ttyS15 build flash monitor
68+
```
69+
70+
71+
## Tips
5872

5973
If JTAG gets into a mode where it is simply always returning an error (app continually resetting)
6074
try using serial port to program a basic, operational ["hello world"](./ESP32-hello-world/README.md).
6175
The Arduino IDE or command-line ESP-IDF can be handy here.
6276

77+
## Toolchain Switching in VisualGDB
78+
79+
Due to occasional difficulty in switching between toolchains, separate VisualGDB solution
80+
files are included for ESP-IDF v4.4.1 and v5.0.
81+
82+
See the `ProjectModeSettings` of the respective .`vgdbproj` file:
83+
84+
```
85+
<ESPIDFExtension>
86+
<IDFCheckout>
87+
<Version>release/v5.0</Version>
88+
<Subdirectory>esp-idf/v5.0</Subdirectory>
89+
<Type>ESPIDF</Type>
90+
</IDFCheckout>
91+
<COMPort>COM20</COMPort>
92+
<SuppressTestPrerequisiteChecks>false</SuppressTestPrerequisiteChecks>
93+
<UseCCache>false</UseCCache>
94+
<DeviceID>ESP32</DeviceID>
95+
</ESPIDFExtension>
96+
```
6397

6498
## See also:
6599

ESP32/TLS13-enc28j60.sln

Lines changed: 0 additions & 47 deletions
This file was deleted.

ESP32/TLS13-wifi.sln

Lines changed: 0 additions & 37 deletions
This file was deleted.

ESP32/TLS13-wifi_station-client/TLS13-client.sln

Lines changed: 0 additions & 31 deletions
This file was deleted.

ESP32/TLS13-wifi_station-client/TLS13-wifi_station-client.sln

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)