Merge pull request #1769 from GerardoNevarez/fixes_pr_1763_issues

Fixes ESP issues after SERIAL_PRINTING merge
revoxhere · Mar 27, 2024 · cf8a6e7 · cf8a6e7
2 parents 018a17d + c2cbd1a
commit cf8a6e7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/ESP_Code/ESP_Code.ino b/ESP_Code/ESP_Code.ino
@@ -212,6 +212,7 @@ namespace {
           Serial.println("Local IP address: " + ETH.localIP().toString());
           Serial.println("Rig name: " + String(RIG_IDENTIFIER));
           Serial.println();
+        #endif
 
       #else
         #if defined(SERIAL_PRINTING)
@@ -271,14 +272,15 @@ namespace {
                               });
         ArduinoOTA.onError([](ota_error_t error)
                            {
-        Serial.printf("Error[%u]: ", error);
-        #if defined(SERIAL_PRINTING)
-          if (error == OTA_AUTH_ERROR) Serial.println("Auth Failed");
-          else if (error == OTA_BEGIN_ERROR) Serial.println("Begin Failed");
-          else if (error == OTA_CONNECT_ERROR) Serial.println("Connect Failed");
-          else if (error == OTA_RECEIVE_ERROR) Serial.println("Receive Failed");
-          else if (error == OTA_END_ERROR) Serial.println("End Failed"); });
-       #endif
+                                Serial.printf("Error[%u]: ", error);
+                                #if defined(SERIAL_PRINTING)
+                                  if (error == OTA_AUTH_ERROR) Serial.println("Auth Failed");
+                                  else if (error == OTA_BEGIN_ERROR) Serial.println("Begin Failed");
+                                  else if (error == OTA_CONNECT_ERROR) Serial.println("Connect Failed");
+                                  else if (error == OTA_RECEIVE_ERROR) Serial.println("Receive Failed");
+                                  else if (error == OTA_END_ERROR) Serial.println("End Failed");
+                                #endif
+                          });
 
         ArduinoOTA.setHostname(RIG_IDENTIFIER); // Give port a name
         ArduinoOTA.begin();

diff --git a/ESP_Code/MiningJob.h b/ESP_Code/MiningJob.h
@@ -241,7 +241,7 @@ class MiningJob {
                           " (" + String(counter) + ")" +
                           " hashrate: " + String(hashrate / 1000, 2) + " kH/s (" +
                           String(elapsed_time_s) + "s)\n");
-        #endf
+        #endif
     }
 
     bool parse() {