GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-16 05:05:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ajust code for ethernet

Browse Source 
Bump version
This commit is contained in:
Luc 2024-12-09 17:46:55 +08:00
parent fe23f0cb1e
commit 539d9fefa8
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
esp3d/src/modules/ethernet/ethconfig.cpp
View File

@ -114,11 +114,10 @@ bool EthConfig::begin(int8_t& espMode) {
ETH_SPI.begin(ETH_SPI_SCK, ETH_SPI_MISO, ETH_SPI_MOSI); ETH_SPI.begin(ETH_SPI_SCK, ETH_SPI_MISO, ETH_SPI_MOSI);
_started = ETH.begin(ETH_PHY_W5500, ESP3D_ETH_PHY_ADDR, ETH_PHY_CS, _started = ETH.begin(ETH_PHY_W5500, ESP3D_ETH_PHY_ADDR, ETH_PHY_CS,
ETH_PHY_IRQ, ETH_PHY_RST, ETH_SPI); ETH_PHY_IRQ, ETH_PHY_RST, ETH_SPI);
#endif // ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_W5500 #endif // ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_W5500
if (_started) { if (_started) {
esp3d_log("Starting ethernet success");
if (ESP3DSettings::isVerboseBoot()) { if (ESP3DSettings::isVerboseBoot()) {
esp3d_commands.dispatch("Starting ethernet", ESP3DClientType::all_clients, esp3d_commands.dispatch("Starting ethernet", ESP3DClientType::all_clients,
no_id, ESP3DMessageType::unique, no_id, ESP3DMessageType::unique,
@ -131,31 +130,37 @@ bool EthConfig::begin(int8_t& espMode) {
ESP3DClientType::all_clients, no_id, ESP3DClientType::all_clients, no_id,
ESP3DMessageType::unique, ESP3DClientType::system, ESP3DMessageType::unique, ESP3DClientType::system,
ESP3DAuthenticationLevel::admin); ESP3DAuthenticationLevel::admin);
esp3d_log("Failed starting ethernet failed");
return false;
} }
ETH.setHostname(NetConfig::hostname(true)); ETH.setHostname(NetConfig::hostname(true));
// DHCP is only for Client // DHCP is only for Client
if (espMode == ESP_ETH_STA) { if (espMode == ESP_ETH_STA) {
if (!StartSTA()) { if (!StartSTA()) {
if (ESP3DSettings::isVerboseBoot()) { if (ESP3DSettings::isVerboseBoot()) {
esp3d_log("Starting fallback mode");
esp3d_commands.dispatch( esp3d_commands.dispatch(
"Starting fallback mode", ESP3DClientType::all_clients, no_id, "Starting fallback mode", ESP3DClientType::all_clients, no_id,
ESP3DMessageType::unique, ESP3DClientType::system, ESP3DMessageType::unique, ESP3DClientType::system,
ESP3DAuthenticationLevel::admin); ESP3DAuthenticationLevel::admin);
} }
espMode = ESP3DSettings::readByte(ESP_ETH_STA_FALLBACK_MODE); espMode = ESP3DSettings::readByte(ESP_ETH_STA_FALLBACK_MODE);
res = true; res = false;
return res;
} else { } else {
esp3d_log("Client started");
if (ESP3DSettings::isVerboseBoot()) { if (ESP3DSettings::isVerboseBoot()) {
esp3d_commands.dispatch("Client started", ESP3DClientType::all_clients, esp3d_commands.dispatch("Client started", ESP3DClientType::all_clients,
no_id, ESP3DMessageType::unique, no_id, ESP3DMessageType::unique,
ESP3DClientType::system, ESP3DClientType::system,
ESP3DAuthenticationLevel::admin); ESP3DAuthenticationLevel::admin);
} }
res = true;
} }
} }
// Static IP or DHCP client ? // Static IP or DHCP client ?
if ((ESP3DSettings::readByte(ESP_ETH_STA_IP_MODE) != DHCP_MODE)) { if ((ESP3DSettings::readByte(ESP_ETH_STA_IP_MODE) != DHCP_MODE)) {
esp3d_log("Show IP");
esp3d_commands.dispatch(ETH.localIP().toString().c_str(), esp3d_commands.dispatch(ETH.localIP().toString().c_str(),
ESP3DClientType::all_clients, no_id, ESP3DClientType::all_clients, no_id,
ESP3DMessageType::unique, ESP3DClientType::system, ESP3DMessageType::unique, ESP3DClientType::system,

2
info.json
View File

@ -1,3 +1,3 @@
{ {
"version": "3.0.0.a244" "version": "3.0.0.a246"
} }