From fdad12486c0d252cf52f057fa43748a1f2a18dcb Mon Sep 17 00:00:00 2001 From: Jarda Date: Fri, 25 Aug 2023 00:53:49 +0200 Subject: [PATCH] Update example to ETH and Arduino IDE --- SW/ESPlan_SD_webpage/.gitignore | 5 -- SW/ESPlan_SD_webpage/.vscode/extensions.json | 10 --- .../{src/main.cpp => ESPlan_SD_webpage.ino} | 86 +++++++++++++------ SW/ESPlan_SD_webpage/include/README | 39 --------- SW/ESPlan_SD_webpage/lib/README | 46 ---------- SW/ESPlan_SD_webpage/platformio.ini | 15 ---- SW/ESPlan_SD_webpage/test/README | 11 --- 7 files changed, 59 insertions(+), 153 deletions(-) delete mode 100644 SW/ESPlan_SD_webpage/.gitignore delete mode 100644 SW/ESPlan_SD_webpage/.vscode/extensions.json rename SW/ESPlan_SD_webpage/{src/main.cpp => ESPlan_SD_webpage.ino} (62%) delete mode 100644 SW/ESPlan_SD_webpage/include/README delete mode 100644 SW/ESPlan_SD_webpage/lib/README delete mode 100644 SW/ESPlan_SD_webpage/platformio.ini delete mode 100644 SW/ESPlan_SD_webpage/test/README diff --git a/SW/ESPlan_SD_webpage/.gitignore b/SW/ESPlan_SD_webpage/.gitignore deleted file mode 100644 index 89cc49c..0000000 --- a/SW/ESPlan_SD_webpage/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.pio -.vscode/.browse.c_cpp.db* -.vscode/c_cpp_properties.json -.vscode/launch.json -.vscode/ipch diff --git a/SW/ESPlan_SD_webpage/.vscode/extensions.json b/SW/ESPlan_SD_webpage/.vscode/extensions.json deleted file mode 100644 index 080e70d..0000000 --- a/SW/ESPlan_SD_webpage/.vscode/extensions.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - // See http://go.microsoft.com/fwlink/?LinkId=827846 - // for the documentation about the extensions.json format - "recommendations": [ - "platformio.platformio-ide" - ], - "unwantedRecommendations": [ - "ms-vscode.cpptools-extension-pack" - ] -} diff --git a/SW/ESPlan_SD_webpage/src/main.cpp b/SW/ESPlan_SD_webpage/ESPlan_SD_webpage.ino similarity index 62% rename from SW/ESPlan_SD_webpage/src/main.cpp rename to SW/ESPlan_SD_webpage/ESPlan_SD_webpage.ino index 22fc02e..85e696b 100644 --- a/SW/ESPlan_SD_webpage/src/main.cpp +++ b/SW/ESPlan_SD_webpage/ESPlan_SD_webpage.ino @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include @@ -27,6 +27,54 @@ SPIClass spi = SPIClass(HSPI); WebServer server(80); +// LAN8720A parameters +#define ETH_POWER_PIN -1 +#define ETH_ADDR 0 +#define ETH_MDC_PIN 23 +#define ETH_MDIO_PIN 18 +#define ETH_NRST_PIN 5 + +static bool eth_connected = false; + +void WiFiEvent(WiFiEvent_t event) +{ + switch (event) + { + case ARDUINO_EVENT_ETH_START: + Serial.println("ETH Started"); + // set eth hostname here + ETH.setHostname("esplan"); + break; + case ARDUINO_EVENT_ETH_CONNECTED: + Serial.println("ETH Connected"); + break; + case ARDUINO_EVENT_ETH_GOT_IP: + 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 ARDUINO_EVENT_ETH_DISCONNECTED: + Serial.println("ETH Disconnected"); + eth_connected = false; + break; + case ARDUINO_EVENT_ETH_STOP: + Serial.println("ETH Stopped"); + eth_connected = false; + break; + default: + break; + } +} + void handleNotFound() { String message = "SD card or index.htm file not detected\n\n"; @@ -77,32 +125,16 @@ void handleRoot() spi.end(); } -void wifi_setup() +void eth_setup() { - uint8_t i = 0; - WiFi.mode(WIFI_STA); - WiFi.begin(ssid, password); - Serial.print("Connecting to "); - Serial.println(ssid); - // Wait for connection - while (WiFi.status() != WL_CONNECTED && i++ < 20) - { - Serial.print("."); - delay(500); - } - if (i == 21) - { - Serial.print("\n"); - Serial.print("Could not connect to "); - Serial.println(ssid); - while (1) - { - delay(500); - } - } - Serial.print("\n"); - Serial.print("Connected! IP address: "); - Serial.println(WiFi.localIP()); + // For reseting LAN8720A + pinMode(ETH_NRST_PIN, OUTPUT); + digitalWrite(ETH_NRST_PIN, LOW); + delay(500); + digitalWrite(ETH_NRST_PIN, HIGH); + + WiFi.onEvent(WiFiEvent); + ETH.begin(ETH_ADDR, ETH_POWER_PIN, ETH_MDC_PIN, ETH_MDIO_PIN, ETH_PHY_LAN8720, ETH_CLOCK_GPIO17_OUT); } void DNS_setup() @@ -122,7 +154,7 @@ void setup(void) Serial.begin(115200); Serial.print("\n"); - wifi_setup(); + eth_setup(); DNS_setup(); server.on("/", handleRoot); // Main page diff --git a/SW/ESPlan_SD_webpage/include/README b/SW/ESPlan_SD_webpage/include/README deleted file mode 100644 index 194dcd4..0000000 --- a/SW/ESPlan_SD_webpage/include/README +++ /dev/null @@ -1,39 +0,0 @@ - -This directory is intended for project header files. - -A header file is a file containing C declarations and macro definitions -to be shared between several project source files. You request the use of a -header file in your project source file (C, C++, etc) located in `src` folder -by including it, with the C preprocessing directive `#include'. - -```src/main.c - -#include "header.h" - -int main (void) -{ - ... -} -``` - -Including a header file produces the same results as copying the header file -into each source file that needs it. Such copying would be time-consuming -and error-prone. With a header file, the related declarations appear -in only one place. If they need to be changed, they can be changed in one -place, and programs that include the header file will automatically use the -new version when next recompiled. The header file eliminates the labor of -finding and changing all the copies as well as the risk that a failure to -find one copy will result in inconsistencies within a program. - -In C, the usual convention is to give header files names that end with `.h'. -It is most portable to use only letters, digits, dashes, and underscores in -header file names, and at most one dot. - -Read more about using header files in official GCC documentation: - -* Include Syntax -* Include Operation -* Once-Only Headers -* Computed Includes - -https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/SW/ESPlan_SD_webpage/lib/README b/SW/ESPlan_SD_webpage/lib/README deleted file mode 100644 index 6debab1..0000000 --- a/SW/ESPlan_SD_webpage/lib/README +++ /dev/null @@ -1,46 +0,0 @@ - -This directory is intended for project specific (private) libraries. -PlatformIO will compile them to static libraries and link into executable file. - -The source code of each library should be placed in a an own separate directory -("lib/your_library_name/[here are source files]"). - -For example, see a structure of the following two libraries `Foo` and `Bar`: - -|--lib -| | -| |--Bar -| | |--docs -| | |--examples -| | |--src -| | |- Bar.c -| | |- Bar.h -| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html -| | -| |--Foo -| | |- Foo.c -| | |- Foo.h -| | -| |- README --> THIS FILE -| -|- platformio.ini -|--src - |- main.c - -and a contents of `src/main.c`: -``` -#include -#include - -int main (void) -{ - ... -} - -``` - -PlatformIO Library Dependency Finder will find automatically dependent -libraries scanning project source files. - -More information about PlatformIO Library Dependency Finder -- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/SW/ESPlan_SD_webpage/platformio.ini b/SW/ESPlan_SD_webpage/platformio.ini deleted file mode 100644 index 457ca3e..0000000 --- a/SW/ESPlan_SD_webpage/platformio.ini +++ /dev/null @@ -1,15 +0,0 @@ -; PlatformIO Project Configuration File -; -; Build options: build flags, source filter -; Upload options: custom upload port, speed and extra flags -; Library options: dependencies, extra library storages -; Advanced options: extra scripting -; -; Please visit documentation for the other options and examples -; https://docs.platformio.org/page/projectconf.html - -[env:esp32dev] -platform = espressif32 -board = esp32dev -framework = arduino -monitor_speed = 115200 diff --git a/SW/ESPlan_SD_webpage/test/README b/SW/ESPlan_SD_webpage/test/README deleted file mode 100644 index 9b1e87b..0000000 --- a/SW/ESPlan_SD_webpage/test/README +++ /dev/null @@ -1,11 +0,0 @@ - -This directory is intended for PlatformIO Test Runner and project tests. - -Unit Testing is a software testing method by which individual units of -source code, sets of one or more MCU program modules together with associated -control data, usage procedures, and operating procedures, are tested to -determine whether they are fit for use. Unit testing finds problems early -in the development cycle. - -More information about PlatformIO Unit Testing: -- https://docs.platformio.org/en/latest/advanced/unit-testing/index.html