Skip to content

Commit

Permalink
v1.9.0 to auto detect ESP32 core
Browse files Browse the repository at this point in the history
### Major Release v1.9.0

1. Auto detect ESP32 core to use for WT32_ETH01
2. Fix bug in WT32_ETH01 examples to reduce connection time
3. Replace deprecated `echo.websocket.org` in examples.
  • Loading branch information
khoih-prog authored Nov 30, 2021
1 parent dbb657c commit 46fddc6
Show file tree
Hide file tree
Showing 44 changed files with 126 additions and 514 deletions.
2 changes: 1 addition & 1 deletion examples/ESP32/ESP32-Client_SINRIC/ESP32-Client_SINRIC.ino
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting ESP32-Client_SINRIC on " + String(ARDUINO_BOARD));
Serial.print("\nStart ESP32-Client_SINRIC on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ void drawGraph()

void setup()
{
Serial.begin(115200);
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting Esp32-AdvancedWebServer on " + String(ARDUINO_BOARD));
Serial.print("\nStart ESP32-AdvancedWebServer on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

Serial.print("Attempting to connect to SSID: ");
Expand Down
2 changes: 1 addition & 1 deletion examples/ESP32/Esp32-Client/Esp32-Client.ino
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting ESP32-Client on " + String(ARDUINO_BOARD));
Serial.print("\nStart ESP32-Client on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
2 changes: 1 addition & 1 deletion examples/ESP32/Esp32-Client/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
const char* ssid = "ssid"; //Enter SSID
const char* password = "password"; //Enter Password

const char* websockets_server_host = "192.168.2.95"; //Enter server address
const char* websockets_server_host = "192.168.2.30"; //Enter server address
//const char* websockets_server_host = "serverip_or_name"; //Enter server address

#define WEBSOCKETS_PORT 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting ESP32-RepeatingClient on " + String(ARDUINO_BOARD));
Serial.print("\nStart ESP32-RepeatingClient on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
2 changes: 1 addition & 1 deletion examples/ESP32/Esp32-RepeatingClient/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
const char* ssid = "ssid"; //Enter SSID
const char* password = "password"; //Enter Password

const char* websockets_server_host = "192.168.2.119"; //Enter server address
const char* websockets_server_host = "192.168.2.30"; //Enter server address
//const char* websockets_server_host = "serverip_or_name"; //Enter server address

#define WEBSOCKETS_PORT 8080
Expand Down
2 changes: 1 addition & 1 deletion examples/ESP32/Esp32-Server/Esp32-Server.ino
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting ESP32-Server on " + String(ARDUINO_BOARD));
Serial.print("\nStart ESP32-Server on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

WiFi.mode(WIFI_STA);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting WebSockets InSecured-ESP32-Client on " + String(ARDUINO_BOARD));
Serial.print("\nStart InSecured-ESP32-Client on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
1 change: 1 addition & 0 deletions examples/ESP32/InSecured-Esp32-Client/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
const char* ssid = "ssid"; //Enter SSID
const char* password = "password"; //Enter Password

// Deprecated echo.websocket.org to be replaced or it won't work
const char* websockets_connection_string = "wss://echo.websocket.org/"; //Enter server adress

#define USING_INSECURE_MODE true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting Minimal-ESP32-Client on " + String(ARDUINO_BOARD));
Serial.print("\nStart Minimal-ESP32-Client on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
2 changes: 1 addition & 1 deletion examples/ESP32/Minimal-Esp32-Client/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
const char* ssid = "ssid"; //Enter SSID
const char* password = "password"; //Enter Password

const char* websockets_server_host = "192.168.2.95"; //Enter server address
const char* websockets_server_host = "192.168.2.30"; //Enter server address
//const char* websockets_server_host = "serverip_or_name"; //Enter server address

#define WEBSOCKETS_PORT 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting WebSockets Secured-ESP32-Client on " + String(ARDUINO_BOARD));
Serial.print("\nStart Secured-ESP32-Client on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
1 change: 1 addition & 0 deletions examples/ESP32/Secured-Esp32-Client/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
const char* ssid = "ssid"; //Enter SSID
const char* password = "password"; //Enter Password

// Deprecated echo.websocket.org to be replaced or it won't work
const char* websockets_connection_string = "wss://echo.websocket.org/"; //Enter server adress

// KH, This certificate was updated 15.04.2021,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting ESP8266-Client_SINRIC on " + String(ARDUINO_BOARD));
Serial.print("\nStart ESP8266-Client_SINRIC on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting Esp8266-AdvancedWebServer on " + String(ARDUINO_BOARD));
Serial.print("\nStart ESP8266-AdvancedWebServer on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

Serial.print("Attempting to connect to SSID: ");
Expand Down
2 changes: 1 addition & 1 deletion examples/ESP8266/Esp8266-Client/Esp8266-Client.ino
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting ESP8266-Client on " + String(ARDUINO_BOARD));
Serial.print("\nStart ESP8266-Client on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
2 changes: 1 addition & 1 deletion examples/ESP8266/Esp8266-Client/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
const char* ssid = "ssid"; //Enter SSID
const char* password = "password"; //Enter Password

const char* websockets_server_host = "192.168.2.93"; //Enter server address
const char* websockets_server_host = "192.168.2.30"; //Enter server address
//const char* websockets_server_host = "serverip_or_name"; //Enter server address

#define WEBSOCKETS_PORT 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting ESP8266-RepeatingClient on " + String(ARDUINO_BOARD));
Serial.print("\nStart ESP8266-RepeatingClient on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
2 changes: 1 addition & 1 deletion examples/ESP8266/Esp8266-RepeatingClient/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
const char* ssid = "ssid"; //Enter SSID
const char* password = "password"; //Enter Password

const char* websockets_server_host = "192.168.2.132"; //Enter server address
const char* websockets_server_host = "192.168.2.30"; //Enter server address
//const char* websockets_server_host = "serverip_or_name"; //Enter server address

#define WEBSOCKETS_PORT 8080
Expand Down
2 changes: 1 addition & 1 deletion examples/ESP8266/Esp8266-Server/Esp8266-Server.ino
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting ESP8266-Server on " + String(ARDUINO_BOARD));
Serial.print("\nStart ESP8266-Server on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting InSecured-ESP8266-Client on " + String(ARDUINO_BOARD));
Serial.print("\nStart InSecured-ESP8266-Client on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
1 change: 1 addition & 0 deletions examples/ESP8266/InSecured-Esp8266-Client/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
const char* ssid = "ssid"; //Enter SSID
const char* password = "password"; //Enter Password

// Deprecated echo.websocket.org to be replaced or it won't work
const char* websockets_connection_string = "wss://echo.websocket.org/"; //Enter server adress

#define USING_INSECURE_MODE true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting ESP8266-Minimal-Client on " + String(ARDUINO_BOARD));
Serial.print("\nStart Minimal-ESP8266-Client on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
2 changes: 1 addition & 1 deletion examples/ESP8266/Minimal-Esp8266-Client/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
const char* ssid = "ssid"; //Enter SSID
const char* password = "password"; //Enter Password

const char* websockets_server_host = "192.168.2.95"; //Enter server address
const char* websockets_server_host = "192.168.2.30"; //Enter server address
//const char* websockets_server_host = "serverip_or_name"; //Enter server address

#define WEBSOCKETS_PORT 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting Secured-ESP8266-Client on " + String(ARDUINO_BOARD));
Serial.print("\nStart Secured-ESP8266-Client on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
1 change: 1 addition & 0 deletions examples/ESP8266/Secured-Esp8266-Client/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
const char* ssid = "ssid"; //Enter SSID
const char* password = "password"; //Enter Password

// Deprecated echo.websocket.org to be replaced or it won't work
const char* websockets_connection_string = "wss://echo.websocket.org/"; //Enter server adress

// To update SHA1 fingerprint, use Google Chrome to connect to https://www.websocket.org/echo.html
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ void setup()
Serial.begin(115200);
while (!Serial);

Serial.println("\nStarting SecuredTwoWay-ESP8266-Client on " + String(ARDUINO_BOARD));
Serial.print("\nStart SecuredTwoWay-ESP8266-Client on "); Serial.println(ARDUINO_BOARD);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// Connect to wifi
Expand Down
1 change: 1 addition & 0 deletions examples/ESP8266/SecuredTwoWay-Esp8266-Client/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
const char* ssid = "ssid"; //Enter SSID
const char* password = "password"; //Enter Password

// Deprecated echo.websocket.org to be replaced or it won't work
const char* websockets_connection_string = "wss://echo.websocket.org/"; //Enter server adress

/* NTP Time Servers */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,78 +99,30 @@ void drawGraph()
server.send(200, "image/svg+xml", out);
}

void WiFiEvent(WiFiEvent_t event)
{
switch (event)
{
case SYSTEM_EVENT_ETH_START:
Serial.println("\nETH Started");
//set eth hostname here
ETH.setHostname("WT32-ETH01");
break;
case SYSTEM_EVENT_ETH_CONNECTED:
Serial.println("ETH Connected");
break;

case SYSTEM_EVENT_ETH_GOT_IP:
if (!eth_connected)
{
Serial.print("ETH MAC: ");
Serial.print(ETH.macAddress());
Serial.print(", IPv4: ");
Serial.print(ETH.localIP());

if (ETH.fullDuplex())
{
Serial.print(", FULL_DUPLEX");
}

Serial.print(", ");
Serial.print(ETH.linkSpeed());
Serial.println("Mbps");
eth_connected = true;
}

break;

case SYSTEM_EVENT_ETH_DISCONNECTED:
Serial.println("ETH Disconnected");
eth_connected = false;
break;

case SYSTEM_EVENT_ETH_STOP:
Serial.println("\nETH Stopped");
eth_connected = false;
break;

default:
break;
}
}

void setup()
{
Serial.begin(115200);
while (!Serial);

Serial.print("\nStarting WT32_ETH01_AdvancedWebServer on " + String(ARDUINO_BOARD));
Serial.println(" with " + String(SHIELD_TYPE));
Serial.print("\nStart WT32_ETH01_AdvancedWebServer on "); Serial.print(ARDUINO_BOARD);
Serial.print(" with "); Serial.println(SHIELD_TYPE);
Serial.println(WEBSERVER_WT32_ETH01_VERSION);
Serial.println(WEBSOCKETS2_GENERIC_VERSION);

// To be called before ETH.begin()
WT32_ETH01_onEvent();

//bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO,
// eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
//ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_TYPE, ETH_CLK_MODE);
ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER);

// Static IP, leave without this line to get IP via DHCP
//bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = 0, IPAddress dns2 = 0);
ETH.config(serverIP, static_GW, static_SN, myDNS);

WiFi.onEvent(WiFiEvent);
ETH.config(serverIP, static_GW, static_SN, myDNS);

while (!eth_connected)
delay(100);
WT32_ETH01_waitForConnect();

if (MDNS.begin("WT32_ETH01"))
{
Expand Down
10 changes: 5 additions & 5 deletions examples/WT32_ETH01/WT32_ETH01_AdvancedWebServer/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@
#error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting.
#endif

#define DEBUG_WEBSOCKETS_PORT Serial
// Debug Level from 0 to 4
#define _WEBSOCKETS_LOGLEVEL_ 3
#define _ETHERNET_WEBSERVER_LOGLEVEL_ 2

#include <WebServer_WT32_ETH01.h> // https://github.com/khoih-prog/WebServer_WT32_ETH01
#include <ESPmDNS.h>

#define DEBUG_WEBSOCKETS_PORT Serial
// Debug Level from 0 to 4
#define _WEBSOCKETS_LOGLEVEL_ 3

const uint16_t websockets_server_port = 8080; // Enter server port

// Select the IP address according to your local network
Expand All @@ -46,5 +47,4 @@ IPAddress static_SN(255, 255, 255, 0);
// Google DNS Server IP
IPAddress myDNS(8, 8, 8, 8);


#endif //defines_h
Loading

0 comments on commit 46fddc6

Please sign in to comment.