From d5a3c4f1dee6362eb0e60b444445d09f39e9d9b5 Mon Sep 17 00:00:00 2001 From: iranl Date: Sat, 30 Mar 2024 18:02:42 +0100 Subject: [PATCH] Actions --- CMakeLists.txt | 1 - ConfigUpdateResult.h | 9 - MqttTopics.h | 1 + NetworkLock.cpp | 40 +-- NetworkLock.h | 8 +- NetworkOpener.cpp | 41 +-- NetworkOpener.h | 5 +- NukiOpenerWrapper.cpp | 620 ++++++++++++++++++++++++++++++++++++--- NukiOpenerWrapper.h | 9 +- NukiWrapper.cpp | 664 ++++++++++++++++++++++++++++++++++++++---- NukiWrapper.h | 11 +- 11 files changed, 1233 insertions(+), 176 deletions(-) delete mode 100644 ConfigUpdateResult.h diff --git a/CMakeLists.txt b/CMakeLists.txt index f0e919b..6ae3a59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,6 @@ set(SRCFILES networkDevices/ClientSyncW5500.cpp networkDevices/espMqttClientW5500.cpp networkDevices/IPConfiguration.cpp - ConfigUpdateResult.h LockActionResult.h QueryCommand.h NukiWrapper.cpp diff --git a/ConfigUpdateResult.h b/ConfigUpdateResult.h deleted file mode 100644 index 3b07596..0000000 --- a/ConfigUpdateResult.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -enum class ConfigUpdateResult -{ - Success, - UnknownAction, - AccessDenied, - Failed -}; \ No newline at end of file diff --git a/MqttTopics.h b/MqttTopics.h index a91a762..786aca7 100644 --- a/MqttTopics.h +++ b/MqttTopics.h @@ -21,6 +21,7 @@ #define mqtt_topic_lock_retry "/lock/retry" #define mqtt_topic_config_action "/configuration/action" +#define mqtt_topic_config_action_command_result "/configuration/commandResult" #define mqtt_topic_config_basic_json "/configuration/basicJson" #define mqtt_topic_config_advanced_json "/configuration/advancedJson" #define mqtt_topic_config_button_enabled "/configuration/buttonEnabled" diff --git a/NetworkLock.cpp b/NetworkLock.cpp index 5ce7105..09c829d 100644 --- a/NetworkLock.cpp +++ b/NetworkLock.cpp @@ -187,36 +187,15 @@ void NetworkLock::onMqttDataReceived(const char* topic, byte* payload, const uns if(comparePrefixedPath(topic, mqtt_topic_config_action)) { - if(strcmp(value, "") == 0 || - strcmp(value, "--") == 0 || - strcmp(value, "ack") == 0 || - strcmp(value, "unknown_action") == 0 || - strcmp(value, "denied") == 0 || - strcmp(value, "error") == 0) return; - + if(strcmp(value, "") == 0 || strcmp(value, "--") == 0) return; Log->print(F("Config action received: ")); Log->println(value); - ConfigUpdateResult configUpdateResult = ConfigUpdateResult::Failed; if(_configUpdateReceivedCallback != NULL) { - configUpdateResult = _configUpdateReceivedCallback(value); - } - - switch(configUpdateResult) - { - case ConfigUpdateResult::Success: - publishString(mqtt_topic_config_action, "ack"); - break; - case ConfigUpdateResult::UnknownAction: - publishString(mqtt_topic_config_action, "unknown_action"); - break; - case ConfigUpdateResult::AccessDenied: - publishString(mqtt_topic_config_action, "denied"); - break; - case ConfigUpdateResult::Failed: - publishString(mqtt_topic_config_action, "error"); - break; + _configUpdateReceivedCallback(value); } + + publishString(mqtt_topic_config_action, "--"); } } @@ -296,7 +275,7 @@ void NetworkLock::publishKeyTurnerState(const NukiLock::KeyTurnerState& keyTurne if(_firstTunerStatePublish || keyTurnerState.accessoryBatteryState != lastKeyTurnerState.accessoryBatteryState) { - if ((keyTurnerState.accessoryBatteryState & (1 << 7)) != 0) { + if((keyTurnerState.accessoryBatteryState & (1 << 7)) != 0) { publishBool(mqtt_topic_battery_keypad_critical, (keyTurnerState.accessoryBatteryState & (1 << 6)) != 0); } else @@ -638,6 +617,11 @@ void NetworkLock::publishKeypad(const std::list& entries, } } +void NetworkLock::publishConfigCommandResult(const char* result) +{ + publishString(mqtt_topic_config_action_command_result, result); +} + void NetworkLock::publishKeypadCommandResult(const char* result) { publishString(mqtt_topic_keypad_command_result, result); @@ -648,7 +632,7 @@ void NetworkLock::setLockActionReceivedCallback(LockActionResult (*lockActionRec _lockActionReceivedCallback = lockActionReceivedCallback; } -void NetworkLock::setConfigUpdateReceivedCallback(ConfigUpdateResult (*configUpdateReceivedCallback)(const char *)) +void NetworkLock::setConfigUpdateReceivedCallback(void (*configUpdateReceivedCallback)(const char *)) { _configUpdateReceivedCallback = configUpdateReceivedCallback; } @@ -1012,7 +996,7 @@ void NetworkLock::timeZoneIdToString(const Nuki::TimeZoneId timeZoneId, char* st strcpy(str, "Pacific/Auckland"); break; case Nuki::TimeZoneId::Pacific_Guam: - strcpy(str, " Pacific/Guam"); + strcpy(str, "Pacific/Guam"); break; case Nuki::TimeZoneId::Pacific_Honolulu: strcpy(str, "Pacific/Honolulu"); diff --git a/NetworkLock.h b/NetworkLock.h index 0d56819..1f16224 100644 --- a/NetworkLock.h +++ b/NetworkLock.h @@ -11,7 +11,6 @@ #include "Network.h" #include "QueryCommand.h" #include "LockActionResult.h" -#include "ConfigUpdateResult.h" #define LOCK_LOG_JSON_BUFFER_SIZE 2048 @@ -38,10 +37,11 @@ public: void publishHASSConfig(char* deviceType, const char* baseTopic, char* name, char* uidString, const bool& hasDoorSensor, const bool& hasKeypad, const bool& publishAuthData, char* lockAction, char* unlockAction, char* openAction); void removeHASSConfig(char* uidString); void publishKeypad(const std::list& entries, uint maxKeypadCodeCount); + void publishConfigCommandResult(const char* result); void publishKeypadCommandResult(const char* result); void setLockActionReceivedCallback(LockActionResult (*lockActionReceivedCallback)(const char* value)); - void setConfigUpdateReceivedCallback(ConfigUpdateResult (*configUpdateReceivedCallback)(const char* value)); + void setConfigUpdateReceivedCallback(void (*configUpdateReceivedCallback)(const char* value)); void setKeypadCommandReceivedCallback(void (*keypadCommandReceivedReceivedCallback)(const char* command, const uint& id, const String& name, const String& code, const int& enabled)); void onMqttDataReceived(const char* topic, byte* payload, const unsigned int length) override; @@ -67,7 +67,7 @@ private: void timeZoneIdToString(const Nuki::TimeZoneId timeZoneId, char* str); void homeKitStatusToString(const int hkstatus, char* str); void fobActionToString(const int fobact, char* str); - + String concat(String a, String b); void buildMqttPath(const char* path, char* outPath); @@ -94,6 +94,6 @@ private: size_t _bufferSize; LockActionResult (*_lockActionReceivedCallback)(const char* value) = nullptr; - ConfigUpdateResult (*_configUpdateReceivedCallback)(const char* value) = nullptr; + void (*_configUpdateReceivedCallback)(const char* value) = nullptr; void (*_keypadCommandReceivedReceivedCallback)(const char* command, const uint& id, const String& name, const String& code, const int& enabled) = nullptr; }; diff --git a/NetworkOpener.cpp b/NetworkOpener.cpp index 53b38a1..929c04d 100644 --- a/NetworkOpener.cpp +++ b/NetworkOpener.cpp @@ -179,36 +179,15 @@ void NetworkOpener::onMqttDataReceived(const char* topic, byte* payload, const u if(comparePrefixedPath(topic, mqtt_topic_config_action)) { - if(strcmp(value, "") == 0 || - strcmp(value, "--") == 0 || - strcmp(value, "ack") == 0 || - strcmp(value, "unknown_action") == 0 || - strcmp(value, "denied") == 0 || - strcmp(value, "error") == 0) return; - + if(strcmp(value, "") == 0 || strcmp(value, "--") == 0) return; Log->print(F("Config action received: ")); Log->println(value); - ConfigUpdateResult configUpdateResult = ConfigUpdateResult::Failed; if(_configUpdateReceivedCallback != NULL) { - configUpdateResult = _configUpdateReceivedCallback(value); - } - - switch(configUpdateResult) - { - case ConfigUpdateResult::Success: - publishString(mqtt_topic_config_action, "ack"); - break; - case ConfigUpdateResult::UnknownAction: - publishString(mqtt_topic_config_action, "unknown_action"); - break; - case ConfigUpdateResult::AccessDenied: - publishString(mqtt_topic_config_action, "denied"); - break; - case ConfigUpdateResult::Failed: - publishString(mqtt_topic_config_action, "error"); - break; + _configUpdateReceivedCallback(value); } + + publishString(mqtt_topic_config_action, "--"); } } @@ -291,7 +270,7 @@ void NetworkOpener::publishKeyTurnerState(const NukiOpener::OpenerState& keyTurn void NetworkOpener::publishRing(const bool locked) { - if (locked) + if(locked) { publishString(mqtt_topic_lock_ring, "ringlocked"); } @@ -537,6 +516,7 @@ void NetworkOpener::publishConfig(const NukiOpener::Config &config) json["capabilities"] = str; json["pairingEnabled"] = config.pairingEnabled; json["buttonEnabled"] = config.buttonEnabled; + json["ledFlashEnabled"] = config.ledFlashEnabled; json["currentTime"] = curTime; json["timeZoneOffset"] = config.timeZoneOffset; json["dstMode"] = config.dstMode; @@ -689,6 +669,11 @@ void NetworkOpener::publishKeypad(const std::list& entrie } } +void NetworkOpener::publishConfigCommandResult(const char* result) +{ + publishString(mqtt_topic_config_action_command_result, result); +} + void NetworkOpener::publishKeypadCommandResult(const char* result) { publishString(mqtt_topic_keypad_command_result, result); @@ -699,7 +684,7 @@ void NetworkOpener::setLockActionReceivedCallback(LockActionResult (*lockActionR _lockActionReceivedCallback = lockActionReceivedCallback; } -void NetworkOpener::setConfigUpdateReceivedCallback(ConfigUpdateResult (*configUpdateReceivedCallback)(const char *)) +void NetworkOpener::setConfigUpdateReceivedCallback(void (*configUpdateReceivedCallback)(const char *)) { _configUpdateReceivedCallback = configUpdateReceivedCallback; } @@ -1027,7 +1012,7 @@ void NetworkOpener::timeZoneIdToString(const Nuki::TimeZoneId timeZoneId, char* strcpy(str, "Pacific/Auckland"); break; case Nuki::TimeZoneId::Pacific_Guam: - strcpy(str, " Pacific/Guam"); + strcpy(str, "Pacific/Guam"); break; case Nuki::TimeZoneId::Pacific_Honolulu: strcpy(str, "Pacific/Honolulu"); diff --git a/NetworkOpener.h b/NetworkOpener.h index 23a6228..fa6b718 100644 --- a/NetworkOpener.h +++ b/NetworkOpener.h @@ -34,10 +34,11 @@ public: void publishHASSConfig(char* deviceType, const char* baseTopic, char* name, char* uidString, char* lockAction, char* unlockAction, char* openAction); void removeHASSConfig(char* uidString); void publishKeypad(const std::list& entries, uint maxKeypadCodeCount); + void publishConfigCommandResult(const char* result); void publishKeypadCommandResult(const char* result); void setLockActionReceivedCallback(LockActionResult (*lockActionReceivedCallback)(const char* value)); - void setConfigUpdateReceivedCallback(ConfigUpdateResult (*configUpdateReceivedCallback)(const char* value)); + void setConfigUpdateReceivedCallback(void (*configUpdateReceivedCallback)(const char* value)); void setKeypadCommandReceivedCallback(void (*keypadCommandReceivedReceivedCallback)(const char* command, const uint& id, const String& name, const String& code, const int& enabled)); void onMqttDataReceived(const char* topic, byte* payload, const unsigned int length) override; @@ -96,6 +97,6 @@ private: const size_t _bufferSize; LockActionResult (*_lockActionReceivedCallback)(const char* value) = nullptr; - ConfigUpdateResult (*_configUpdateReceivedCallback)(const char* value) = nullptr; + void (*_configUpdateReceivedCallback)(const char* value) = nullptr; void (*_keypadCommandReceivedReceivedCallback)(const char* command, const uint& id, const String& name, const String& code, const int& enabled) = nullptr; }; diff --git a/NukiOpenerWrapper.cpp b/NukiOpenerWrapper.cpp index ec2eab9..ed6bcd5 100644 --- a/NukiOpenerWrapper.cpp +++ b/NukiOpenerWrapper.cpp @@ -117,7 +117,7 @@ void NukiOpenerWrapper::initialize() void NukiOpenerWrapper::update() { - if (!_paired) + if(!_paired) { Log->println(F("Nuki opener start pairing")); _network->publishBleAddress(""); @@ -126,7 +126,7 @@ void NukiOpenerWrapper::update() Nuki::AuthorizationIdType::App : Nuki::AuthorizationIdType::Bridge; - if (_nukiOpener.pairNuki(idType) == NukiOpener::PairingResult::Success) + if(_nukiOpener.pairNuki(idType) == NukiOpener::PairingResult::Success) { Log->println(F("Nuki opener paired")); _paired = true; @@ -217,7 +217,7 @@ void NukiOpenerWrapper::update() _retryCount = 0; _nextLockAction = (NukiOpener::LockAction) 0xff; _network->publishRetry("--"); - if (_intervalLockstate > 10) + if(_intervalLockstate > 10) { _nextLockStateUpdateTs = ts + 10 * 1000; } @@ -547,56 +547,596 @@ LockActionResult NukiOpenerWrapper::onLockActionReceivedCallback(const char *val return LockActionResult::AccessDenied; } -ConfigUpdateResult NukiOpenerWrapper::onConfigUpdateReceivedCallback(const char *value) +void NukiOpenerWrapper::onConfigUpdateReceivedCallback(const char *value) { + nukiOpenerInst->onConfigUpdateReceived(value); +} + +Nuki::AdvertisingMode NukiOpenerWrapper::advertisingModeToEnum(const char *str) +{ + if(strcmp(str, "automatic") == 0) return Nuki::AdvertisingMode::Automatic; + else if(strcmp(str, "normal") == 0) return Nuki::AdvertisingMode::Normal; + else if(strcmp(str, "slow") == 0) return Nuki::AdvertisingMode::Slow; + else if(strcmp(str, "slowest") == 0) return Nuki::AdvertisingMode::Slowest; + return (Nuki::AdvertisingMode)0xff; +} + +Nuki::TimeZoneId NukiOpenerWrapper::timeZoneToEnum(const char *str) +{ + if(strcmp(str, "Africa/Cairo") == 0) return Nuki::TimeZoneId::Africa_Cairo; + else if(strcmp(str, "Africa/Lagos") == 0) return Nuki::TimeZoneId::Africa_Lagos; + else if(strcmp(str, "Africa/Maputo") == 0) return Nuki::TimeZoneId::Africa_Maputo; + else if(strcmp(str, "Africa/Nairobi") == 0) return Nuki::TimeZoneId::Africa_Nairobi; + else if(strcmp(str, "America/Anchorage") == 0) return Nuki::TimeZoneId::America_Anchorage; + else if(strcmp(str, "America/Argentina/Buenos_Aires") == 0) return Nuki::TimeZoneId::America_Argentina_Buenos_Aires; + else if(strcmp(str, "America/Chicago") == 0) return Nuki::TimeZoneId::America_Chicago; + else if(strcmp(str, "America/Denver") == 0) return Nuki::TimeZoneId::America_Denver; + else if(strcmp(str, "America/Halifax") == 0) return Nuki::TimeZoneId::America_Halifax; + else if(strcmp(str, "America/Los_Angeles") == 0) return Nuki::TimeZoneId::America_Los_Angeles; + else if(strcmp(str, "America/Manaus") == 0) return Nuki::TimeZoneId::America_Manaus; + else if(strcmp(str, "America/Mexico_City") == 0) return Nuki::TimeZoneId::America_Mexico_City; + else if(strcmp(str, "America/New_York") == 0) return Nuki::TimeZoneId::America_New_York; + else if(strcmp(str, "America/Phoenix") == 0) return Nuki::TimeZoneId::America_Phoenix; + else if(strcmp(str, "America/Regina") == 0) return Nuki::TimeZoneId::America_Regina; + else if(strcmp(str, "America/Santiago") == 0) return Nuki::TimeZoneId::America_Santiago; + else if(strcmp(str, "America/Sao_Paulo") == 0) return Nuki::TimeZoneId::America_Sao_Paulo; + else if(strcmp(str, "America/St_Johns") == 0) return Nuki::TimeZoneId::America_St_Johns; + else if(strcmp(str, "Asia/Bangkok") == 0) return Nuki::TimeZoneId::Asia_Bangkok; + else if(strcmp(str, "Asia/Dubai") == 0) return Nuki::TimeZoneId::Asia_Dubai; + else if(strcmp(str, "Asia/Hong_Kong") == 0) return Nuki::TimeZoneId::Asia_Hong_Kong; + else if(strcmp(str, "Asia/Jerusalem") == 0) return Nuki::TimeZoneId::Asia_Jerusalem; + else if(strcmp(str, "Asia/Karachi") == 0) return Nuki::TimeZoneId::Asia_Karachi; + else if(strcmp(str, "Asia/Kathmandu") == 0) return Nuki::TimeZoneId::Asia_Kathmandu; + else if(strcmp(str, "Asia/Kolkata") == 0) return Nuki::TimeZoneId::Asia_Kolkata; + else if(strcmp(str, "Asia/Riyadh") == 0) return Nuki::TimeZoneId::Asia_Riyadh; + else if(strcmp(str, "Asia/Seoul") == 0) return Nuki::TimeZoneId::Asia_Seoul; + else if(strcmp(str, "Asia/Shanghai") == 0) return Nuki::TimeZoneId::Asia_Shanghai; + else if(strcmp(str, "Asia/Tehran") == 0) return Nuki::TimeZoneId::Asia_Tehran; + else if(strcmp(str, "Asia/Tokyo") == 0) return Nuki::TimeZoneId::Asia_Tokyo; + else if(strcmp(str, "Asia/Yangon") == 0) return Nuki::TimeZoneId::Asia_Yangon; + else if(strcmp(str, "Australia/Adelaide") == 0) return Nuki::TimeZoneId::Australia_Adelaide; + else if(strcmp(str, "Australia/Brisbane") == 0) return Nuki::TimeZoneId::Australia_Brisbane; + else if(strcmp(str, "Australia/Darwin") == 0) return Nuki::TimeZoneId::Australia_Darwin; + else if(strcmp(str, "Australia/Hobart") == 0) return Nuki::TimeZoneId::Australia_Hobart; + else if(strcmp(str, "Australia/Perth") == 0) return Nuki::TimeZoneId::Australia_Perth; + else if(strcmp(str, "Australia/Sydney") == 0) return Nuki::TimeZoneId::Australia_Sydney; + else if(strcmp(str, "Europe/Berlin") == 0) return Nuki::TimeZoneId::Europe_Berlin; + else if(strcmp(str, "Europe/Helsinki") == 0) return Nuki::TimeZoneId::Europe_Helsinki; + else if(strcmp(str, "Europe/Istanbul") == 0) return Nuki::TimeZoneId::Europe_Istanbul; + else if(strcmp(str, "Europe/London") == 0) return Nuki::TimeZoneId::Europe_London; + else if(strcmp(str, "Europe/Moscow") == 0) return Nuki::TimeZoneId::Europe_Moscow; + else if(strcmp(str, "Pacific/Auckland") == 0) return Nuki::TimeZoneId::Pacific_Auckland; + else if(strcmp(str, "Pacific/Guam") == 0) return Nuki::TimeZoneId::Pacific_Guam; + else if(strcmp(str, "Pacific/Honolulu") == 0) return Nuki::TimeZoneId::Pacific_Honolulu; + else if(strcmp(str, "Pacific/Pago_Pago") == 0) return Nuki::TimeZoneId::Pacific_Pago_Pago; + else if(strcmp(str, "none") == 0) return Nuki::TimeZoneId::None; + return (Nuki::TimeZoneId)0xff; +} + +uint8_t NukiOpenerWrapper::fobActionToInt(const char *str) +{ + if(strcmp(str, "noaction") == 0) return 0; + else if(strcmp(str, "togglerto") == 0) return 1; + else if(strcmp(str, "activaterto") == 0) return 2; + else if(strcmp(str, "deactivaterto") == 0) return 3; + else if(strcmp(str, "open") == 0) return 7; + else if(strcmp(str, "ring") == 0) return 8; + return 99; +} + +uint8_t NukiOpenerWrapper::operatingModeToInt(const char *str) +{ + if(strcmp(str, "genericdooropener") == 0) return 0; + else if(strcmp(str, "analogueintercom") == 0) return 1; + else if(strcmp(str, "digitalintercom") == 0) return 2; + else if(strcmp(str, "siedle") == 0) return 3; + else if(strcmp(str, "tcs") == 0) return 4; + else if(strcmp(str, "bticino") == 0) return 5; + else if(strcmp(str, "siedlehts") == 0) return 6; + else if(strcmp(str, "str") == 0) return 7; + else if(strcmp(str, "ritto") == 0) return 8; + else if(strcmp(str, "fermax") == 0) return 9; + else if(strcmp(str, "comelit") == 0) return 10; + else if(strcmp(str, "urmetbibus") == 0) return 11; + else if(strcmp(str, "urmet2voice") == 0) return 12; + else if(strcmp(str, "golmar") == 0) return 13; + else if(strcmp(str, "sks") == 0) return 14; + else if(strcmp(str, "spare") == 0) return 15; + return 99; +} + +NukiOpener::ButtonPressAction NukiOpenerWrapper::buttonPressActionToEnum(const char* str) +{ + if(strcmp(str, "noaction") == 0) return NukiOpener::ButtonPressAction::NoAction; + else if(strcmp(str, "togglerto") == 0) return NukiOpener::ButtonPressAction::ToggleRTO; + else if(strcmp(str, "activaterto") == 0) return NukiOpener::ButtonPressAction::ActivateRTO; + else if(strcmp(str, "deactivaterto") == 0) return NukiOpener::ButtonPressAction::DeactivateRTO; + else if(strcmp(str, "togglecm") == 0) return NukiOpener::ButtonPressAction::ToggleCM; + else if(strcmp(str, "activatecm") == 0) return NukiOpener::ButtonPressAction::ActivateCM; + else if(strcmp(str, "deactivatecm") == 0) return NukiOpener::ButtonPressAction::DectivateCM; + else if(strcmp(str, "open") == 0) return NukiOpener::ButtonPressAction::Open; + return (NukiOpener::ButtonPressAction)0xff; +} + +Nuki::BatteryType NukiOpenerWrapper::batteryTypeToEnum(const char* str) +{ + if(strcmp(str, "alkali") == 0) return Nuki::BatteryType::Alkali; + else if(strcmp(str, "accumulators") == 0) return Nuki::BatteryType::Accumulators; + else if(strcmp(str, "lithium") == 0) return Nuki::BatteryType::Lithium; + return (Nuki::BatteryType)0xff; +} + +void NukiOpenerWrapper::onConfigUpdateReceived(const char *value) +{ + DynamicJsonDocument jsonResult(2048); + char _resbuf[2048]; + + DynamicJsonDocument json(2048); + DeserializationError jsonError = deserializeJson(json, value); + + if(jsonError) + { + jsonResult["general"] = "invalidjson"; + serializeJson(jsonResult, _resbuf, sizeof(_resbuf)); + _network->publishConfigCommandResult(_resbuf); + return; + } + + updateConfig(); + + if(!_nukiConfigValid || !_nukiAdvancedConfigValid) + { + jsonResult["general"] = "invalidconfig"; + serializeJson(jsonResult, _resbuf, sizeof(_resbuf)); + _network->publishConfigCommandResult(_resbuf); + return; + } + + //MISSING BASIC: "latitude", "longitude", "fobAction1", "fobAction2", "fobAction3", "operatingMode" + //MISSING ADVANCED: "intercomID", "busModeSwitch", "shortCircuitDaration", "electricStrikeDelay", "randomElectricStrikeDelay", "electricStrikeDuration", "disableRtoAfterRing", "rtoTimeout", "doorbellSuppression", "doorbellSuppressionDuration", "soundRing", "soundOpen", "soundRto", "soundCm", "soundConfirmation" + + Nuki::CmdResult cmdResult; + const char *basicKeys[] = {"name", "latitude", "longitude", "pairingEnabled", "buttonEnabled", "ledFlashEnabled", "timeZoneOffset", "dstMode", "fobAction1", "fobAction2", "fobAction3", "operatingMode", "advertisingMode", "timeZone"}; + const char *advancedKeys[] = {"intercomID", "busModeSwitch", "shortCircuitDaration", "electricStrikeDelay", "randomElectricStrikeDelay", "electricStrikeDuration", "disableRtoAfterRing", "rtoTimeout", "doorbellSuppression", "doorbellSuppressionDuration", "soundRing", "soundOpen", "soundRto", "soundCm", "soundConfirmation", "soundLevel", "singleButtonPressAction", "doubleButtonPressAction", "batteryType", "automaticBatteryTypeDetection"}; + bool basicUpdated = false; + bool advancedUpdated = false; + uint32_t basicOpenerConfigAclPrefs[16]; + uint32_t advancedOpenerConfigAclPrefs[20]; + nukiOpenerPreferences = new Preferences(); nukiOpenerPreferences->begin("nukihub", true); - uint32_t basicOpenerConfigAclPrefs[16]; nukiOpenerPreferences->getBytes(preference_conf_opener_basic_acl, &basicOpenerConfigAclPrefs, sizeof(basicOpenerConfigAclPrefs)); - uint32_t advancedOpenerConfigAclPrefs[22]; nukiOpenerPreferences->getBytes(preference_conf_opener_advanced_acl, &advancedOpenerConfigAclPrefs, sizeof(advancedOpenerConfigAclPrefs)); - /* - if(!nukiOpenerPreferences->getBool(preference_admin_enabled)) + for(int i=0; i < 16; i++) { - nukiOpenerPreferences->end(); - return ConfigUpdateResult::AccessDenied; - } - - if((action == NukiOpener::LockAction::ActivateRTO && (int)aclPrefs[9] == 1) || (action == NukiOpener::LockAction::DeactivateRTO && (int)aclPrefs[10] == 1) || (action == NukiOpener::LockAction::ElectricStrikeActuation && (int)aclPrefs[11] == 1) || (action == NukiOpener::LockAction::ActivateCM && (int)aclPrefs[12] == 1) || (action == NukiOpener::LockAction::DeactivateCM && (int)aclPrefs[13] == 1) || (action == NukiOpener::LockAction::FobAction1 && (int)aclPrefs[14] == 1) || (action == NukiOpener::LockAction::FobAction2 && (int)aclPrefs[15] == 1) || (action == NukiOpener::LockAction::FobAction3 && (int)aclPrefs[16] == 1)) - { - nukiOpenerPreferences->end(); - nukiOpenerInst->_nextLockAction = action; - return ConfigUpdateResult::Success; + if(json[basicKeys[i]]) + { + if((int)basicOpenerConfigAclPrefs[i] == 1) + { + cmdResult = Nuki::CmdResult::Error; + + if(strcmp(basicKeys[i], "name") == 0) + { + const char* keyvalue = json[basicKeys[i]]; + + if(strlen(keyvalue) <= 32) + { + if(strcmp((const char*)_nukiConfig.name, keyvalue) == 0) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiOpener.setName(std::string(keyvalue)); + } + else jsonResult[basicKeys[i]] = "valuetoolong"; + } + else if(strcmp(basicKeys[i], "latitude") == 0) + { + const float keyvalue = atof(json[basicKeys[i]]); + + if(keyvalue > 0) + { + if(_nukiConfig.latitide == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else jsonResult[basicKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setLatitude(keyvalue); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "longitude") == 0) + { + const float keyvalue = atof(json[basicKeys[i]]); + + if(keyvalue > 0) + { + if(_nukiConfig.longitude == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else jsonResult[basicKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setLongitude(keyvalue); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "pairingEnabled") == 0) + { + const uint8_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiConfig.pairingEnabled == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiOpener.enablePairing((keyvalue > 0)); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "buttonEnabled") == 0) + { + const uint8_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiConfig.buttonEnabled == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiOpener.enableButton((keyvalue > 0)); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "ledFlashEnabled") == 0) + { + const uint8_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiConfig.ledFlashEnabled == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiOpener.enableLedFlash((keyvalue > 0)); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "timeZoneOffset") == 0) + { + const int16_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue >= 0 && keyvalue <= 60) + { + if(_nukiConfig.timeZoneOffset == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiOpener.setTimeZoneOffset(keyvalue); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "dstMode") == 0) + { + const uint8_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiConfig.dstMode == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiOpener.enableDst((keyvalue > 0)); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "fobAction1") == 0) + { + const uint8_t fobAct1 = nukiOpenerInst->fobActionToInt(json[basicKeys[i]]); + + if(fobAct1 != 99) + { + if(_nukiConfig.fobAction1 == fobAct1) jsonResult[basicKeys[i]] = "unchanged"; + else jsonResult[basicKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setFobAction(1, fobAct1); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "fobAction2") == 0) + { + const uint8_t fobAct2 = nukiOpenerInst->fobActionToInt(json[basicKeys[i]]); + + if(fobAct2 != 99) + { + if(_nukiConfig.fobAction2 == fobAct2) jsonResult[basicKeys[i]] = "unchanged"; + else jsonResult[basicKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setFobAction(2, fobAct2); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "fobAction3") == 0) + { + const uint8_t fobAct3 = nukiOpenerInst->fobActionToInt(json[basicKeys[i]]); + + if(fobAct3 != 99) + { + if(_nukiConfig.fobAction3 == fobAct3) jsonResult[basicKeys[i]] = "unchanged"; + else jsonResult[basicKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setFobAction(3, fobAct3); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "operatingMode") == 0) + { + const uint8_t opmode = nukiOpenerInst->operatingModeToInt(json[basicKeys[i]]); + + if(opmode != 99) + { + if(_nukiConfig.operatingMode == opmode) jsonResult[basicKeys[i]] = "unchanged"; + else jsonResult[basicKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setOperatingMode(opmode); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "advertisingMode") == 0) + { + Nuki::AdvertisingMode advmode = nukiOpenerInst->advertisingModeToEnum(json[basicKeys[i]]); + + if(!(int)advmode == 0xff) + { + if(_nukiConfig.advertisingMode == advmode) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiOpener.setAdvertisingMode(advmode); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "timeZone") == 0) + { + Nuki::TimeZoneId tzid = nukiOpenerInst->timeZoneToEnum(json[basicKeys[i]]); + + if(!(int)tzid == 0xff) + { + if(_nukiConfig.timeZoneId == tzid) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiOpener.setTimeZoneId(tzid); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + + if(cmdResult == Nuki::CmdResult::Success) basicUpdated = true; + + if(!jsonResult[basicKeys[i]]) { + char resultStr[15] = {0}; + NukiOpener::cmdResultToString(cmdResult, resultStr); + jsonResult[basicKeys[i]] = resultStr; + } + } + else jsonResult[basicKeys[i]] = "accessdenied"; + } } - if((int)action == 0xff) + for(int i=0; i < 20; i++) { - return ConfigUpdateResult::UnknownAction; + if(json[advancedKeys[i]]) + { + if((int)advancedOpenerConfigAclPrefs[i] == 1) + { + cmdResult = Nuki::CmdResult::Error; + + if(strcmp(advancedKeys[i], "intercomID") == 0) + { + const uint16_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 0) + { + if(_nukiAdvancedConfig.intercomID == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setIntercomID(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "busModeSwitch") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.busModeSwitch == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setBusModeSwitch((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "shortCircuitDaration") == 0) + { + const uint16_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 0) + { + if(_nukiAdvancedConfig.shortCircuitDaration == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setShortCircuitDaration(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "electricStrikeDelay") == 0) + { + const uint16_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 0 && keyvalue <= 30000) + { + if(_nukiAdvancedConfig.electricStrikeDelay == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setElectricStrikeDelay(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "randomElectricStrikeDelay") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.randomElectricStrikeDelay == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.enableRandomElectricStrikeDelay((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "electricStrikeDuration") == 0) + { + const uint16_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 1000 && keyvalue <= 30000) + { + if(_nukiAdvancedConfig.electricStrikeDuration == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setElectricStrikeDuration(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "disableRtoAfterRing") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.disableRtoAfterRing == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.disableRtoAfterRing((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "rtoTimeout") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 5 && keyvalue <= 60) + { + if(_nukiAdvancedConfig.rtoTimeout == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setRtoTimeout(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "doorbellSuppression") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 0) + { + if(_nukiAdvancedConfig.doorbellSuppression == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setDoorbellSuppression(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "doorbellSuppressionDuration") == 0) + { + const uint16_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 500 && keyvalue <= 10000) + { + if(_nukiAdvancedConfig.doorbellSuppressionDuration == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setDoorbellSuppressionDuration(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "soundRing") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 0 && keyvalue <= 3) + { + if(_nukiAdvancedConfig.soundRing == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setSoundRing(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "soundOpen") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 0 && keyvalue <= 3) + { + if(_nukiAdvancedConfig.soundOpen == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setSoundOpen(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "soundRto") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 0 && keyvalue <= 3) + { + if(_nukiAdvancedConfig.soundRto == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setSoundRto(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "soundCm") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 0 && keyvalue <= 3) + { + if(_nukiAdvancedConfig.soundCm == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.setSoundCm(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "soundConfirmation") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.soundConfirmation == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiOpener.enableSoundConfirmation((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "soundLevel") == 0) + { + const uint8_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue >= 0 && keyvalue <= 5) + { + if(_nukiAdvancedConfig.soundLevel == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiOpener.setSoundLevel(keyvalue); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "singleButtonPressAction") == 0) + { + NukiOpener::ButtonPressAction sbpa = nukiOpenerInst->buttonPressActionToEnum(json[advancedKeys[i]]); + + if(!(int)sbpa == 0xff) + { + if(_nukiAdvancedConfig.singleButtonPressAction == sbpa) jsonResult[advancedKeys[i]] = "unchanged"; + else cmdResult = _nukiOpener.setSingleButtonPressAction(sbpa); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "doubleButtonPressAction") == 0) + { + NukiOpener::ButtonPressAction dbpa = nukiOpenerInst->buttonPressActionToEnum(json[advancedKeys[i]]); + + if(!(int)dbpa == 0xff) + { + if(_nukiAdvancedConfig.doubleButtonPressAction == dbpa) jsonResult[advancedKeys[i]] = "unchanged"; + else cmdResult = _nukiOpener.setDoubleButtonPressAction(dbpa); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "batteryType") == 0) + { + Nuki::BatteryType battype = nukiOpenerInst->batteryTypeToEnum(json[advancedKeys[i]]); + + if(!(int)battype == 0xff) + { + if(_nukiAdvancedConfig.batteryType == battype) jsonResult[advancedKeys[i]] = "unchanged"; + else cmdResult = _nukiOpener.setBatteryType(battype); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "automaticBatteryTypeDetection") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.automaticBatteryTypeDetection == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else cmdResult = _nukiOpener.enableAutoBatteryTypeDetection((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + + if(cmdResult == Nuki::CmdResult::Success) advancedUpdated = true; + + if(!jsonResult[advancedKeys[i]]) { + char resultStr[15] = {0}; + NukiOpener::cmdResultToString(cmdResult, resultStr); + jsonResult[advancedKeys[i]] = resultStr; + } + } + else jsonResult[advancedKeys[i]] = "accessdenied"; + } } - if(strcmp(topic, mqtt_topic_config_button_enabled) == 0) + nukiOpenerPreferences->end(); + + if(basicUpdated || advancedUpdated) { - bool newValue = atoi(value) > 0; - if(!_nukiConfigValid || _nukiConfig.buttonEnabled == newValue) return; - _nukiOpener.enableButton(newValue); _nextConfigUpdateTs = millis() + 300; + jsonResult["general"] = "success"; } - if(strcmp(topic, mqtt_topic_config_led_enabled) == 0) - { - bool newValue = atoi(value) > 0; - if(!_nukiConfigValid || _nukiConfig.ledFlashEnabled == newValue) return; - _nukiOpener.enableLedFlash(newValue); - _nextConfigUpdateTs = millis() + 300; - } - if(strcmp(topic, mqtt_topic_config_sound_level) == 0) - { - uint8_t newValue = atoi(value); - if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.soundLevel == newValue) return; - _nukiOpener.setSoundLevel(newValue); - _nextConfigUpdateTs = millis() + 300; - } - */ + else jsonResult["general"] = "nochange"; + + serializeJson(jsonResult, _resbuf, sizeof(_resbuf)); + _network->publishConfigCommandResult(_resbuf); + + return; } void NukiOpenerWrapper::onKeypadCommandReceivedCallback(const char *command, const uint &id, const String &name, const String &code, const int& enabled) @@ -810,7 +1350,7 @@ void NukiOpenerWrapper::setupHASS() char uidString[20]; itoa(_nukiConfig.nukiId, uidString, 16); - if (_preferences->getBool(preference_opener_continuous_mode)) + if(_preferences->getBool(preference_opener_continuous_mode)) { _network->publishHASSConfig("Opener", baseTopic.c_str(), (char*)_nukiConfig.name, uidString, "deactivateCM", "activateCM", "electricStrikeActuation"); } @@ -831,7 +1371,7 @@ void NukiOpenerWrapper::disableHASS() Nuki::CmdResult result = _nukiOpener.requestConfig(&_nukiConfig); _nukiConfigValid = result == Nuki::CmdResult::Success; } - if (_nukiConfigValid) + if(_nukiConfigValid) { char uidString[20]; itoa(_nukiConfig.nukiId, uidString, 16); diff --git a/NukiOpenerWrapper.h b/NukiOpenerWrapper.h index ba29a65..9757c8e 100644 --- a/NukiOpenerWrapper.h +++ b/NukiOpenerWrapper.h @@ -47,10 +47,11 @@ public: private: static LockActionResult onLockActionReceivedCallback(const char* value); - static ConfigUpdateResult onConfigUpdateReceivedCallback(const char* value); + static void onConfigUpdateReceivedCallback(const char* value); static void onKeypadCommandReceivedCallback(const char* command, const uint& id, const String& name, const String& code, const int& enabled); static void gpioActionCallback(const GpioAction& action, const int& pin); void onKeypadCommandReceived(const char* command, const uint& id, const String& name, const String& code, const int& enabled); + void onConfigUpdateReceived(const char* value); void updateKeyTurnerState(); void updateBatteryState(); @@ -69,6 +70,12 @@ private: void printCommandResult(Nuki::CmdResult result); NukiOpener::LockAction lockActionToEnum(const char* str); // char array at least 14 characters + Nuki::AdvertisingMode advertisingModeToEnum(const char* str); + Nuki::TimeZoneId timeZoneToEnum(const char* str); + uint8_t fobActionToInt(const char *str); + uint8_t operatingModeToInt(const char *str); + NukiOpener::ButtonPressAction buttonPressActionToEnum(const char* str); + Nuki::BatteryType batteryTypeToEnum(const char* str); std::string _deviceName; NukiDeviceId* _deviceId = nullptr; diff --git a/NukiWrapper.cpp b/NukiWrapper.cpp index e76f2f9..9a72f5b 100644 --- a/NukiWrapper.cpp +++ b/NukiWrapper.cpp @@ -128,7 +128,7 @@ void NukiWrapper::initialize(const bool& firstStart) void NukiWrapper::update() { - if (!_paired) + if(!_paired) { Log->println(F("Nuki lock start pairing")); _network->publishBleAddress(""); @@ -137,7 +137,7 @@ void NukiWrapper::update() Nuki::AuthorizationIdType::App : Nuki::AuthorizationIdType::Bridge; - if (_nukiLock.pairNuki(idType) == Nuki::PairingResult::Success) + if(_nukiLock.pairNuki(idType) == Nuki::PairingResult::Success) { Log->println(F("Nuki paired")); _paired = true; @@ -228,7 +228,7 @@ void NukiWrapper::update() _retryCount = 0; _nextLockAction = (NukiLock::LockAction) 0xff; _network->publishRetry("--"); - if (_intervalLockstate > 10) + if(_intervalLockstate > 10) { _nextLockStateUpdateTs = ts + 10 * 1000; } @@ -522,77 +522,621 @@ LockActionResult NukiWrapper::onLockActionReceivedCallback(const char *value) return LockActionResult::AccessDenied; } -ConfigUpdateResult NukiWrapper::onConfigUpdateReceivedCallback(const char *value) +void NukiWrapper::onConfigUpdateReceivedCallback(const char *value) { + nukiInst->onConfigUpdateReceived(value); +} + +Nuki::AdvertisingMode NukiWrapper::advertisingModeToEnum(const char *str) +{ + if(strcmp(str, "automatic") == 0) return Nuki::AdvertisingMode::Automatic; + else if(strcmp(str, "normal") == 0) return Nuki::AdvertisingMode::Normal; + else if(strcmp(str, "slow") == 0) return Nuki::AdvertisingMode::Slow; + else if(strcmp(str, "slowest") == 0) return Nuki::AdvertisingMode::Slowest; + return (Nuki::AdvertisingMode)0xff; +} + +Nuki::TimeZoneId NukiWrapper::timeZoneToEnum(const char *str) +{ + if(strcmp(str, "Africa/Cairo") == 0) return Nuki::TimeZoneId::Africa_Cairo; + else if(strcmp(str, "Africa/Lagos") == 0) return Nuki::TimeZoneId::Africa_Lagos; + else if(strcmp(str, "Africa/Maputo") == 0) return Nuki::TimeZoneId::Africa_Maputo; + else if(strcmp(str, "Africa/Nairobi") == 0) return Nuki::TimeZoneId::Africa_Nairobi; + else if(strcmp(str, "America/Anchorage") == 0) return Nuki::TimeZoneId::America_Anchorage; + else if(strcmp(str, "America/Argentina/Buenos_Aires") == 0) return Nuki::TimeZoneId::America_Argentina_Buenos_Aires; + else if(strcmp(str, "America/Chicago") == 0) return Nuki::TimeZoneId::America_Chicago; + else if(strcmp(str, "America/Denver") == 0) return Nuki::TimeZoneId::America_Denver; + else if(strcmp(str, "America/Halifax") == 0) return Nuki::TimeZoneId::America_Halifax; + else if(strcmp(str, "America/Los_Angeles") == 0) return Nuki::TimeZoneId::America_Los_Angeles; + else if(strcmp(str, "America/Manaus") == 0) return Nuki::TimeZoneId::America_Manaus; + else if(strcmp(str, "America/Mexico_City") == 0) return Nuki::TimeZoneId::America_Mexico_City; + else if(strcmp(str, "America/New_York") == 0) return Nuki::TimeZoneId::America_New_York; + else if(strcmp(str, "America/Phoenix") == 0) return Nuki::TimeZoneId::America_Phoenix; + else if(strcmp(str, "America/Regina") == 0) return Nuki::TimeZoneId::America_Regina; + else if(strcmp(str, "America/Santiago") == 0) return Nuki::TimeZoneId::America_Santiago; + else if(strcmp(str, "America/Sao_Paulo") == 0) return Nuki::TimeZoneId::America_Sao_Paulo; + else if(strcmp(str, "America/St_Johns") == 0) return Nuki::TimeZoneId::America_St_Johns; + else if(strcmp(str, "Asia/Bangkok") == 0) return Nuki::TimeZoneId::Asia_Bangkok; + else if(strcmp(str, "Asia/Dubai") == 0) return Nuki::TimeZoneId::Asia_Dubai; + else if(strcmp(str, "Asia/Hong_Kong") == 0) return Nuki::TimeZoneId::Asia_Hong_Kong; + else if(strcmp(str, "Asia/Jerusalem") == 0) return Nuki::TimeZoneId::Asia_Jerusalem; + else if(strcmp(str, "Asia/Karachi") == 0) return Nuki::TimeZoneId::Asia_Karachi; + else if(strcmp(str, "Asia/Kathmandu") == 0) return Nuki::TimeZoneId::Asia_Kathmandu; + else if(strcmp(str, "Asia/Kolkata") == 0) return Nuki::TimeZoneId::Asia_Kolkata; + else if(strcmp(str, "Asia/Riyadh") == 0) return Nuki::TimeZoneId::Asia_Riyadh; + else if(strcmp(str, "Asia/Seoul") == 0) return Nuki::TimeZoneId::Asia_Seoul; + else if(strcmp(str, "Asia/Shanghai") == 0) return Nuki::TimeZoneId::Asia_Shanghai; + else if(strcmp(str, "Asia/Tehran") == 0) return Nuki::TimeZoneId::Asia_Tehran; + else if(strcmp(str, "Asia/Tokyo") == 0) return Nuki::TimeZoneId::Asia_Tokyo; + else if(strcmp(str, "Asia/Yangon") == 0) return Nuki::TimeZoneId::Asia_Yangon; + else if(strcmp(str, "Australia/Adelaide") == 0) return Nuki::TimeZoneId::Australia_Adelaide; + else if(strcmp(str, "Australia/Brisbane") == 0) return Nuki::TimeZoneId::Australia_Brisbane; + else if(strcmp(str, "Australia/Darwin") == 0) return Nuki::TimeZoneId::Australia_Darwin; + else if(strcmp(str, "Australia/Hobart") == 0) return Nuki::TimeZoneId::Australia_Hobart; + else if(strcmp(str, "Australia/Perth") == 0) return Nuki::TimeZoneId::Australia_Perth; + else if(strcmp(str, "Australia/Sydney") == 0) return Nuki::TimeZoneId::Australia_Sydney; + else if(strcmp(str, "Europe/Berlin") == 0) return Nuki::TimeZoneId::Europe_Berlin; + else if(strcmp(str, "Europe/Helsinki") == 0) return Nuki::TimeZoneId::Europe_Helsinki; + else if(strcmp(str, "Europe/Istanbul") == 0) return Nuki::TimeZoneId::Europe_Istanbul; + else if(strcmp(str, "Europe/London") == 0) return Nuki::TimeZoneId::Europe_London; + else if(strcmp(str, "Europe/Moscow") == 0) return Nuki::TimeZoneId::Europe_Moscow; + else if(strcmp(str, "Pacific/Auckland") == 0) return Nuki::TimeZoneId::Pacific_Auckland; + else if(strcmp(str, "Pacific/Guam") == 0) return Nuki::TimeZoneId::Pacific_Guam; + else if(strcmp(str, "Pacific/Honolulu") == 0) return Nuki::TimeZoneId::Pacific_Honolulu; + else if(strcmp(str, "Pacific/Pago_Pago") == 0) return Nuki::TimeZoneId::Pacific_Pago_Pago; + else if(strcmp(str, "none") == 0) return Nuki::TimeZoneId::None; + return (Nuki::TimeZoneId)0xff; +} + +uint8_t NukiWrapper::fobActionToInt(const char *str) +{ + if(strcmp(str, "noaction") == 0) return 0; + else if(strcmp(str, "unlock") == 0) return 1; + else if(strcmp(str, "lock") == 0) return 2; + else if(strcmp(str, "lockngo") == 0) return 3; + else if(strcmp(str, "intelligent") == 0) return 4; + return 99; +} + +NukiLock::ButtonPressAction NukiWrapper::buttonPressActionToEnum(const char* str) +{ + if(strcmp(str, "noaction") == 0) return NukiLock::ButtonPressAction::NoAction; + else if(strcmp(str, "intelligent") == 0) return NukiLock::ButtonPressAction::Intelligent; + else if(strcmp(str, "unlock") == 0) return NukiLock::ButtonPressAction::Unlock; + else if(strcmp(str, "lock") == 0) return NukiLock::ButtonPressAction::Lock; + else if(strcmp(str, "unlatch") == 0) return NukiLock::ButtonPressAction::Unlatch; + else if(strcmp(str, "lockngo") == 0) return NukiLock::ButtonPressAction::LockNgo; + else if(strcmp(str, "showstatus") == 0) return NukiLock::ButtonPressAction::ShowStatus; + return (NukiLock::ButtonPressAction)0xff; +} + +Nuki::BatteryType NukiWrapper::batteryTypeToEnum(const char* str) +{ + if(strcmp(str, "alkali") == 0) return Nuki::BatteryType::Alkali; + else if(strcmp(str, "accumulators") == 0) return Nuki::BatteryType::Accumulators; + else if(strcmp(str, "lithium") == 0) return Nuki::BatteryType::Lithium; + return (Nuki::BatteryType)0xff; +} + +void NukiWrapper::onConfigUpdateReceived(const char *value) +{ + DynamicJsonDocument jsonResult(2048); + char _resbuf[2048]; + + DynamicJsonDocument json(2048); + DeserializationError jsonError = deserializeJson(json, value); + + if(jsonError) + { + jsonResult["general"] = "invalidjson"; + serializeJson(jsonResult, _resbuf, sizeof(_resbuf)); + _network->publishConfigCommandResult(_resbuf); + return; + } + + updateConfig(); + + if(!_nukiConfigValid || !_nukiAdvancedConfigValid) + { + jsonResult["general"] = "invalidconfig"; + serializeJson(jsonResult, _resbuf, sizeof(_resbuf)); + _network->publishConfigCommandResult(_resbuf); + return; + } + + //MISSING BASIC: "latitude", "longitude", "autoUnlatch", "fobAction1", "fobAction2", "fobAction3" + //MISSING ADVANCED: "unlockedPositionOffsetDegrees", "lockedPositionOffsetDegrees", "singleLockedPositionOffsetDegrees", "unlockedToLockedTransitionOffsetDegrees", "lockNgoTimeout", "detachedCylinder", "unlatchDuration", "autoLockTimeOut", "nightModeEnabled", "nightModeStartTime", "nightModeEndTime", "nightModeAutoLockEnabled", "nightModeAutoUnlockDisabled", "nightModeImmediateLockOnStart" + + Nuki::CmdResult cmdResult; + const char *basicKeys[] = {"name", "latitude", "longitude", "autoUnlatch", "pairingEnabled", "buttonEnabled", "ledEnabled", "ledBrightness", "timeZoneOffset", "dstMode", "fobAction1", "fobAction2", "fobAction3", "singleLock", "advertisingMode", "timeZone"}; + const char *advancedKeys[] = {"unlockedPositionOffsetDegrees", "lockedPositionOffsetDegrees", "singleLockedPositionOffsetDegrees", "unlockedToLockedTransitionOffsetDegrees", "lockNgoTimeout", "singleButtonPressAction", "doubleButtonPressAction", "detachedCylinder", "batteryType", "automaticBatteryTypeDetection", "unlatchDuration", "autoLockTimeOut", "autoUnLockDisabled", "nightModeEnabled", "nightModeStartTime", "nightModeEndTime", "nightModeAutoLockEnabled", "nightModeAutoUnlockDisabled", "nightModeImmediateLockOnStart", "autoLockEnabled", "immediateAutoLockEnabled", "autoUpdateEnabled"}; + bool basicUpdated = false; + bool advancedUpdated = false; + uint32_t basicLockConfigAclPrefs[16]; + uint32_t advancedLockConfigAclPrefs[22]; + nukiLockPreferences = new Preferences(); nukiLockPreferences->begin("nukihub", true); - uint32_t basicLockConfigAclPrefs[16]; nukiLockPreferences->getBytes(preference_conf_lock_basic_acl, &basicLockConfigAclPrefs, sizeof(basicLockConfigAclPrefs)); - uint32_t advancedLockConfigAclPrefs[22]; nukiLockPreferences->getBytes(preference_conf_lock_advanced_acl, &advancedLockConfigAclPrefs, sizeof(advancedLockConfigAclPrefs)); - - /* - if(!nukiLockPreferences->getBool(preference_admin_enabled)) + + for(int i=0; i < 16; i++) { - nukiLockPreferences->end(); - return ConfigUpdateResult::AccessDenied; + if(json[basicKeys[i]]) + { + if((int)basicLockConfigAclPrefs[i] == 1) + { + cmdResult = Nuki::CmdResult::Error; + + if(strcmp(basicKeys[i], "name") == 0) + { + const char* keyvalue = json[basicKeys[i]]; + + if(strlen(keyvalue) <= 32) + { + if(strcmp((const char*)_nukiConfig.name, keyvalue) == 0) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.setName(std::string(keyvalue)); + } + else jsonResult[basicKeys[i]] = "valuetoolong"; + } + else if(strcmp(basicKeys[i], "latitude") == 0) + { + const float keyvalue = atof(json[basicKeys[i]]); + + if(keyvalue > 0) + { + if(_nukiConfig.latitide == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else jsonResult[basicKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setLatitude(keyvalue); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "longitude") == 0) + { + const float keyvalue = atof(json[basicKeys[i]]); + + if(keyvalue > 0) + { + if(_nukiConfig.longitude == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else jsonResult[basicKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setLongitude(keyvalue); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "autoUnlatch") == 0) + { + const uint8_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiConfig.autoUnlatch == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else jsonResult[basicKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.enableAutoUnlatch((keyvalue > 0)); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "pairingEnabled") == 0) + { + const uint8_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiConfig.pairingEnabled == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.enablePairing((keyvalue > 0)); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "buttonEnabled") == 0) + { + const uint8_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiConfig.buttonEnabled == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.enableButton((keyvalue > 0)); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "ledEnabled") == 0) + { + const uint8_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiConfig.ledEnabled == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.enableLedFlash((keyvalue > 0)); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "ledBrightness") == 0) + { + const uint8_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue >= 0 && keyvalue <= 5) + { + if(_nukiConfig.ledBrightness == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.setLedBrightness(keyvalue); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "timeZoneOffset") == 0) + { + const int16_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue >= 0 && keyvalue <= 60) + { + if(_nukiConfig.timeZoneOffset == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.setTimeZoneOffset(keyvalue); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "dstMode") == 0) + { + const uint8_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiConfig.dstMode == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.enableDst((keyvalue > 0)); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "fobAction1") == 0) + { + const uint8_t fobAct1 = nukiInst->fobActionToInt(json[basicKeys[i]]); + + if(fobAct1 != 99) + { + if(_nukiConfig.fobAction1 == fobAct1) jsonResult[basicKeys[i]] = "unchanged"; + else jsonResult[basicKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setFobAction(1, fobAct1); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "fobAction2") == 0) + { + const uint8_t fobAct2 = nukiInst->fobActionToInt(json[basicKeys[i]]); + + if(fobAct2 != 99) + { + if(_nukiConfig.fobAction2 == fobAct2) jsonResult[basicKeys[i]] = "unchanged"; + else jsonResult[basicKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setFobAction(2, fobAct2); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "fobAction3") == 0) + { + const uint8_t fobAct3 = nukiInst->fobActionToInt(json[basicKeys[i]]); + + if(fobAct3 != 99) + { + if(_nukiConfig.fobAction3 == fobAct3) jsonResult[basicKeys[i]] = "unchanged"; + else jsonResult[basicKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setFobAction(3, fobAct3); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "singleLock") == 0) + { + const uint8_t keyvalue = atoi(json[basicKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiConfig.singleLock == keyvalue) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.enableSingleLock((keyvalue > 0)); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "advertisingMode") == 0) + { + Nuki::AdvertisingMode advmode = nukiInst->advertisingModeToEnum(json[basicKeys[i]]); + + if(!(int)advmode == 0xff) + { + if(_nukiConfig.advertisingMode == advmode) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.setAdvertisingMode(advmode); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + else if(strcmp(basicKeys[i], "timeZone") == 0) + { + Nuki::TimeZoneId tzid = nukiInst->timeZoneToEnum(json[basicKeys[i]]); + + if(!(int)tzid == 0xff) + { + if(_nukiConfig.timeZoneId == tzid) jsonResult[basicKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.setTimeZoneId(tzid); + } + else jsonResult[basicKeys[i]] = "invalidvalue"; + } + + if(cmdResult == Nuki::CmdResult::Success) basicUpdated = true; + + if(!jsonResult[basicKeys[i]]) { + char resultStr[15] = {0}; + NukiLock::cmdResultToString(cmdResult, resultStr); + jsonResult[basicKeys[i]] = resultStr; + } + } + else jsonResult[basicKeys[i]] = "accessdenied"; + } } - if((int)action == 0xff) + for(int i=0; i < 22; i++) { - return LockActionResult::UnknownAction; + if(json[advancedKeys[i]]) + { + if((int)advancedLockConfigAclPrefs[i] == 1) + { + cmdResult = Nuki::CmdResult::Error; + + if(strcmp(advancedKeys[i], "unlockedPositionOffsetDegrees") == 0) + { + const int16_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= -90 && keyvalue <= 180) + { + if(_nukiAdvancedConfig.unlockedPositionOffsetDegrees == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setUnlockedPositionOffsetDegrees(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "lockedPositionOffsetDegrees") == 0) + { + const int16_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= -180 && keyvalue <= 90) + { + if(_nukiAdvancedConfig.lockedPositionOffsetDegrees == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setLockedPositionOffsetDegrees(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "singleLockedPositionOffsetDegrees") == 0) + { + const int16_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= -180 && keyvalue <= 180) + { + if(_nukiAdvancedConfig.singleLockedPositionOffsetDegrees == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setSingleLockedPositionOffsetDegrees(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "unlockedToLockedTransitionOffsetDegrees") == 0) + { + const int16_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= -180 && keyvalue <= 180) + { + if(_nukiAdvancedConfig.unlockedToLockedTransitionOffsetDegrees == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setUnlockedToLockedTransitionOffsetDegrees(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "lockNgoTimeout") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 5 && keyvalue <= 60) + { + if(_nukiAdvancedConfig.lockNgoTimeout == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setLockNgoTimeout(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "singleButtonPressAction") == 0) + { + NukiLock::ButtonPressAction sbpa = nukiInst->buttonPressActionToEnum(json[advancedKeys[i]]); + + if(!(int)sbpa == 0xff) + { + if(_nukiAdvancedConfig.singleButtonPressAction == sbpa) jsonResult[advancedKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.setSingleButtonPressAction(sbpa); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "doubleButtonPressAction") == 0) + { + NukiLock::ButtonPressAction dbpa = nukiInst->buttonPressActionToEnum(json[advancedKeys[i]]); + + if(!(int)dbpa == 0xff) + { + if(_nukiAdvancedConfig.doubleButtonPressAction == dbpa) jsonResult[advancedKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.setDoubleButtonPressAction(dbpa); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "detachedCylinder") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.detachedCylinder == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.enableDetachedCylinder((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "batteryType") == 0) + { + Nuki::BatteryType battype = nukiInst->batteryTypeToEnum(json[advancedKeys[i]]); + + if(!(int)battype == 0xff) + { + if(_nukiAdvancedConfig.batteryType == battype) jsonResult[advancedKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.setBatteryType(battype); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "automaticBatteryTypeDetection") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.automaticBatteryTypeDetection == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.enableAutoBatteryTypeDetection((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "unlatchDuration") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 1 && keyvalue <= 30) + { + if(_nukiAdvancedConfig.unlatchDuration == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setUnlatchDuration(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "autoLockTimeOut") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue >= 30 && keyvalue <= 180) + { + if(_nukiAdvancedConfig.autoLockTimeOut == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setAutoLockTimeOut(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "autoUnLockDisabled") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.autoUnLockDisabled == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.disableAutoUnlock((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "nightModeEnabled") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.nightModeEnabled == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.enableNightMode((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "nightModeStartTime") == 0) + { + String keystr = json[advancedKeys[i]]; + unsigned char keyvalue[2]; + keyvalue[1] = (uint8_t)atoi(keystr.substring(0, 2).c_str()); + keyvalue[2] = (uint8_t)atoi(keystr.substring(3, 5).c_str()); + if(keyvalue[0] >= 0 && keyvalue[0] <= 23 && keyvalue[1] >= 0 && keyvalue[1] <= 59) + { + if(_nukiAdvancedConfig.nightModeStartTime == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setNightModeStartTime(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "nightModeEndTime") == 0) + { + String keystr = json[advancedKeys[i]]; + unsigned char keyvalue[2]; + keyvalue[1] = (uint8_t)atoi(keystr.substring(0, 2).c_str()); + keyvalue[2] = (uint8_t)atoi(keystr.substring(3, 5).c_str()); + if(keyvalue[0] >= 0 && keyvalue[0] <= 23 && keyvalue[1] >= 0 && keyvalue[1] <= 59) + { + if(_nukiAdvancedConfig.nightModeEndTime == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.setNightModeEndTime(keyvalue); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "nightModeAutoLockEnabled") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.nightModeAutoLockEnabled == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.enableNightModeAutoLock((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "nightModeAutoUnlockDisabled") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.nightModeAutoUnlockDisabled == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.disableNightModeAutoUnlock((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "nightModeImmediateLockOnStart") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.nightModeImmediateLockOnStart == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else jsonResult[advancedKeys[i]] = "notimplemented"; //cmdResult = _nukiLock.enableNightModeImmediateLockOnStart((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "autoLockEnabled") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.autoLockEnabled == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.enableAutoLock((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "immediateAutoLockEnabled") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.immediateAutoLockEnabled == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.enableImmediateAutoLock((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + else if(strcmp(advancedKeys[i], "autoUpdateEnabled") == 0) + { + const uint8_t keyvalue = atoi(json[advancedKeys[i]]); + + if(keyvalue == 0 || keyvalue == 1) + { + if(_nukiAdvancedConfig.autoUpdateEnabled == keyvalue) jsonResult[advancedKeys[i]] = "unchanged"; + else cmdResult = _nukiLock.enableAutoUpdate((keyvalue > 0)); + } + else jsonResult[advancedKeys[i]] = "invalidvalue"; + } + + if(cmdResult == Nuki::CmdResult::Success) advancedUpdated = true; + + if(!jsonResult[advancedKeys[i]]) { + char resultStr[15] = {0}; + NukiLock::cmdResultToString(cmdResult, resultStr); + jsonResult[advancedKeys[i]] = resultStr; + } + } + else jsonResult[advancedKeys[i]] = "accessdenied"; + } } - if((action == NukiLock::LockAction::Lock && (int)aclPrefs[0] == 1) || (action == NukiLock::LockAction::Unlock && (int)aclPrefs[1] == 1) || (action == NukiLock::LockAction::Unlatch && (int)aclPrefs[2] == 1) || (action == NukiLock::LockAction::LockNgo && (int)aclPrefs[3] == 1) || (action == NukiLock::LockAction::LockNgoUnlatch && (int)aclPrefs[4] == 1) || (action == NukiLock::LockAction::FullLock && (int)aclPrefs[5] == 1) || (action == NukiLock::LockAction::FobAction1 && (int)aclPrefs[6] == 1) || (action == NukiLock::LockAction::FobAction2 && (int)aclPrefs[7] == 1) || (action == NukiLock::LockAction::FobAction3 && (int)aclPrefs[8] == 1)) - { - nukiLockPreferences->end(); - nukiInst->_nextLockAction = action; - return LockActionResult::Success; - } + nukiLockPreferences->end(); - if(strcmp(topic, mqtt_topic_config_button_enabled) == 0) + if(basicUpdated || advancedUpdated) { - bool newValue = atoi(value) > 0; - if(!_nukiConfigValid || _nukiConfig.buttonEnabled == newValue) return; - _nukiLock.enableButton(newValue); _nextConfigUpdateTs = millis() + 300; + jsonResult["general"] = "success"; } - if(strcmp(topic, mqtt_topic_config_led_enabled) == 0) - { - bool newValue = atoi(value) > 0; - if(!_nukiConfigValid || _nukiConfig.ledEnabled == newValue) return; - _nukiLock.enableLedFlash(newValue); - _nextConfigUpdateTs = millis() + 300; - } - else if(strcmp(topic, mqtt_topic_config_led_brightness) == 0) - { - int newValue = atoi(value); - if(!_nukiConfigValid || _nukiConfig.ledBrightness == newValue) return; - _nukiLock.setLedBrightness(newValue); - _nextConfigUpdateTs = millis() + 300; - } - if(strcmp(topic, mqtt_topic_config_single_lock) == 0) - { - bool newValue = atoi(value) > 0; - if(!_nukiConfigValid || _nukiConfig.singleLock == newValue) return; - _nukiLock.enableSingleLock(newValue); - _nextConfigUpdateTs = millis() + 300; - } - else if(strcmp(topic, mqtt_topic_config_auto_unlock) == 0) - { - bool newValue = !(atoi(value) > 0); - if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoUnLockDisabled == newValue) return; - _nukiLock.disableAutoUnlock(newValue); - _nextConfigUpdateTs = millis() + 300; - } - else if(strcmp(topic, mqtt_topic_config_auto_lock) == 0) - { - bool newValue = atoi(value) > 0; - if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoLockEnabled == newValue) return; - _nukiLock.enableAutoLock(newValue); - _nextConfigUpdateTs = millis() + 300; - } - */ + else jsonResult["general"] = "nochange"; + + serializeJson(jsonResult, _resbuf, sizeof(_resbuf)); + _network->publishConfigCommandResult(_resbuf); + + return; } void NukiWrapper::onKeypadCommandReceivedCallback(const char *command, const uint &id, const String &name, const String &code, const int& enabled) @@ -811,7 +1355,7 @@ void NukiWrapper::disableHASS() Nuki::CmdResult result = _nukiLock.requestConfig(&_nukiConfig); _nukiConfigValid = result == Nuki::CmdResult::Success; } - if (_nukiConfigValid) + if(_nukiConfigValid) { char uidString[20]; itoa(_nukiConfig.nukiId, uidString, 16); diff --git a/NukiWrapper.h b/NukiWrapper.h index 705ee2f..c2db2b9 100644 --- a/NukiWrapper.h +++ b/NukiWrapper.h @@ -7,7 +7,6 @@ #include "NukiLock.h" #include "Gpio.h" #include "LockActionResult.h" -#include "ConfigUpdateResult.h" #include "NukiDeviceId.h" class NukiWrapper : public Nuki::SmartlockEventHandler @@ -46,11 +45,12 @@ public: private: static LockActionResult onLockActionReceivedCallback(const char* value); - static ConfigUpdateResult onConfigUpdateReceivedCallback(const char* value); + static void onConfigUpdateReceivedCallback(const char* value); static void onKeypadCommandReceivedCallback(const char* command, const uint& id, const String& name, const String& code, const int& enabled); static void gpioActionCallback(const GpioAction& action, const int& pin); void onKeypadCommandReceived(const char* command, const uint& id, const String& name, const String& code, const int& enabled); - + void onConfigUpdateReceived(const char* value); + void updateKeyTurnerState(); void updateBatteryState(); void updateConfig(); @@ -68,6 +68,11 @@ private: void printCommandResult(Nuki::CmdResult result); NukiLock::LockAction lockActionToEnum(const char* str); // char array at least 14 characters + Nuki::AdvertisingMode advertisingModeToEnum(const char* str); + Nuki::TimeZoneId timeZoneToEnum(const char* str); + uint8_t fobActionToInt(const char *str); + NukiLock::ButtonPressAction buttonPressActionToEnum(const char* str); + Nuki::BatteryType batteryTypeToEnum(const char* str); std::string _deviceName; NukiDeviceId* _deviceId = nullptr;