From f609950776bc87c6b1a237a32f527253b1ace0da Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 27 May 2018 17:13:57 +0200 Subject: [PATCH] removed esp32 support --- lib/ESPHelper/ESPHelper.cpp | 18 +----------------- lib/ESPHelper/ESPHelper.h | 18 ++---------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/lib/ESPHelper/ESPHelper.cpp b/lib/ESPHelper/ESPHelper.cpp index 83ad5c8ac..102e80ae6 100644 --- a/lib/ESPHelper/ESPHelper.cpp +++ b/lib/ESPHelper/ESPHelper.cpp @@ -1,4 +1,4 @@ -/* +/* Based off : 1) ESPHelper.cpp - Copyright (c) 2017 ItKindaWorks Inc All right reserved. github.com/ItKindaWorks 2) https://github.com/JoaoLopesF/ESP8266-RemoteDebug-Telnet @@ -750,11 +750,7 @@ void ESPHelper::consoleShowHelp() { help.concat("*\n\r* Remote Debug for ESP8266/ESP32\n\r"); help.concat("* Device hostname: "); -#if defined(ESP8266) help.concat(WiFi.hostname()); -#else - help.concat(WiFi.getHostname()); -#endif help.concat(", IP: "); help.concat(WiFi.localIP().toString()); help.concat(", MAC address: "); @@ -762,18 +758,6 @@ void ESPHelper::consoleShowHelp() { help.concat("\n\r* Connected to WiFi AP: "); help.concat(WiFi.SSID()); -#if defined(ESP32) - esp_chip_info_t chip_info; - esp_chip_info(&chip_info); - sprintf(s, - "\n* ESP32 chip with %d CPU cores, WiFi%s%s, silicon revision %d\n", - chip_info.cores, - (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "", - (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "", - chip_info.revision); - help.concat(s); -#endif - help.concat("\n\r* Boot time: "); help.concat(_boottime); help.concat("\n\r* Free Heap RAM: "); diff --git a/lib/ESPHelper/ESPHelper.h b/lib/ESPHelper/ESPHelper.h index f984be708..7bf440f38 100644 --- a/lib/ESPHelper/ESPHelper.h +++ b/lib/ESPHelper/ESPHelper.h @@ -23,22 +23,13 @@ #define __ESP_HELPER_H #include +#include //https://github.com/esp8266/Arduino +#include #include #include #include #include -#if defined(ESP8266) -#include //https://github.com/esp8266/Arduino -#include -#elif defined(ESP32) -#include "esp_system.h" -#include -#include -#else -#error Only for ESP8266 or ESP32 -#endif - // MQTT stuff #define DEFAULT_QOS 1 //at least once - devices are guarantee to get a message. #define MQTT_BASE "home/" @@ -170,12 +161,7 @@ class ESPHelper : public Print { void (*_wifiCallback)(); bool _wifiCallbackSet = false; -#ifdef ESP8266 std::function _mqttCallback; -#endif -#ifdef ESP32 - void (*_mqttCallback)(char *, uint8_t *, uint8_t); -#endif bool _mqttCallbackSet = false; uint8_t _connectionStatus = NO_CONNECTION;