From 40884341f73c3d597f0c6dd8e9beec9b78a09c9a Mon Sep 17 00:00:00 2001
From: John <ebusd@ebusd.eu>
Date: Sun, 11 Dec 2022 10:00:08 +0100
Subject: [PATCH] fix misleading default, fix previous commit

---
 src/tools/ebuspicloader.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/tools/ebuspicloader.cpp b/src/tools/ebuspicloader.cpp
index f0f9c4af..b789843e 100644
--- a/src/tools/ebuspicloader.cpp
+++ b/src/tools/ebuspicloader.cpp
@@ -1047,7 +1047,7 @@ int readSettings(int fd, uint8_t* currentData = nullptr) {
   }
   std::cout << std::endl;
   if (maskLen == 0x1f || (ip[0]|ip[1]|ip[2]|ip[3]) == 0) {
-    std::cout << "IP address: DHCP" << std::endl;
+    std::cout << "IP address: DHCP (default)" << std::endl;
   } else {
     std::cout << "IP address:";
     for (uint8_t pos = 0, maskRemain = maskLen; pos < 4; pos++, maskRemain -= maskRemain >= 8 ? 8 : maskRemain) {
@@ -1079,9 +1079,6 @@ int readSettings(int fd, uint8_t* currentData = nullptr) {
     for (int i=0; i < 4; i++) {
       std::cout << (i == 0?' ':'.') << std::dec << static_cast<unsigned>(ip[i]);
     }
-    if (gw == 0x3f) {
-      std::cout << " (default)";
-    }
     std::cout << std::endl;
   }
   uint16_t arbitrationDelay = configData[3]&0x3f;
@@ -1139,7 +1136,9 @@ bool writeSettings(int fd, uint8_t* currentData = nullptr) {
   if (setMacFromIp) {
     configData[1] = (configData[1]&~0x20) | (setMacFromIpValue ? 0 : 0x20);  // set useMUI
   }
-  if (setIp) {
+  if (setDhcp) {
+    configData[1] |= 0x1f;
+  } else if (setIp) {
     if (setMask) {
       configData[1] = (configData[1]&~0x1f) | (setMaskLen&0x1f);
     }