Skip to content

Commit 7ca8bdb

Browse files
committed
Don't show IP obtained until IP is obtained
1 parent ec23074 commit 7ca8bdb

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

Firmware/RTK_Everywhere/Display.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2977,9 +2977,9 @@ void paintGettingKeys()
29772977
displayMessage("Getting Keys", 2000);
29782978
}
29792979

2980-
void paintGettingEthernetIP()
2980+
void paintEthernetIPObtained()
29812981
{
2982-
displayMessage("Getting IP", 1000);
2982+
displayMessage("IP Obtained", 1000);
29832983
}
29842984

29852985
// If an L-Band is indoors without reception, we have a ~2s wait for the RTC to come online

Firmware/RTK_Everywhere/Ethernet.ino

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,20 +161,23 @@ void ethernetEvent(arduino_event_id_t event, arduino_event_info_t info)
161161
case ARDUINO_EVENT_ETH_START:
162162
if (settings.enablePrintEthernetDiag && (!inMainMenu))
163163
systemPrintln("ETH Started");
164-
ETH.setHostname(settings.mdnsHostName);
165-
if (settings.ethernetDHCP)
166-
paintGettingEthernetIP();
167164
break;
168165

169166
case ARDUINO_EVENT_ETH_CONNECTED:
170167
if (settings.enablePrintEthernetDiag && (!inMainMenu))
171168
systemPrintln("ETH Connected");
169+
170+
ETH.setHostname(settings.mdnsHostName);
172171
break;
173172

174173
case ARDUINO_EVENT_ETH_GOT_IP:
175174
if (settings.enablePrintEthernetDiag && (!inMainMenu))
176175
systemPrintf("ETH Got IP: '%s'\r\n", ETH.localIP().toString().c_str());
176+
177177
networkMarkOnline((NetIndex_t)NETWORK_ETHERNET);
178+
179+
if (settings.ethernetDHCP)
180+
paintEthernetIPObtained();
178181
break;
179182

180183
case ARDUINO_EVENT_ETH_LOST_IP:

0 commit comments

Comments
 (0)