From e3503ab5b82aecac3068ead0640d134570522f2c Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 14 Apr 2020 17:36:36 +0200
Subject: [PATCH] Enable I2C in ESP32 and remove MQTT checks

---
 tasmota/support_features.ino     | 12 ++++++------
 tasmota/tasmota_template_ESP32.h |  8 +++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index f9dac8b4a..aa02d676e 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -55,15 +55,15 @@ void GetFeatures(void)
 #ifdef USE_EMULATION_HUE
   feature_drv1 |= 0x00000200;  // xdrv_20_hue.ino
 #endif
-#if (MQTT_LIBRARY_TYPE == MQTT_PUBSUBCLIENT)
+//#if (MQTT_LIBRARY_TYPE == MQTT_PUBSUBCLIENT)
   feature_drv1 |= 0x00000400;  // xdrv_02_mqtt.ino
-#endif
-#if (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT)
+//#endif
+//#if (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT)
 //  feature_drv1 |= 0x00000800;  // xdrv_02_mqtt.ino
-#endif
-#if (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO)      // Obsolete since 6.2.1.11
+//#endif
+//#if (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO)      // Obsolete since 6.2.1.11
 //  feature_drv1 |= 0x00001000;  // xdrv_02_mqtt.ino
-#endif
+//#endif
 #ifdef MQTT_HOST_DISCOVERY
   feature_drv1 |= 0x00002000;  // xdrv_02_mqtt.ino
 #endif
diff --git a/tasmota/tasmota_template_ESP32.h b/tasmota/tasmota_template_ESP32.h
index 11443826c..b2d7a5846 100644
--- a/tasmota/tasmota_template_ESP32.h
+++ b/tasmota/tasmota_template_ESP32.h
@@ -22,9 +22,6 @@
 
 #ifdef ESP32
 
-// mqtt
-#undef MQTT_LIBRARY_TYPE
-#define MQTT_LIBRARY_TYPE      MQTT_PUBSUBCLIENT
 // Hardware has no ESP32
 #undef USE_TUYA_DIMMER
 #undef USE_PWM_DIMMER
@@ -36,9 +33,10 @@
 #undef USE_SONOFF_L1
 #undef USE_SONOFF_D1
 #undef USE_RF_FLASH
-// not ported
+
+// Not ported (yet)
 #undef USE_DISCOVERY
-#undef USE_ADC_VCC // Needs to be ported
+#undef USE_ADC_VCC    // Needs to be ported
 #undef USE_DEEPSLEEP
 #undef USE_MY92X1
 #undef USE_TUYA_MCU