Skip to content

Ethernet, initCallback, ctor and eth_if #901

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
Jun 20, 2024
Merged

Ethernet, initCallback, ctor and eth_if #901

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
39853dd
Ethernet: Remove initCallback
manchoz Jun 17, 2024
3e6aa5e
Ethernet: align ctor to WiFi
pennam Jun 18, 2024
3749dc1
Ethernet: add eth_if nullptr checks
maidnl Jun 17, 2024
25a3e8a
Remove unused function pointer definitions
pennam Jun 18, 2024
70bf03b
Ethernet: fix comment placing belonging to begin function
pennam Jun 19, 2024
50def68
Ethernet: remove SSID_MAX_LENGTH define
pennam Jun 19, 2024
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
Prev Previous commit
Next Next commit
Ethernet: align ctor to WiFi
  • Loading branch information
@pennam
pennam committed Jun 18, 2024
commit 3e6aa5e378226fd079ec08dd17aa503ff89ea85e
5 changes: 4 additions & 1 deletion libraries/Ethernet/src/Ethernet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
#define SSID_MAX_LENGTH 32

int arduino::EthernetClass::begin(uint8_t *mac, unsigned long timeout, unsigned long responseTimeout) {
if (eth_if == nullptr) {
return 0;
}
eth_if->set_dhcp(true);
return _begin(mac, timeout, responseTimeout);
}
Expand Down Expand Up @@ -94,4 +97,4 @@ void arduino::EthernetClass::MACAddress(uint8_t *mac_address)
macAddress(mac_address);
}

arduino::EthernetClass Ethernet;
arduino::EthernetClass Ethernet(static_cast<EthernetInterface*>(EthInterface::get_default_instance()));
4 changes: 1 addition & 3 deletions libraries/Ethernet/src/Ethernet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ class EthernetClass : public MbedSocketClass {
// Returns 0 if the DHCP configuration failed, and 1 if it succeeded
EthernetClass(EthernetInterface *_if)
: eth_if(_if){};
EthernetClass(){};

int begin(uint8_t *mac = nullptr, unsigned long timeout = 60000, unsigned long responseTimeout = 4000);
EthernetLinkStatus linkStatus();
Expand Down Expand Up @@ -116,8 +115,7 @@ class EthernetClass : public MbedSocketClass {
int _begin(uint8_t *mac, unsigned long timeout, unsigned long responseTimeout);

volatile EthernetLinkStatus _currentNetworkStatus = Unknown;
EthernetInterface net;
EthernetInterface *eth_if = &net;
EthernetInterface *eth_if = nullptr;
arduino::IPAddress ipAddressFromSocketAddress(SocketAddress socketAddress);
};

Expand Down