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

fix on mqtt date received handlers

Browse Source
This commit is contained in:
technyon
2023-01-27 20:26:54 +01:00
parent c9dbbb5dc1
commit e14e71b5cc
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Network.cpp
View File

@@ -280,11 +280,7 @@ bool Network::reconnect()
_device->mqttClient()->publish(it.first.c_str(), MQTT_QOS_LEVEL, true, it.second.c_str());
}
}
for(int i=0; i<10; i++)
{
// _device->mqttClient()->poll();
delay(100);
}
delay(1000);
_mqttConnectionState = 2;
}
else
@@ -292,7 +288,6 @@ bool Network::reconnect()
Log->print(F("MQTT connect failed, rc="));
// Log->println(_device->mqttClient()->connectError());
_device->printError();
// _device->mqttClient()->stop();
_mqttConnectionState = 0;
_nextReconnect = millis() + 5000;
}
@@ -345,7 +340,15 @@ void Network::registerMqttReceiver(MqttReceiver* receiver)
void Network::onMqttDataReceivedCallback(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total)
{
_inst->onMqttDataReceived(properties, topic, payload, len, index, total);
uint8_t value[50] = {0};
size_t l = min(len, sizeof(value)-1);
for(int i=0; i<l; i++)
{
value[i] = payload[i];
}
_inst->onMqttDataReceived(properties, topic, value, len, index, total);
}
void Network::onMqttDataReceived(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total)

8
NetworkLock.cpp
View File

@@ -73,13 +73,7 @@ void NetworkLock::initialize()
void NetworkLock::onMqttDataReceived(const char* topic, byte* payload, const unsigned int length)
{
char value[50] = {0};
size_t l = min(length, sizeof(value)-1);
for(int i=0; i<l; i++)
{
value[i] = payload[i];
}
char* value = (char*)payload;
bool processActions = _network->mqttConnectionState() >= 2;

12
NetworkOpener.cpp
View File

@@ -58,19 +58,14 @@ void NetworkOpener::update()
void NetworkOpener::onMqttDataReceived(const char* topic, byte* payload, const unsigned int length)
{
char value[50] = {0};
size_t l = min(length, sizeof(value)-1);
for(int i=0; i<l; i++)
{
value[i] = payload[i];
}
char* value = (char*)payload;
bool processActions = _network->mqttConnectionState() >= 2;
if(processActions && comparePrefixedPath(topic, mqtt_topic_lock_action))
{
if(strcmp(value, "") == 0 || strcmp(value, "--") == 0 || strcmp(value, "ack") == 0 || strcmp(value, "unknown_action") == 0) return;
Serial.println(value);
if(strcmp((char*)payload, "") == 0 || strcmp(value, "--") == 0 || strcmp(value, "ack") == 0 || strcmp(value, "unknown_action") == 0) return;
Log->print(F("Opener lock action received: "));
Log->println(value);
@@ -489,5 +484,6 @@ bool NetworkOpener::comparePrefixedPath(const char *fullPath, const char *subPat
{
char prefixedPath[500];
buildMqttPath(subPath, prefixedPath);
return strcmp(fullPath, prefixedPath) == 0;
}