Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented MQTT over TLS for WiFiDevice

Browse Source
This commit is contained in:
rodriguezst
2022-06-10 09:31:20 +00:00
committed by GitHub
parent bee2b1f191
commit 7481b1f4f0
4 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -83,6 +83,7 @@ target_link_arduino_libraries(${PROJECT_NAME}
PRIVATE
core
WiFi
WiFiClientSecure
Update
# WebServer
DNSServer

4
Network.cpp
View File

@@ -42,11 +42,11 @@ void Network::setupDevice(const NetworkDeviceType hardware)
break;
case NetworkDeviceType::WiFi:
Serial.println(F("Network device: Builtin WiFi"));
_device = new WifiDevice(_hostname);
_device = new WifiDevice(_hostname, _preferences);
break;
default:
Serial.println(F("Unknown network device type, defaulting to WiFi"));
_device = new WifiDevice(_hostname);
_device = new WifiDevice(_hostname, _preferences);
break;
}
}

30
networkDevices/WifiDevice.cpp
View File

@@ -1,15 +1,35 @@
#include <WiFi.h>
#include "WifiDevice.h"
#include "WiFiManager.h"
#include "../PreferencesKeys.h"
WifiDevice::WifiDevice(const String& hostname)
: NetworkDevice(hostname),
_mqttClient(_wifiClient)
{}
WifiDevice::WifiDevice(const String& hostname, Preferences* _preferences)
: NetworkDevice(hostname)
{
String MQTT_CA = _preferences->getString(preference_mqtt_ca);
String MQTT_CRT = _preferences->getString(preference_mqtt_crt);
String MQTT_KEY = _preferences->getString(preference_mqtt_key);
if(MQTT_CA.length() > 0)
{
_wifiClientSecure = new WiFiClientSecure();
_wifiClientSecure->setCACert(MQTT_CA.c_str());
if(MQTT_CRT.length() > 0 && MQTT_KEY.length() > 0)
{
_wifiClientSecure->setCertificate(MQTT_CRT.c_str());
_wifiClientSecure->setPrivateKey(MQTT_KEY.c_str());
}
_mqttClient = new PubSubClient(*_wifiClientSecure);
} else
{
_wifiClient = new WiFiClient();
_mqttClient = new PubSubClient(*_wifiClient);
}
}
PubSubClient *WifiDevice::mqttClient()
{
return &_mqttClient;
return _mqttClient;
}
void WifiDevice::initialize()

9
networkDevices/WifiDevice.h
View File

@@ -1,13 +1,15 @@
#pragma once
#include <WiFiClient.h>
#include <WiFiClientSecure.h>
#include <Preferences.h>
#include "NetworkDevice.h"
#include "../SpiffsCookie.h"
class WifiDevice : public NetworkDevice
{
public:
WifiDevice(const String& hostname);
WifiDevice(const String& hostname, Preferences* _preferences);
virtual void initialize();
virtual void reconfigure();
@@ -20,7 +22,8 @@ public:
virtual PubSubClient *mqttClient();
private:
WiFiClient _wifiClient;
PubSubClient _mqttClient;
WiFiClient* _wifiClient = nullptr;
WiFiClientSecure* _wifiClientSecure = nullptr;
PubSubClient* _mqttClient = nullptr;
SpiffsCookie _cookie;
};