9a896a7ab1
* Asyncwebserver * Squashed commit of the following: commit 575ef02f593918ec6654c87407a4d11fc17071b8 Author: technyon <j.o.schuemann@gmx.de> Date: Mon Aug 12 17:56:11 2024 +0200 merge master commit 35e5adf4ecd80f9829e8801181f35dd2c1d94759 Merge: a2cc7be221adca01Author: technyon <j.o.schuemann@gmx.de> Date: Mon Aug 12 17:41:04 2024 +0200 Merge branch 'master' of github.com:technyon/nuki_hub into DM9051 commit a2cc7be2954cbd8767ab8186296c0b14134d1d0b Author: technyon <j.o.schuemann@gmx.de> Date: Mon Aug 12 10:51:50 2024 +0200 update nuki ble commit 20c809f3dca28b29b219d1ff3a183f1981316de5 Author: technyon <j.o.schuemann@gmx.de> Date: Mon Aug 12 10:44:46 2024 +0200 backup commit dd41c218efb5270f5efeb734e64dff695920db16 Merge: 153000b5e84b944aAuthor: technyon <j.o.schuemann@gmx.de> Date: Mon Aug 12 10:40:03 2024 +0200 Merge branch 'master' of github.com:technyon/nuki_hub into DM9051 commit 153000b5b1af7df1fbeb5263df94eb26f689cc0a Author: technyon <j.o.schuemann@gmx.de> Date: Mon Aug 12 10:23:07 2024 +0200 fix linker error commit a93bbfbfc4301e46ff3696a763dd13c6c89efefb Author: technyon <j.o.schuemann@gmx.de> Date: Sun Aug 11 11:27:07 2024 +0200 backup commit f611c75ce8c35f829bcad6cf7e86188f4b3ec331 Merge: f1964917063fbab6Author: technyon <j.o.schuemann@gmx.de> Date: Sun Aug 11 11:24:47 2024 +0200 merge master commit f1964917b4dade3920f1ecdb699c58630199e6da Author: technyon <j.o.schuemann@gmx.de> Date: Sat Aug 10 15:17:45 2024 +0200 update platformio.ini commit f448e5e8a7e93be38e09e2ab0b622199a3721af6 Author: technyon <j.o.schuemann@gmx.de> Date: Sat Aug 10 11:28:09 2024 +0200 add SPIClass instance for DM9051 commit 1f190e9aa08033535a2eb442a92e6e20409bbda1 Author: technyon <j.o.schuemann@gmx.de> Date: Sat Aug 10 11:22:26 2024 +0200 add definitions and constructor for DM9051 commit 726b3602ae91594ee1210ad5b6714f75cc5e42a7 Merge: 50a2eb134af90cbcAuthor: technyon <j.o.schuemann@gmx.de> Date: Sat Aug 10 10:19:34 2024 +0200 merge master commit 50a2eb136d75d90921f1c6974f18bc107bddc123 Author: technyon <j.o.schuemann@gmx.de> Date: Fri Aug 9 11:52:09 2024 +0200 add comment commit 9437e485cae169efdf8e5a7bf188a1c7e792d1e5 Author: technyon <j.o.schuemann@gmx.de> Date: Sun Aug 4 08:29:21 2024 +0200 move LAN8720 definitions to seperate file * Remove Core 2 Ethernet library * Custom Ethernet * GPIO and Preferences * H2
57 lines
1.5 KiB
C++
57 lines
1.5 KiB
C++
#include "IPConfiguration.h"
|
|
#include "../PreferencesKeys.h"
|
|
#include "../Logger.h"
|
|
|
|
IPConfiguration::IPConfiguration(Preferences *preferences)
|
|
: _preferences(preferences)
|
|
{
|
|
if(!dhcpEnabled() && _preferences->getString(preference_ip_address, "").length() <= 0)
|
|
{
|
|
Log->println("IP address empty, falling back to DHCP.");
|
|
_preferences->putBool(preference_ip_dhcp_enabled, true);
|
|
}
|
|
|
|
_ipAddress.fromString(_preferences->getString(preference_ip_address, ""));
|
|
_subnet.fromString(_preferences->getString(preference_ip_subnet, ""));
|
|
_gateway.fromString(_preferences->getString(preference_ip_gateway, ""));
|
|
_dnsServer.fromString(_preferences->getString(preference_ip_dns_server, ""));
|
|
|
|
Log->print(F("IP configuration: "));
|
|
if(dhcpEnabled())
|
|
{
|
|
Log->println(F("DHCP"));
|
|
}
|
|
else
|
|
{
|
|
Log->print(F("IP address: ")); Log->print(ipAddress());
|
|
Log->print(F(", Subnet: ")); Log->print(subnet());
|
|
Log->print(F(", Gateway: ")); Log->print(defaultGateway());
|
|
Log->print(F(", DNS: ")); Log->println(dnsServer());
|
|
}
|
|
}
|
|
|
|
bool IPConfiguration::dhcpEnabled() const
|
|
{
|
|
return _preferences->getBool(preference_ip_dhcp_enabled, true);
|
|
}
|
|
|
|
const IPAddress IPConfiguration::ipAddress() const
|
|
{
|
|
return _ipAddress;
|
|
}
|
|
|
|
const IPAddress IPConfiguration::subnet() const
|
|
{
|
|
return _subnet;
|
|
}
|
|
|
|
const IPAddress IPConfiguration::defaultGateway() const
|
|
{
|
|
return _gateway;
|
|
}
|
|
|
|
const IPAddress IPConfiguration::dnsServer() const
|
|
{
|
|
return _dnsServer;
|
|
}
|