Skip to content

[Examples] WiFi and Ethernet examples organization #5830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 4, 2021
Merged

[Examples] WiFi and Ethernet examples organization #5830

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e337b63
examples: WiFi and Ethernet examples organization
pedrominatel Nov 2, 2021
e450faf
examples: Change on CI scripts to include new folder
pedrominatel Nov 2, 2021
b33c17c
Library name reverted to WiFi
pedrominatel Nov 2, 2021
c58c2a2
examples: WiFi and Ethernet examples organization in a new folder
pedrominatel Nov 4, 2021
609d7ce
examples: Eth files moved from WiFi to Ethernet lib and CMakeLists up…
pedrominatel Nov 4, 2021
df08c7e
Merge branch 'master' into feature/ethernet_and_wifi_examples_organiz…
pedrominatel Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/scripts/on-push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
elif [ "$OS_IS_MACOS" == "1" ]; then
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino" && \
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino" && \
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \
Expand All @@ -61,7 +61,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then
TARGET="esp32s2"
FQBN="espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app"
if [ "$OS_IS_WINDOWS" == "1" ]; then
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
elif [ "$OS_IS_MACOS" == "1" ]; then
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
Expand All @@ -74,10 +74,10 @@ if [ "$BUILD_PIO" -eq 0 ]; then
TARGET="esp32c3"
FQBN="espressif:esp32:esp32c3:PartitionScheme=huge_app"
if [ "$OS_IS_WINDOWS" == "1" ]; then
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
elif [ "$OS_IS_MACOS" == "1" ]; then
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
else
build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
Expand All @@ -87,18 +87,18 @@ else
# PlatformIO ESP32 Test
BOARD="esp32dev"
OPTIONS="board_build.partitions = huge_app.csv"
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino" && \
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino" && \
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"

# PlatformIO ESP32 Test
# OPTIONS="board_build.mcu = esp32s2"
# build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
# build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
# build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"

python -m platformio ci --board "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.mcu = esp32s2" --project-option="board_build.partitions = huge_app.csv"
python -m platformio ci --board "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient" --project-option="board_build.mcu = esp32s2" --project-option="board_build.partitions = huge_app.csv"

#build_pio_sketches "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries"
fi
0 ...s/WiFi/examples/ETH_LAN8720/.skip.esp32s2 → ...amples/Ethernet/ETH_LAN8720/.skip.esp32s2
View file
Open in desktop
File renamed without changes.
0 ...WiFi/examples/ETH_LAN8720/ETH_LAN8720.ino → ...ples/Ethernet/ETH_LAN8720/ETH_LAN8720.ino
View file
Open in desktop
File renamed without changes.
0 ...es/WiFi/examples/ETH_TLK110/.skip.esp32s2 → ...xamples/Ethernet/ETH_TLK110/.skip.esp32s2
View file
Open in desktop
File renamed without changes.
0 ...s/WiFi/examples/ETH_TLK110/ETH_TLK110.ino → ...amples/Ethernet/ETH_TLK110/ETH_TLK110.ino
View file
Open in desktop
File renamed without changes.
0 ...mples/FTM/FTM_Initiator/FTM_Initiator.ino → .../WiFi/FTM/FTM_Initiator/FTM_Initiator.ino
View file
Open in desktop
File renamed without changes.
0 ...WiFi/examples/FTM/FTM_Initiator/README.md → ...examples/WiFi/FTM/FTM_Initiator/README.md
View file
Open in desktop
File renamed without changes.
0 ...mples/FTM/FTM_Responder/FTM_Responder.ino → .../WiFi/FTM/FTM_Responder/FTM_Responder.ino
View file
Open in desktop
File renamed without changes.
0 ...WiFi/examples/FTM/FTM_Responder/README.md → ...examples/WiFi/FTM/FTM_Responder/README.md
View file
Open in desktop
File renamed without changes.
0 ...les/SimpleWiFiServer/SimpleWiFiServer.ino → ...iFi/SimpleWiFiServer/SimpleWiFiServer.ino
View file
Open in desktop
File renamed without changes.
0 libraries/WiFi/examples/WPS/README.md → libraries/WiFi/examples/WiFi/WPS/README.md
View file
Open in desktop
File renamed without changes.
0 libraries/WiFi/examples/WPS/WPS.ino → libraries/WiFi/examples/WiFi/WPS/WPS.ino
View file
Open in desktop
File renamed without changes.
0 ...mples/WiFiAccessPoint/WiFiAccessPoint.ino → .../WiFi/WiFiAccessPoint/WiFiAccessPoint.ino
View file
Open in desktop
File renamed without changes.
0 ...xamples/WiFiBlueToothSwitch/.skip.esp32s2 → ...es/WiFi/WiFiBlueToothSwitch/.skip.esp32s2
View file
Open in desktop
File renamed without changes.
0 ...FiBlueToothSwitch/WiFiBlueToothSwitch.ino → ...FiBlueToothSwitch/WiFiBlueToothSwitch.ino
View file
Open in desktop
File renamed without changes.
0 ...s/WiFi/examples/WiFiClient/WiFiClient.ino → ...i/examples/WiFi/WiFiClient/WiFiClient.ino
View file
Open in desktop
File renamed without changes.
0 ...mples/WiFiClientBasic/WiFiClientBasic.ino → .../WiFi/WiFiClientBasic/WiFiClientBasic.ino
View file
Open in desktop
File renamed without changes.
0 ...i/examples/WiFiClientEnterprise/README.md → ...mples/WiFi/WiFiClientEnterprise/README.md
View file
Open in desktop
File renamed without changes.
0 ...ClientEnterprise/WiFiClientEnterprise.ino → ...ClientEnterprise/WiFiClientEnterprise.ino
View file
Open in desktop
File renamed without changes.
0 ...les/WiFiClientEvents/WiFiClientEvents.ino → ...iFi/WiFiClientEvents/WiFiClientEvents.ino
View file
Open in desktop
File renamed without changes.
0 ...WiFiClientStaticIP/WiFiClientStaticIP.ino → ...WiFiClientStaticIP/WiFiClientStaticIP.ino
View file
Open in desktop
File renamed without changes.
0 ...aries/WiFi/examples/WiFiIPv6/WiFiIPv6.ino → .../WiFi/examples/WiFi/WiFiIPv6/WiFiIPv6.ino
View file
Open in desktop
File renamed without changes.
0 ...ies/WiFi/examples/WiFiMulti/WiFiMulti.ino → ...iFi/examples/WiFi/WiFiMulti/WiFiMulti.ino
View file
Open in desktop
File renamed without changes.
0 libraries/WiFi/examples/WiFiScan/README.md → ...ies/WiFi/examples/WiFi/WiFiScan/README.md
View file
Open in desktop
File renamed without changes.
0 ...aries/WiFi/examples/WiFiScan/WiFiScan.ino → .../WiFi/examples/WiFi/WiFiScan/WiFiScan.ino
View file
Open in desktop
File renamed without changes.
0 ...mples/WiFiSmartConfig/WiFiSmartConfig.ino → .../WiFi/WiFiSmartConfig/WiFiSmartConfig.ino
View file
Open in desktop
File renamed without changes.
0 ...WiFiTelnetToSerial/WiFiTelnetToSerial.ino → ...WiFiTelnetToSerial/WiFiTelnetToSerial.ino
View file
Open in desktop
File renamed without changes.
0 .../examples/WiFiUDPClient/WiFiUDPClient.ino → ...ples/WiFi/WiFiUDPClient/WiFiUDPClient.ino
View file
Open in desktop
File renamed without changes.
0 ...WiFi/examples/WiFiUDPClient/udp_server.py → ...examples/WiFi/WiFiUDPClient/udp_server.py
View file
Open in desktop
File renamed without changes.
0 ...WiFi/examples/WiFiUDPClient/udp_server.rb → ...examples/WiFi/WiFiUDPClient/udp_server.rb
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion libraries/WiFi/library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name=WiFi
name=WiFi and Ethernet
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks dependencies, do not change the name.

version=2.0.0
author=Hristo Gochkov
maintainer=Hristo Gochkov <[email protected]>
Expand Down