#134

eez-open · Dec 14, 2020 · 0e37167 · 0e37167
1 parent c08f7ca
commit 0e37167
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/eez/modules/mcu/ethernet.cpp b/src/eez/modules/mcu/ethernet.cpp
@@ -30,8 +30,10 @@
 #include <ip_addr.h>
 #include <netif.h>
 #include <ethernetif.h>
+#include <dns.h>
 extern struct netif gnetif;
 extern ip4_addr_t ipaddr;
+ip4_addr_t dns;
 extern ip4_addr_t netmask;
 extern ip4_addr_t gw;
 #endif
@@ -181,6 +183,8 @@ static void dhcpStart() {
             }
             osDelay(10);
         }
+    } else {
+        dns_setserver(0, &dns);
     }
 
     g_connectionState = CONNECTION_STATE_CONNECTED;
@@ -201,10 +205,12 @@ static void onEvent(uint8_t eventType) {
 
             if (psu::persist_conf::isEthernetDhcpEnabled()) {            
                 ipaddr.addr = 0;
+                dns.addr = 0;
                 netmask.addr = 0;
                 gw.addr = 0;
             } else {
             	ipaddr.addr = psu::persist_conf::devConf.ethernetIpAddress;
+                dns.addr = psu::persist_conf::devConf.ethernetDns;
             	netmask.addr = psu::persist_conf::devConf.ethernetSubnetMask;
             	gw.addr = psu::persist_conf::devConf.ethernetGateway;
             }

diff --git a/src/third_party/stm32_cubeide/.settings/stm32cubeide.project.prefs b/src/third_party/stm32_cubeide/.settings/stm32cubeide.project.prefs
@@ -1,4 +1,4 @@
-2F62501ED4689FB349E356AB974DBE57=6324EFC706C094AE3B0AEB00227A953C
-8DF89ED150041C4CBC7CB9A9CAA90856=6324EFC706C094AE3B0AEB00227A953C
+2F62501ED4689FB349E356AB974DBE57=618266508428BDF06C84712473DD5FAA
+8DF89ED150041C4CBC7CB9A9CAA90856=618266508428BDF06C84712473DD5FAA
 DC22A860405A8BF2F2C095E5B6529F12=42CF0666AD1D078F9BC5A8F2E0EF7764
 eclipse.preferences.version=1