Merge upstream changes from Marlin 2.1.2.2

Marlin/src/HAL/ESP32/ota.cpp

@@ -1,7 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +24,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(WIFISUPPORT, OTASUPPORT)
+#if ALL(WIFISUPPORT, OTASUPPORT)
 
 #include <WiFi.h>
 #include <ESPmDNS.h>
@@ -50,7 +52,7 @@ void OTA_init() {
     })
     .onError([](ota_error_t error) {
       Serial.printf("Error[%u]: ", error);
-      char *str;
+      const char *str = "unknown";
       switch (error) {
         case OTA_AUTH_ERROR:    str = "Auth Failed";    break;
         case OTA_BEGIN_ERROR:   str = "Begin Failed";   break;