From c47c8058c7b0a15fa04be3a1cf6d6a170bb060a4 Mon Sep 17 00:00:00 2001 From: cziter15 Date: Sun, 16 Feb 2025 17:15:11 +0100 Subject: [PATCH] Fixes --- src/ksf/comp/ksMqttConnector.h | 24 ++++++++++++++---------- src/ksf/misc/ksCertUtils.h | 15 ++++++++------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/ksf/comp/ksMqttConnector.h b/src/ksf/comp/ksMqttConnector.h index 0fc6e48..bc1c594 100644 --- a/src/ksf/comp/ksMqttConnector.h +++ b/src/ksf/comp/ksMqttConnector.h @@ -17,22 +17,26 @@ #include "../misc/ksSimpleTimer.h" #include "../misc/ksDomainQuery.h" -#if (defined(ESP32) && ESP_ARDUINO_VERSION_MAJOR >= 3) - #define ksMqttConnectorNetClient_t NetworkClient - #define ksMqttConnectorNetClientSecure_t NetworkClientSecure -#elif defined (ESP8266) +#if (defined(ESP32)) + #if ESP_ARDUINO_VERSION_MAJOR >= 3 + #define ksMqttConnectorNetClient_t NetworkClient + #define ksMqttConnectorNetClientSecure_t NetworkClientSecure + #else + #define ksMqttConnectorNetClient_t WiFiClient + #define ksMqttConnectorNetClientSecure_t WiFiClientSecure + #endif + class ksMqttConnectorNetClientSecure_t; + class ksMqttConnectorNetClient_t; +#elif defined(ESP8266) + namespace BearSSL{class WiFiClientSecure;} + #define ksCertUtilsNetCLientSecure_t BearSSL::WiFiClientSecure #define ksMqttConnectorNetClient_t WiFiClient - namespace BearSSL - { - class WiFiClientSecure; - } - #define ksMqttConnectorNetClientSecure_t BearSSL::WiFiClientSecure + class ksMqttConnectorNetClient_t; #else #error Platform not implemented. #endif class PubSubClient; -class ksMqttConnectorNetClient_t; namespace ksf::misc { diff --git a/src/ksf/misc/ksCertUtils.h b/src/ksf/misc/ksCertUtils.h index 890f97e..910ca27 100644 --- a/src/ksf/misc/ksCertUtils.h +++ b/src/ksf/misc/ksCertUtils.h @@ -12,14 +12,15 @@ #include #include -#if defined(ESP32) - #define ksCertUtilsNetCLientSecure_t WiFiClientSecure +#if (defined(ESP32)) + #if ESP_ARDUINO_VERSION_MAJOR >= 3 + #define ksCertUtilsNetCLientSecure_t NetworkClientSecure + #else + #define ksCertUtilsNetCLientSecure_t WiFiClientSecure + #endif class ksCertUtilsNetCLientSecure_t; -#elif defined(ESP8266) - namespace BearSSL - { - class WiFiClientSecure; - } +#elif defined(ESP8266) + namespace BearSSL{class WiFiClientSecure;} #define ksCertUtilsNetCLientSecure_t BearSSL::WiFiClientSecure #else #error Platform not implemented.