mirror of
https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git
synced 2025-10-16 12:11:27 +08:00

* Remove all output flags * Masse replace name function / class to sync with ESP3D-TFT * Create ESP3DMessageManager class to handle messages creation / deletion (import functions of ESp3DClient from ESp3D-TFT) * Move to new messaging API of ESP3D-TFT * Remove empty line from remote screen dispatching * Replace \n to space and \r to nothing in remote screen dispatching * Add missing default entry for sensor device * Fix buzzer for ESP32 missing ledc initialization with latest core * Move formatBytes to esp3d_string * Add welcome message to telnet connection\ * Add display to the new messaging API * Add sticky authentication on Serial / SerialBridge /Telnet/Data web socket and BT * Log simplification * Use enum class instead of typdef enum for ESP3DAuthenticationLevel to be sure correct enum is used * (v3) Home Assistant notification support (#971) * Add notification via post request * Extend t1 size to 255 bytes * Hide Home Assistant notifications from web UI (#974) * Sync with ESP3DLib on serial_socket * Add some sanity check to avoid unnecessary message copies * Update ESP0.cpp --------- Co-authored-by: David Buezas <dbuezas@users.noreply.github.com>
173 lines
5.3 KiB
C++
173 lines
5.3 KiB
C++
/*
|
|
ethconfig.cpp - ethernet functions class
|
|
|
|
Copyright (c) 2018 Luc Lebosse. All rights reserved.
|
|
|
|
This code is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
This code is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with This code; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "../../include/esp3d_config.h"
|
|
#if defined(ETH_FEATURE)
|
|
#ifdef ARDUINO_ARCH_ESP32
|
|
#include "dhcpserver/dhcpserver_options.h"
|
|
#include "esp_eth.h"
|
|
|
|
#endif // ARDUINO_ARCH_ESP32
|
|
#ifdef ARDUINO_ARCH_ESP8266
|
|
#endif // ARDUINO_ARCH_ESP8266
|
|
#include "../../core/esp3d_commands.h"
|
|
#include "../../core/esp3d_settings.h"
|
|
#include "../network/netconfig.h"
|
|
#include "ethconfig.h"
|
|
bool EthConfig::_started = false;
|
|
bool EthConfig::_connected = false;
|
|
const uint8_t DEFAULT_AP_MASK_VALUE[] = {255, 255, 255, 0};
|
|
|
|
bool EthConfig::StartSTA() {
|
|
bool res = true;
|
|
if ((ESP3DSettings::readByte(ESP_STA_IP_MODE) != DHCP_MODE)) {
|
|
int32_t IP = ESP3DSettings::read_IP(ESP_STA_IP_VALUE);
|
|
int32_t GW = ESP3DSettings::read_IP(ESP_STA_GATEWAY_VALUE);
|
|
int32_t MK = ESP3DSettings::read_IP(ESP_STA_MASK_VALUE);
|
|
int32_t DNS = ESP3DSettings::read_IP(ESP_STA_DNS_VALUE);
|
|
IPAddress ip(IP), mask(MK), gateway(GW), dns(DNS);
|
|
res = ETH.config(ip, gateway, mask, dns);
|
|
}
|
|
return res;
|
|
}
|
|
/*bool EthConfig::StartSRV()
|
|
{
|
|
bool res = true;
|
|
//static IP
|
|
int32_t IP = ESP3DSettings::read_IP(ESP_AP_IP_VALUE);
|
|
IPAddress ip(IP), mask(DEFAULT_AP_MASK_VALUE), gateway(IP);
|
|
if (!ETH.config(ip, gateway,mask)) {
|
|
res = false;
|
|
esp3d_log_e("Set static IP error");
|
|
}
|
|
//start DHCP server
|
|
if(res) {
|
|
dhcps_lease_t lease;
|
|
lease.enable = true;
|
|
lease.start_ip.addr = static_cast<uint32_t>(IP) + (1 << 24);
|
|
lease.end_ip.addr = static_cast<uint32_t>(IP) + (11 << 24);
|
|
tcpip_adapter_dhcps_stop(TCPIP_ADAPTER_IF_ETH);
|
|
tcpip_adapter_dhcps_option(
|
|
(tcpip_adapter_option_mode_t)TCPIP_ADAPTER_OP_SET,
|
|
(tcpip_adapter_option_id_t)REQUESTED_IP_ADDRESS,
|
|
(void*)&lease, sizeof(dhcps_lease_t)
|
|
);
|
|
|
|
if (tcpip_adapter_dhcps_start(TCPIP_ADAPTER_IF_ETH) != ESP_OK){
|
|
res = false;
|
|
esp3d_log_e("Start DHCP server failed");
|
|
}
|
|
}
|
|
return res;
|
|
}*/
|
|
|
|
bool EthConfig::linkUp() {
|
|
#if defined(ESP_IDF_VERSION_MAJOR)
|
|
// patch for https://github.com/espressif/arduino-esp32/issues/6105
|
|
return _connected;
|
|
#else
|
|
return ETH.linkUp();
|
|
#endif
|
|
}
|
|
|
|
/**
|
|
* begin WiFi setup
|
|
*/
|
|
bool EthConfig::begin(int8_t& espMode) {
|
|
bool res = false;
|
|
|
|
end();
|
|
_started = ETH.begin();
|
|
if (_started) {
|
|
if (ESP3DSettings::isVerboseBoot()) {
|
|
esp3d_commands.dispatch("Starting ethernet", ESP3DClientType::all_clients,
|
|
no_id, ESP3DMessageType::unique,
|
|
ESP3DClientType::system,
|
|
ESP3DAuthenticationLevel::admin);
|
|
}
|
|
res = true;
|
|
} else {
|
|
esp3d_commands.dispatch("Failed starting ethernet write failed",
|
|
ESP3DClientType::all_clients, no_id,
|
|
ESP3DMessageType::unique, ESP3DClientType::system,
|
|
ESP3DAuthenticationLevel::admin);
|
|
}
|
|
ETH.setHostname(NetConfig::hostname(true));
|
|
|
|
// DHCP is only for Client
|
|
if (espMode == ESP_ETH_STA) {
|
|
if (!StartSTA()) {
|
|
if (ESP3DSettings::isVerboseBoot()) {
|
|
esp3d_commands.dispatch(
|
|
"Starting fallback mode", ESP3DClientType::all_clients, no_id,
|
|
ESP3DMessageType::unique, ESP3DClientType::system,
|
|
ESP3DAuthenticationLevel::admin);
|
|
}
|
|
espMode = ESP3DSettings::readByte(ESP_STA_FALLBACK_MODE);
|
|
res = true;
|
|
} else {
|
|
if (ESP3DSettings::isVerboseBoot()) {
|
|
esp3d_commands.dispatch("Client started", ESP3DClientType::all_clients,
|
|
no_id, ESP3DMessageType::unique,
|
|
ESP3DClientType::system,
|
|
ESP3DAuthenticationLevel::admin);
|
|
}
|
|
}
|
|
|
|
} else {
|
|
// if(!StartSRV()){
|
|
// res = false;
|
|
//
|
|
// } else {
|
|
//
|
|
// }
|
|
}
|
|
|
|
// if ((ESP3DSettings::readByte(ESP_STA_IP_MODE) != DHCP_MODE) || (espMode
|
|
// == ESP_ETH_SRV)){
|
|
if ((ESP3DSettings::readByte(ESP_STA_IP_MODE) != DHCP_MODE)) {
|
|
// as no event to display static IP
|
|
esp3d_commands.dispatch(ETH.localIP().toString().c_str(),
|
|
ESP3DClientType::all_clients, no_id,
|
|
ESP3DMessageType::unique, ESP3DClientType::system,
|
|
ESP3DAuthenticationLevel::admin);
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
/**
|
|
* End WiFi
|
|
*/
|
|
|
|
void EthConfig::end() {
|
|
// esp_eth_disable();
|
|
_started = false;
|
|
}
|
|
|
|
bool EthConfig::started() { return _started; }
|
|
/**
|
|
* Handle not critical actions that must be done in sync environement
|
|
*/
|
|
|
|
void EthConfig::handle() {}
|
|
|
|
#endif // ETH_FEATURE
|