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

move common network code to seperate class

Browse Source
This commit is contained in:
technyon
2022-07-02 12:04:03 +02:00
parent cb35eae2f7
commit beb87a959f
12 changed files with 549 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
NetworkLock.h
View File

@@ -9,24 +9,16 @@
#include "NukiConstants.h"
#include "SpiffsCookie.h"
#include "NukiLockConstants.h"
#include "Network.h"
enum class NetworkDeviceType
{
WiFi,
W5500
};
class NetworkLock
class NetworkLock : public MqttReceiver
{
public:
explicit NetworkLock(const NetworkDeviceType networkDevice, Preferences* preferences);
explicit NetworkLock(Network* network, Preferences* preferences);
virtual ~NetworkLock();
void initialize();
void update();
void setupDevice(const NetworkDeviceType hardware);
bool isMqttConnected();
void publishKeyTurnerState(const NukiLock::KeyTurnerState& keyTurnerState, const NukiLock::KeyTurnerState& lastKeyTurnerState);
void publishAuthorizationInfo(const uint32_t authId, const char* authName);
@@ -44,42 +36,24 @@ public:
void restartAndConfigureWifi();
NetworkDevice* device();
void onMqttDataReceived(char*& topic, byte*& payload, unsigned int& length) override;
private:
static void onMqttDataReceivedCallback(char* topic, byte* payload, unsigned int length);
void onMqttDataReceived(char*& topic, byte*& payload, unsigned int& length);
bool comparePrefixedPath(const char* fullPath, const char* subPath);
void publishFloat(const char* topic, const float value, const uint8_t precision = 2);
void publishInt(const char* topic, const int value);
void publishUInt(const char* topic, const unsigned int value);
void publishBool(const char* topic, const bool value);
bool publishString(const char* topic, const char* value);
bool publishString(const char* topic, const char* value); bool comparePrefixedPath(const char* fullPath, const char* subPath);
void buildMqttPath(const char* path, char* outPath);
void subscribe(const char* path);
bool reconnect();
NetworkDevice* _device = nullptr;
Network* _network;
Preferences* _preferences;
String _hostname;
bool _mqttConnected = false;
unsigned long _nextReconnect = 0;
char _mqttBrokerAddr[101] = {0};
char _mqttPath[181] = {0};
char _mqttUser[31] = {0};
char _mqttPass[31] = {0};
int _networkTimeout = 0;
unsigned long _lastConnectedTs = 0;
char* _presenceCsv = nullptr;
std::vector<char*> _configTopics;
char _mqttPath[181] = {0};
bool _firstTunerStatePublish = true;