From 6732487469be3ae91d2f13a0543e1034c431be94 Mon Sep 17 00:00:00 2001
From: Max Prokhorov <prokhorov.max@outlook.com>
Date: Thu, 4 Apr 2019 21:51:06 +0300
Subject: [PATCH 1/3] MAX6675: default pins and SENSOR_SUPPORT dependency
 (#1646, #1666)

---
 code/espurna/config/sensors.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/code/espurna/config/sensors.h b/code/espurna/config/sensors.h
index e0ac7e76..af481da2 100644
--- a/code/espurna/config/sensors.h
+++ b/code/espurna/config/sensors.h
@@ -856,6 +856,22 @@
 #define VL53L1X_INTER_MEASUREMENT_PERIOD             50            // Period, in milliseconds, determining how
 #endif                                                             // often the sensor takes a measurement.
 
+//------------------------------------------------------------------------------
+// MAX6675
+// Enable support by passing MAX6675_SUPPORT=1 build flag
+//------------------------------------------------------------------------------
+#ifndef MAX6675_CS_PIN
+#define MAX6675_CS_PIN                               13
+#endif
+
+#ifndef MAX6675_SO_PIN
+#define MAX6675_SO_PIN                               12
+#endif
+
+#ifndef MAX6675_SCK_PIN
+#define MAX6675_SCK_PIN                              14
+#endif
+
 //------------------------------------------------------------------------------
 // EZOPH pH meter
 // Enable support by passing EZOPH_SUPPORT=1 build flag
@@ -916,6 +932,7 @@
     V9261F_SUPPORT || \
     VEML6075_SUPPORT || \
     VL53L1X_SUPPORT || \
+    MAX6675_SUPPORT || \
     EZOPH_SUPPORT \
 )
 #endif

From eb504e5f580ac44e8df1fef6619d02aefd031fa6 Mon Sep 17 00:00:00 2001
From: Max Prokhorov <prokhorov.max@outlook.com>
Date: Wed, 3 Apr 2019 18:38:52 +0300
Subject: [PATCH 2/3] Fix Travis failing with INFLUXDB_SUPPORT

---
 code/espurna/libs/SyncClientWrap.h | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/code/espurna/libs/SyncClientWrap.h b/code/espurna/libs/SyncClientWrap.h
index c22d27f9..b252eaf5 100644
--- a/code/espurna/libs/SyncClientWrap.h
+++ b/code/espurna/libs/SyncClientWrap.h
@@ -9,13 +9,29 @@ Temporary wrap to fix https://github.com/me-no-dev/ESPAsyncTCP/issues/109
 
 #include <SyncClient.h>
 
+// ref Core 2.5.0: cores/esp8266/IPAddress.h
+#ifndef CONST
+#include <lwip/init.h>
+
+#if LWIP_VERSION_MAJOR == 1
+#define CONST
+#else
+#define CONST const
+#endif
+
+#endif
+
 class SyncClientWrap: public SyncClient {
 
     public:
+        SyncClientWrap() {}
+        ~SyncClientWrap() {}
+
+        // int connect(const char*, uint16_t);
+        using SyncClient::connect;
 
-        int connect(const char *host, uint16_t port);
-        int connect(CONST IPAddress& ip, uint16_t port) { return connect(ip, port); }
-        bool flush(unsigned int maxWaitMs = 0) { flush(); return true; }
-        bool stop(unsigned int maxWaitMs = 0) { stop(); return true; }
+        int connect(CONST IPAddress& ip, uint16_t port) { IPAddress _ip(ip); return SyncClient::connect(_ip, port); }
+        bool flush(unsigned int maxWaitMs = 0) { SyncClient::flush(); return true; }
+        bool stop(unsigned int maxWaitMs = 0) { SyncClient::stop(); return true; }
 
 };

From 903ceb1e844586a6b954c294d7a4438c75a08467 Mon Sep 17 00:00:00 2001
From: Max Prokhorov <prokhorov.max@outlook.com>
Date: Wed, 3 Apr 2019 18:39:32 +0300
Subject: [PATCH 3/3] Use local includes for NtpClient wrapper

---
 code/espurna/ntp.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/espurna/ntp.ino b/code/espurna/ntp.ino
index 153df10e..de9353e0 100644
--- a/code/espurna/ntp.ino
+++ b/code/espurna/ntp.ino
@@ -12,7 +12,7 @@ Copyright (C) 2016-2019 by Xose Pérez <xose dot perez at gmail dot com>
 #include <WiFiClient.h>
 #include <Ticker.h>
 
-#include <libs/NtpClientWrap.h>
+#include "libs/NtpClientWrap.h"
 
 Ticker _ntp_defer;