Bugfixes

fredlcore · Feb 29, 2024 · 68ec9f5 · 68ec9f5
1 parent cbbcaed
commit 68ec9f5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/BSB_LAN/BSB_LAN.ino b/BSB_LAN/BSB_LAN.ino
@@ -7778,7 +7778,7 @@ void startLoggingDevice() {
   // disable w5100 while setting up SD
   pinMode(10,OUTPUT);
   digitalWrite(10,HIGH);
-  if (!SD.begin(4, SPI_DIV3_SPEED)) {
+  if (!SDCard.begin(4, SPI_DIV3_SPEED)) {
     printToDebug(PSTR("SD card failed.\r\n")); // change SPI_DIV3_SPEED to SPI_HALF_SPEED if you are still having problems getting your SD card detected
   } else {
     printToDebug(PSTR("SD card mounted ok.\r\n"));
@@ -7820,6 +7820,8 @@ void createTemporaryAP () {
 #endif
 }
 
+/*
+#if defined(ESP32)
 void networkEvent(WiFiEvent_t event) {
   SerialOutput->print(PSTR("Event "));
   SerialOutput->print(event);
@@ -7850,6 +7852,8 @@ void networkEvent(WiFiEvent_t event) {
   }
   SerialOutput->println();
 }
+#endif
+*/
 
 /** *****************************************************************
  *  Function: setup()
@@ -8233,7 +8237,9 @@ void setup() {
     case WLAN: printlnToDebug(PSTR("WiFi/WLAN")); break;
   }
   printToDebug(PSTR("...\r\n"));
+#if defined(ESP32)
 //  WiFi.onEvent(networkEvent);
+#endif
 
 #ifdef WIFISPI
   WiFi.init(WIFI_SPI_SS_PIN);     // SS signal is on Due pin 12
@@ -8274,7 +8280,11 @@ void setup() {
       dnsserver = IPAddress(ip_addr[0], ip_addr[1], ip_addr[2], 1);
     }
     if (network_type == LAN) {
+#if defined(ESP32)
       if (!Ethernet.begin(mac, ip, dnsserver, gateway, subnet)) createTemporaryAP(); //Static IP
+#else
+      Ethernet.begin(mac, ip, dnsserver, gateway, subnet); //Static IP
+#endif
     } else {
 #if defined(ESP32)
       WiFi.config(ip, gateway, subnet, dnsserver);
@@ -8284,7 +8294,11 @@ void setup() {
     }
   } else {
     if (network_type == LAN) {
+#if defined(ESP32)
       if (!Ethernet.begin(mac)) createTemporaryAP();    // DHCP
+#else
+      Ethernet.begin(mac);    // DHCP
+#endif
       printToDebug(PSTR("Waiting for DHCP address"));
       unsigned long timeout = millis();
       while (!Ethernet.localIP() && millis() - timeout < 20000) {

diff --git a/BSB_LAN/include/mqtt_handler.h b/BSB_LAN/include/mqtt_handler.h
@@ -211,9 +211,10 @@ boolean mqtt_connect() {
     if(MQTTPassword[0]) {
       MQTTPass = MQTTPassword;
     }
-    uint8_t MQTT_IP[4];
-    int result = sscanf(mqtt_host, "%d.%d.%d.%d", &MQTT_IP[0], &MQTT_IP[1], &MQTT_IP[2], &MQTT_IP[3]);
+    int addr[4];
+    int result = sscanf(mqtt_host, "%d.%d.%d.%d", &addr[0], &addr[1], &addr[2], &addr[3]);
     if (result == 4) {
+      IPAddress MQTT_IP(addr[0],addr[1],addr[2],addr[3]);
       MQTTPubSubClient->setServer(MQTT_IP, mqtt_port);
     } else {
       MQTTPubSubClient->setServer(mqtt_host, mqtt_port);