publish lock state query command result
This commit is contained in:
2
Config.h
2
Config.h
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define NUKI_HUB_VERSION "8.16-pre-1"
|
#define NUKI_HUB_VERSION "8.16"
|
||||||
|
|
||||||
#define MQTT_QOS_LEVEL 1
|
#define MQTT_QOS_LEVEL 1
|
||||||
#define MQTT_CLEAN_SESSIONS false
|
#define MQTT_CLEAN_SESSIONS false
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
#define mqtt_topic_query_lockstate "/lock/query/lockstate"
|
#define mqtt_topic_query_lockstate "/lock/query/lockstate"
|
||||||
#define mqtt_topic_query_keypad "/lock/query/keypad"
|
#define mqtt_topic_query_keypad "/lock/query/keypad"
|
||||||
#define mqtt_topic_query_battery "/lock/query/battery"
|
#define mqtt_topic_query_battery "/lock/query/battery"
|
||||||
|
#define mqtt_topic_query_lockstate_command_result "/lock/query/lockstateCommandResult"
|
||||||
#define mqtt_topic_lock_binary_state "/lock/binaryState"
|
#define mqtt_topic_lock_binary_state "/lock/binaryState"
|
||||||
#define mqtt_topic_lock_trigger "/lock/trigger"
|
#define mqtt_topic_lock_trigger "/lock/trigger"
|
||||||
#define mqtt_topic_lock_last_lock_action "/lock/lastLockAction"
|
#define mqtt_topic_lock_last_lock_action "/lock/lastLockAction"
|
||||||
|
|||||||
@@ -398,6 +398,11 @@ void NetworkLock::publishCommandResult(const char *resultStr)
|
|||||||
publishString(mqtt_topic_lock_action_command_result, resultStr);
|
publishString(mqtt_topic_lock_action_command_result, resultStr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void NetworkLock::publishLockstateCommandResult(const char *resultStr)
|
||||||
|
{
|
||||||
|
publishString(mqtt_topic_query_lockstate_command_result, resultStr);
|
||||||
|
}
|
||||||
|
|
||||||
void NetworkLock::publishBatteryReport(const NukiLock::BatteryReport& batteryReport)
|
void NetworkLock::publishBatteryReport(const NukiLock::BatteryReport& batteryReport)
|
||||||
{
|
{
|
||||||
publishFloat(mqtt_topic_battery_voltage, (float)batteryReport.batteryVoltage / 1000.0);
|
publishFloat(mqtt_topic_battery_voltage, (float)batteryReport.batteryVoltage / 1000.0);
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ public:
|
|||||||
void publishAuthorizationInfo(const std::list<NukiLock::LogEntry>& logEntries);
|
void publishAuthorizationInfo(const std::list<NukiLock::LogEntry>& logEntries);
|
||||||
void clearAuthorizationInfo();
|
void clearAuthorizationInfo();
|
||||||
void publishCommandResult(const char* resultStr);
|
void publishCommandResult(const char* resultStr);
|
||||||
|
void publishLockstateCommandResult(const char* resultStr);
|
||||||
void publishBatteryReport(const NukiLock::BatteryReport& batteryReport);
|
void publishBatteryReport(const NukiLock::BatteryReport& batteryReport);
|
||||||
void publishConfig(const NukiLock::Config& config);
|
void publishConfig(const NukiLock::Config& config);
|
||||||
void publishAdvancedConfig(const NukiLock::AdvancedConfig& config);
|
void publishAdvancedConfig(const NukiLock::AdvancedConfig& config);
|
||||||
|
|||||||
@@ -443,6 +443,11 @@ void NetworkOpener::publishCommandResult(const char *resultStr)
|
|||||||
publishString(mqtt_topic_lock_action_command_result, resultStr);
|
publishString(mqtt_topic_lock_action_command_result, resultStr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void NetworkOpener::publishLockstateCommandResult(const char *resultStr)
|
||||||
|
{
|
||||||
|
publishString(mqtt_topic_query_lockstate_command_result, resultStr);
|
||||||
|
}
|
||||||
|
|
||||||
void NetworkOpener::publishBatteryReport(const NukiOpener::BatteryReport& batteryReport)
|
void NetworkOpener::publishBatteryReport(const NukiOpener::BatteryReport& batteryReport)
|
||||||
{
|
{
|
||||||
publishFloat(mqtt_topic_battery_voltage, (float)batteryReport.batteryVoltage / 1000.0);
|
publishFloat(mqtt_topic_battery_voltage, (float)batteryReport.batteryVoltage / 1000.0);
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ public:
|
|||||||
void publishAuthorizationInfo(const std::list<NukiOpener::LogEntry>& logEntries);
|
void publishAuthorizationInfo(const std::list<NukiOpener::LogEntry>& logEntries);
|
||||||
void clearAuthorizationInfo();
|
void clearAuthorizationInfo();
|
||||||
void publishCommandResult(const char* resultStr);
|
void publishCommandResult(const char* resultStr);
|
||||||
|
void publishLockstateCommandResult(const char* resultStr);
|
||||||
void publishBatteryReport(const NukiOpener::BatteryReport& batteryReport);
|
void publishBatteryReport(const NukiOpener::BatteryReport& batteryReport);
|
||||||
void publishConfig(const NukiOpener::Config& config);
|
void publishConfig(const NukiOpener::Config& config);
|
||||||
void publishAdvancedConfig(const NukiOpener::AdvancedConfig& config);
|
void publishAdvancedConfig(const NukiOpener::AdvancedConfig& config);
|
||||||
|
|||||||
@@ -272,6 +272,12 @@ void NukiOpenerWrapper::updateKeyTurnerState()
|
|||||||
{
|
{
|
||||||
Log->print(F("Querying opener state: "));
|
Log->print(F("Querying opener state: "));
|
||||||
Nuki::CmdResult result =_nukiOpener.requestOpenerState(&_keyTurnerState);
|
Nuki::CmdResult result =_nukiOpener.requestOpenerState(&_keyTurnerState);
|
||||||
|
|
||||||
|
char resultStr[15];
|
||||||
|
memset(&resultStr, 0, sizeof(resultStr));
|
||||||
|
NukiOpener::cmdResultToString(result, resultStr);
|
||||||
|
_network->publishLockstateCommandResult(resultStr);
|
||||||
|
|
||||||
if(result != Nuki::CmdResult::Success)
|
if(result != Nuki::CmdResult::Success)
|
||||||
{
|
{
|
||||||
_retryLockstateCount++;
|
_retryLockstateCount++;
|
||||||
|
|||||||
@@ -288,6 +288,12 @@ void NukiWrapper::updateKeyTurnerState()
|
|||||||
{
|
{
|
||||||
Log->print(F("Querying lock state: "));
|
Log->print(F("Querying lock state: "));
|
||||||
Nuki::CmdResult result =_nukiLock.requestKeyTurnerState(&_keyTurnerState);
|
Nuki::CmdResult result =_nukiLock.requestKeyTurnerState(&_keyTurnerState);
|
||||||
|
|
||||||
|
char resultStr[15];
|
||||||
|
memset(&resultStr, 0, sizeof(resultStr));
|
||||||
|
NukiLock::cmdResultToString(result, resultStr);
|
||||||
|
_network->publishLockstateCommandResult(resultStr);
|
||||||
|
|
||||||
if(result != Nuki::CmdResult::Success)
|
if(result != Nuki::CmdResult::Success)
|
||||||
{
|
{
|
||||||
_retryLockstateCount++;
|
_retryLockstateCount++;
|
||||||
|
|||||||
Reference in New Issue
Block a user