andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

rename Wired->Ethernet

Browse Source
This commit is contained in:
MichaelDvP
2022-01-24 12:51:13 +01:00
parent 8f5e26acd1
commit d27243eb34
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
interface/src/framework/network/NetworkStatusForm.tsx
View File

@@ -46,7 +46,7 @@ const networkStatus = ({ status }: NetworkStatus) => {
case NetworkConnectionStatus.WIFI_STATUS_CONNECTED: case NetworkConnectionStatus.WIFI_STATUS_CONNECTED:
return 'Connected (WiFi)'; return 'Connected (WiFi)';
case NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED: case NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED:
return 'Connected (Wired)'; return 'Connected (Ethernet)';
case NetworkConnectionStatus.WIFI_STATUS_CONNECT_FAILED: case NetworkConnectionStatus.WIFI_STATUS_CONNECT_FAILED:
return 'Connection Failed'; return 'Connection Failed';
case NetworkConnectionStatus.WIFI_STATUS_CONNECTION_LOST: case NetworkConnectionStatus.WIFI_STATUS_CONNECTION_LOST:
@@ -65,7 +65,7 @@ const dnsServers = ({ dns_ip_1, dns_ip_2 }: NetworkStatus) => {
if (!dns_ip_1) { if (!dns_ip_1) {
return 'none'; return 'none';
} }
return dns_ip_1 + (dns_ip_2 ? ',' + dns_ip_2 : ''); return dns_ip_1 + (dns_ip_2 === '0.0.0.0' ? '' : ',' + dns_ip_2);
}; };
const IPs = (status: NetworkStatus) => { const IPs = (status: NetworkStatus) => {

2
mock-api/server.js
View File

@@ -1103,7 +1103,7 @@ const emsesp_info = {
'Dallas sensors': 3, 'Dallas sensors': 3,
}, },
Network: { Network: {
connection: 'Wired', connection: 'Ethernet',
hostname: 'ems-esp', hostname: 'ems-esp',
MAC: 'A8:03:2A:62:64:CF', MAC: 'A8:03:2A:62:64:CF',
'IPv4 address': '192.168.1.134/255.255.255.0', 'IPv4 address': '192.168.1.134/255.255.255.0',