From 137c50757eacf4423d35ea9cde65dcae8db93337 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Sat, 2 Jan 2016 12:58:56 +0100
Subject: [PATCH] add OTA debug level

---
 boards.txt                          |  8 ++++++--
 libraries/ArduinoOTA/ArduinoOTA.cpp | 31 +++++++++++++++++------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/boards.txt b/boards.txt
index 389aee3b2..9e80cefa9 100644
--- a/boards.txt
+++ b/boards.txt
@@ -197,10 +197,14 @@ generic.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
 generic.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
 generic.menu.DebugLevel.HTTPServer=HTTPServer
 generic.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
-generic.menu.DebugLevel.UPDATER=Updater (OTA)
+generic.menu.DebugLevel.UPDATER=Updater
 generic.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
+generic.menu.DebugLevel.OTA=OTA
+generic.menu.DebugLevel.OTA.build.debug_level=-DDEBUG_ESP_OTA
+generic.menu.DebugLevel.OTA2=OTA + Updater
+generic.menu.DebugLevel.OTA2.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
 generic.menu.DebugLevel.all=All
-generic.menu.DebugLevel.all.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER
+generic.menu.DebugLevel.all.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA
 
 # disabled because espressif's bootloader refuses to write above 4M
 # generic.menu.FlashSize.8M=8M (7M SPIFFS)
diff --git a/libraries/ArduinoOTA/ArduinoOTA.cpp b/libraries/ArduinoOTA/ArduinoOTA.cpp
index 52041b94d..386e230e8 100644
--- a/libraries/ArduinoOTA/ArduinoOTA.cpp
+++ b/libraries/ArduinoOTA/ArduinoOTA.cpp
@@ -18,7 +18,12 @@ extern "C" {
 #include "include/UdpContext.h"
 #include <ESP8266mDNS.h>
 
-//#define OTA_DEBUG 1
+
+#ifdef DEBUG_ESP_OTA
+#ifdef DEBUG_ESP_PORT
+#define OTA_DEBUG DEBUG_ESP_PORT
+#endif
+#endif
 
 ArduinoOTAClass::ArduinoOTAClass()
 : _port(0)
@@ -109,8 +114,8 @@ void ArduinoOTAClass::begin() {
   }
   _initialized = true;
   _state = OTA_IDLE;
-#if OTA_DEBUG
-  Serial.printf("OTA server at: %s.local:%u\n", _hostname.c_str(), _port);
+#ifdef OTA_DEBUG
+  OTA_DEBUG.printf("OTA server at: %s.local:%u\n", _hostname.c_str(), _port);
 #endif
 }
 
@@ -226,8 +231,8 @@ void ArduinoOTAClass::_onRx(){
 
 void ArduinoOTAClass::_runUpdate() {
   if (!Update.begin(_size, _cmd)) {
-#if OTA_DEBUG
-    Serial.println("Update Begin Error");
+#ifdef OTA_DEBUG
+    OTA_DEBUG.println("Update Begin Error");
 #endif
     if (_error_callback) {
       _error_callback(OTA_BEGIN_ERROR);
@@ -249,8 +254,8 @@ void ArduinoOTAClass::_runUpdate() {
 
   WiFiClient client;
   if (!client.connect(_ota_ip, _ota_port)) {
-#if OTA_DEBUG
-    Serial.printf("Connect Failed\n");
+#ifdef OTA_DEBUG
+    OTA_DEBUG.printf("Connect Failed\n");
 #endif
     _udp_ota->listen(*IP_ADDR_ANY, _port);
     if (_error_callback) {
@@ -265,8 +270,8 @@ void ArduinoOTAClass::_runUpdate() {
     while (!client.available() && waited--)
       delay(1);
     if (!waited){
-#if OTA_DEBUG
-      Serial.printf("Receive Failed\n");
+#ifdef OTA_DEBUG
+      OTA_DEBUG.printf("Receive Failed\n");
 #endif
       _udp_ota->listen(*IP_ADDR_ANY, _port);
       if (_error_callback) {
@@ -288,8 +293,8 @@ void ArduinoOTAClass::_runUpdate() {
     client.print("OK");
     client.stop();
     delay(10);
-#if OTA_DEBUG
-    Serial.printf("Update Success\nRebooting...\n");
+#ifdef OTA_DEBUG
+    OTA_DEBUG.printf("Update Success\nRebooting...\n");
 #endif
     if (_end_callback) {
       _end_callback();
@@ -301,8 +306,8 @@ void ArduinoOTAClass::_runUpdate() {
       _error_callback(OTA_END_ERROR);
     }
     Update.printError(client);
-#if OTA_DEBUG
-    Update.printError(Serial);
+#ifdef OTA_DEBUG
+    Update.printError(OTA_DEBUG);
 #endif
     _state = OTA_IDLE;
   }