From 838044242535f461610d4b5ff60060873fef19b0 Mon Sep 17 00:00:00 2001 From: iranl Date: Sun, 5 May 2024 20:51:06 +0200 Subject: [PATCH] Refractor --- Network.cpp | 186 ++++++++++++++++++++++++++++++++++++++++++++ Network.h | 4 + NetworkLock.cpp | 192 +--------------------------------------------- NetworkLock.h | 3 - NetworkOpener.cpp | 192 +--------------------------------------------- NetworkOpener.h | 3 - 6 files changed, 196 insertions(+), 384 deletions(-) diff --git a/Network.cpp b/Network.cpp index 5be4141..8155d0f 100644 --- a/Network.cpp +++ b/Network.cpp @@ -3287,6 +3287,192 @@ JsonDocument Network::createHassJson(const String& uidString, return json; } +void Network::batteryTypeToString(const Nuki::BatteryType battype, char* str) { + switch (battype) { + case Nuki::BatteryType::Alkali: + strcpy(str, "Alkali"); + break; + case Nuki::BatteryType::Accumulators: + strcpy(str, "Accumulators"); + break; + case Nuki::BatteryType::Lithium: + strcpy(str, "Lithium"); + break; + default: + strcpy(str, "undefined"); + break; + } +} + +void Network::advertisingModeToString(const Nuki::AdvertisingMode advmode, char* str) { + switch (advmode) { + case Nuki::AdvertisingMode::Automatic: + strcpy(str, "Automatic"); + break; + case Nuki::AdvertisingMode::Normal: + strcpy(str, "Normal"); + break; + case Nuki::AdvertisingMode::Slow: + strcpy(str, "Slow"); + break; + case Nuki::AdvertisingMode::Slowest: + strcpy(str, "Slowest"); + break; + default: + strcpy(str, "undefined"); + break; + } +} + +void Network::timeZoneIdToString(const Nuki::TimeZoneId timeZoneId, char* str) { + switch (timeZoneId) { + case Nuki::TimeZoneId::Africa_Cairo: + strcpy(str, "Africa/Cairo"); + break; + case Nuki::TimeZoneId::Africa_Lagos: + strcpy(str, "Africa/Lagos"); + break; + case Nuki::TimeZoneId::Africa_Maputo: + strcpy(str, "Africa/Maputo"); + break; + case Nuki::TimeZoneId::Africa_Nairobi: + strcpy(str, "Africa/Nairobi"); + break; + case Nuki::TimeZoneId::America_Anchorage: + strcpy(str, "America/Anchorage"); + break; + case Nuki::TimeZoneId::America_Argentina_Buenos_Aires: + strcpy(str, "America/Argentina/Buenos_Aires"); + break; + case Nuki::TimeZoneId::America_Chicago: + strcpy(str, "America/Chicago"); + break; + case Nuki::TimeZoneId::America_Denver: + strcpy(str, "America/Denver"); + break; + case Nuki::TimeZoneId::America_Halifax: + strcpy(str, "America/Halifax"); + break; + case Nuki::TimeZoneId::America_Los_Angeles: + strcpy(str, "America/Los_Angeles"); + break; + case Nuki::TimeZoneId::America_Manaus: + strcpy(str, "America/Manaus"); + break; + case Nuki::TimeZoneId::America_Mexico_City: + strcpy(str, "America/Mexico_City"); + break; + case Nuki::TimeZoneId::America_New_York: + strcpy(str, "America/New_York"); + break; + case Nuki::TimeZoneId::America_Phoenix: + strcpy(str, "America/Phoenix"); + break; + case Nuki::TimeZoneId::America_Regina: + strcpy(str, "America/Regina"); + break; + case Nuki::TimeZoneId::America_Santiago: + strcpy(str, "America/Santiago"); + break; + case Nuki::TimeZoneId::America_Sao_Paulo: + strcpy(str, "America/Sao_Paulo"); + break; + case Nuki::TimeZoneId::America_St_Johns: + strcpy(str, "America/St_Johns"); + break; + case Nuki::TimeZoneId::Asia_Bangkok: + strcpy(str, "Asia/Bangkok"); + break; + case Nuki::TimeZoneId::Asia_Dubai: + strcpy(str, "Asia/Dubai"); + break; + case Nuki::TimeZoneId::Asia_Hong_Kong: + strcpy(str, "Asia/Hong_Kong"); + break; + case Nuki::TimeZoneId::Asia_Jerusalem: + strcpy(str, "Asia/Jerusalem"); + break; + case Nuki::TimeZoneId::Asia_Karachi: + strcpy(str, "Asia/Karachi"); + break; + case Nuki::TimeZoneId::Asia_Kathmandu: + strcpy(str, "Asia/Kathmandu"); + break; + case Nuki::TimeZoneId::Asia_Kolkata: + strcpy(str, "Asia/Kolkata"); + break; + case Nuki::TimeZoneId::Asia_Riyadh: + strcpy(str, "Asia/Riyadh"); + break; + case Nuki::TimeZoneId::Asia_Seoul: + strcpy(str, "Asia/Seoul"); + break; + case Nuki::TimeZoneId::Asia_Shanghai: + strcpy(str, "Asia/Shanghai"); + break; + case Nuki::TimeZoneId::Asia_Tehran: + strcpy(str, "Asia/Tehran"); + break; + case Nuki::TimeZoneId::Asia_Tokyo: + strcpy(str, "Asia/Tokyo"); + break; + case Nuki::TimeZoneId::Asia_Yangon: + strcpy(str, "Asia/Yangon"); + break; + case Nuki::TimeZoneId::Australia_Adelaide: + strcpy(str, "Australia/Adelaide"); + break; + case Nuki::TimeZoneId::Australia_Brisbane: + strcpy(str, "Australia/Brisbane"); + break; + case Nuki::TimeZoneId::Australia_Darwin: + strcpy(str, "Australia/Darwin"); + break; + case Nuki::TimeZoneId::Australia_Hobart: + strcpy(str, "Australia/Hobart"); + break; + case Nuki::TimeZoneId::Australia_Perth: + strcpy(str, "Australia/Perth"); + break; + case Nuki::TimeZoneId::Australia_Sydney: + strcpy(str, "Australia/Sydney"); + break; + case Nuki::TimeZoneId::Europe_Berlin: + strcpy(str, "Europe/Berlin"); + break; + case Nuki::TimeZoneId::Europe_Helsinki: + strcpy(str, "Europe/Helsinki"); + break; + case Nuki::TimeZoneId::Europe_Istanbul: + strcpy(str, "Europe/Istanbul"); + break; + case Nuki::TimeZoneId::Europe_London: + strcpy(str, "Europe/London"); + break; + case Nuki::TimeZoneId::Europe_Moscow: + strcpy(str, "Europe/Moscow"); + break; + case Nuki::TimeZoneId::Pacific_Auckland: + strcpy(str, "Pacific/Auckland"); + break; + case Nuki::TimeZoneId::Pacific_Guam: + strcpy(str, "Pacific/Guam"); + break; + case Nuki::TimeZoneId::Pacific_Honolulu: + strcpy(str, "Pacific/Honolulu"); + break; + case Nuki::TimeZoneId::Pacific_Pago_Pago: + strcpy(str, "Pacific/Pago_Pago"); + break; + case Nuki::TimeZoneId::None: + strcpy(str, "None"); + break; + default: + strcpy(str, "undefined"); + break; + } +} + void Network::publishPresenceDetection(char *csv) { _presenceCsv = csv; diff --git a/Network.h b/Network.h index 89685b2..53b7d55 100644 --- a/Network.h +++ b/Network.h @@ -10,6 +10,7 @@ #include "Gpio.h" #include #include +#include "NukiConstants.h" enum class NetworkDeviceType { @@ -54,6 +55,9 @@ public: void publishHASSWifiRssiConfig(char* deviceType, const char* baseTopic, char* name, char* uidString); void removeHASSConfig(char* uidString); void removeHASSConfigTopic(char* deviceType, char* name, char* uidString); + void batteryTypeToString(const Nuki::BatteryType battype, char* str); + void advertisingModeToString(const Nuki::AdvertisingMode advmode, char* str); + void timeZoneIdToString(const Nuki::TimeZoneId timeZoneId, char* str); void clearWifiFallback(); diff --git a/NetworkLock.cpp b/NetworkLock.cpp index 8ca16d8..8e6a160 100644 --- a/NetworkLock.cpp +++ b/NetworkLock.cpp @@ -524,7 +524,7 @@ void NetworkLock::publishConfig(const NukiLock::Config &config) json["fobAction3"] = str; json["singleLock"] = config.singleLock; memset(str, 0, sizeof(str)); - advertisingModeToString(config.advertisingMode, str); + _network->advertisingModeToString(config.advertisingMode, str); json["advertisingMode"] = str; json["hasKeypad"] = config.hasKeypad; json["hasKeypadV2"] = config.hasKeypadV2; @@ -534,7 +534,7 @@ void NetworkLock::publishConfig(const NukiLock::Config &config) homeKitStatusToString(config.homeKitStatus, str); json["homeKitStatus"] = str; memset(str, 0, sizeof(str)); - timeZoneIdToString(config.timeZoneId, str); + _network->timeZoneIdToString(config.timeZoneId, str); json["timeZone"] = str; serializeJson(json, _buffer, _bufferSize); @@ -572,7 +572,7 @@ void NetworkLock::publishAdvancedConfig(const NukiLock::AdvancedConfig &config) json["doubleButtonPressAction"] = str; json["detachedCylinder"] = config.detachedCylinder; memset(str, 0, sizeof(str)); - batteryTypeToString(config.batteryType, str); + _network->batteryTypeToString(config.batteryType, str); json["batteryType"] = str; json["automaticBatteryTypeDetection"] = config.automaticBatteryTypeDetection; json["unlatchDuration"] = config.unlatchDuration; @@ -988,23 +988,6 @@ uint8_t NetworkLock::queryCommands() return qc; } -void NetworkLock::batteryTypeToString(const Nuki::BatteryType battype, char* str) { - switch (battype) { - case Nuki::BatteryType::Alkali: - strcpy(str, "Alkali"); - break; - case Nuki::BatteryType::Accumulators: - strcpy(str, "Accumulators"); - break; - case Nuki::BatteryType::Lithium: - strcpy(str, "Lithium"); - break; - default: - strcpy(str, "undefined"); - break; - } -} - void NetworkLock::buttonPressActionToString(const NukiLock::ButtonPressAction btnPressAction, char* str) { switch (btnPressAction) { case NukiLock::ButtonPressAction::NoAction: @@ -1034,175 +1017,6 @@ void NetworkLock::buttonPressActionToString(const NukiLock::ButtonPressAction bt } } -void NetworkLock::advertisingModeToString(const Nuki::AdvertisingMode advmode, char* str) { - switch (advmode) { - case Nuki::AdvertisingMode::Automatic: - strcpy(str, "Automatic"); - break; - case Nuki::AdvertisingMode::Normal: - strcpy(str, "Normal"); - break; - case Nuki::AdvertisingMode::Slow: - strcpy(str, "Slow"); - break; - case Nuki::AdvertisingMode::Slowest: - strcpy(str, "Slowest"); - break; - default: - strcpy(str, "undefined"); - break; - } -} - -void NetworkLock::timeZoneIdToString(const Nuki::TimeZoneId timeZoneId, char* str) { - switch (timeZoneId) { - case Nuki::TimeZoneId::Africa_Cairo: - strcpy(str, "Africa/Cairo"); - break; - case Nuki::TimeZoneId::Africa_Lagos: - strcpy(str, "Africa/Lagos"); - break; - case Nuki::TimeZoneId::Africa_Maputo: - strcpy(str, "Africa/Maputo"); - break; - case Nuki::TimeZoneId::Africa_Nairobi: - strcpy(str, "Africa/Nairobi"); - break; - case Nuki::TimeZoneId::America_Anchorage: - strcpy(str, "America/Anchorage"); - break; - case Nuki::TimeZoneId::America_Argentina_Buenos_Aires: - strcpy(str, "America/Argentina/Buenos_Aires"); - break; - case Nuki::TimeZoneId::America_Chicago: - strcpy(str, "America/Chicago"); - break; - case Nuki::TimeZoneId::America_Denver: - strcpy(str, "America/Denver"); - break; - case Nuki::TimeZoneId::America_Halifax: - strcpy(str, "America/Halifax"); - break; - case Nuki::TimeZoneId::America_Los_Angeles: - strcpy(str, "America/Los_Angeles"); - break; - case Nuki::TimeZoneId::America_Manaus: - strcpy(str, "America/Manaus"); - break; - case Nuki::TimeZoneId::America_Mexico_City: - strcpy(str, "America/Mexico_City"); - break; - case Nuki::TimeZoneId::America_New_York: - strcpy(str, "America/New_York"); - break; - case Nuki::TimeZoneId::America_Phoenix: - strcpy(str, "America/Phoenix"); - break; - case Nuki::TimeZoneId::America_Regina: - strcpy(str, "America/Regina"); - break; - case Nuki::TimeZoneId::America_Santiago: - strcpy(str, "America/Santiago"); - break; - case Nuki::TimeZoneId::America_Sao_Paulo: - strcpy(str, "America/Sao_Paulo"); - break; - case Nuki::TimeZoneId::America_St_Johns: - strcpy(str, "America/St_Johns"); - break; - case Nuki::TimeZoneId::Asia_Bangkok: - strcpy(str, "Asia/Bangkok"); - break; - case Nuki::TimeZoneId::Asia_Dubai: - strcpy(str, "Asia/Dubai"); - break; - case Nuki::TimeZoneId::Asia_Hong_Kong: - strcpy(str, "Asia/Hong_Kong"); - break; - case Nuki::TimeZoneId::Asia_Jerusalem: - strcpy(str, "Asia/Jerusalem"); - break; - case Nuki::TimeZoneId::Asia_Karachi: - strcpy(str, "Asia/Karachi"); - break; - case Nuki::TimeZoneId::Asia_Kathmandu: - strcpy(str, "Asia/Kathmandu"); - break; - case Nuki::TimeZoneId::Asia_Kolkata: - strcpy(str, "Asia/Kolkata"); - break; - case Nuki::TimeZoneId::Asia_Riyadh: - strcpy(str, "Asia/Riyadh"); - break; - case Nuki::TimeZoneId::Asia_Seoul: - strcpy(str, "Asia/Seoul"); - break; - case Nuki::TimeZoneId::Asia_Shanghai: - strcpy(str, "Asia/Shanghai"); - break; - case Nuki::TimeZoneId::Asia_Tehran: - strcpy(str, "Asia/Tehran"); - break; - case Nuki::TimeZoneId::Asia_Tokyo: - strcpy(str, "Asia/Tokyo"); - break; - case Nuki::TimeZoneId::Asia_Yangon: - strcpy(str, "Asia/Yangon"); - break; - case Nuki::TimeZoneId::Australia_Adelaide: - strcpy(str, "Australia/Adelaide"); - break; - case Nuki::TimeZoneId::Australia_Brisbane: - strcpy(str, "Australia/Brisbane"); - break; - case Nuki::TimeZoneId::Australia_Darwin: - strcpy(str, "Australia/Darwin"); - break; - case Nuki::TimeZoneId::Australia_Hobart: - strcpy(str, "Australia/Hobart"); - break; - case Nuki::TimeZoneId::Australia_Perth: - strcpy(str, "Australia/Perth"); - break; - case Nuki::TimeZoneId::Australia_Sydney: - strcpy(str, "Australia/Sydney"); - break; - case Nuki::TimeZoneId::Europe_Berlin: - strcpy(str, "Europe/Berlin"); - break; - case Nuki::TimeZoneId::Europe_Helsinki: - strcpy(str, "Europe/Helsinki"); - break; - case Nuki::TimeZoneId::Europe_Istanbul: - strcpy(str, "Europe/Istanbul"); - break; - case Nuki::TimeZoneId::Europe_London: - strcpy(str, "Europe/London"); - break; - case Nuki::TimeZoneId::Europe_Moscow: - strcpy(str, "Europe/Moscow"); - break; - case Nuki::TimeZoneId::Pacific_Auckland: - strcpy(str, "Pacific/Auckland"); - break; - case Nuki::TimeZoneId::Pacific_Guam: - strcpy(str, "Pacific/Guam"); - break; - case Nuki::TimeZoneId::Pacific_Honolulu: - strcpy(str, "Pacific/Honolulu"); - break; - case Nuki::TimeZoneId::Pacific_Pago_Pago: - strcpy(str, "Pacific/Pago_Pago"); - break; - case Nuki::TimeZoneId::None: - strcpy(str, "None"); - break; - default: - strcpy(str, "undefined"); - break; - } -} - void NetworkLock::homeKitStatusToString(const int hkstatus, char* str) { switch (hkstatus) { case 0: diff --git a/NetworkLock.h b/NetworkLock.h index db1f39b..5414ea4 100644 --- a/NetworkLock.h +++ b/NetworkLock.h @@ -65,10 +65,7 @@ private: bool publishString(const char* topic, const std::string& value); bool publishString(const char* topic, const char* value); void publishKeypadEntry(const String topic, NukiLock::KeypadEntry entry); - void batteryTypeToString(const Nuki::BatteryType battype, char* str); void buttonPressActionToString(const NukiLock::ButtonPressAction btnPressAction, char* str); - void advertisingModeToString(const Nuki::AdvertisingMode advmode, char* str); - void timeZoneIdToString(const Nuki::TimeZoneId timeZoneId, char* str); void homeKitStatusToString(const int hkstatus, char* str); void fobActionToString(const int fobact, char* str); diff --git a/NetworkOpener.cpp b/NetworkOpener.cpp index c87fda7..c1f791e 100644 --- a/NetworkOpener.cpp +++ b/NetworkOpener.cpp @@ -572,14 +572,14 @@ void NetworkOpener::publishConfig(const NukiOpener::Config &config) operatingModeToString(config.operatingMode, str); json["operatingMode"] = str; memset(str, 0, sizeof(str)); - advertisingModeToString(config.advertisingMode, str); + _network->advertisingModeToString(config.advertisingMode, str); json["advertisingMode"] = str; json["hasKeypad"] = config.hasKeypad; json["hasKeypadV2"] = config.hasKeypadV2; json["firmwareVersion"] = std::to_string(config.firmwareVersion[0]) + "." + std::to_string(config.firmwareVersion[1]) + "." + std::to_string(config.firmwareVersion[2]); json["hardwareRevision"] = std::to_string(config.hardwareRevision[0]) + "." + std::to_string(config.hardwareRevision[1]); memset(str, 0, sizeof(str)); - timeZoneIdToString(config.timeZoneId, str); + _network->timeZoneIdToString(config.timeZoneId, str); json["timeZone"] = str; serializeJson(json, _buffer, _bufferSize); @@ -630,7 +630,7 @@ void NetworkOpener::publishAdvancedConfig(const NukiOpener::AdvancedConfig &conf buttonPressActionToString(config.doubleButtonPressAction, str); json["doubleButtonPressAction"] = str; memset(str, 0, sizeof(str)); - batteryTypeToString(config.batteryType, str); + _network->batteryTypeToString(config.batteryType, str); json["batteryType"] = str; json["automaticBatteryTypeDetection"] = config.automaticBatteryTypeDetection; @@ -1010,23 +1010,6 @@ uint8_t NetworkOpener::queryCommands() return qc; } -void NetworkOpener::batteryTypeToString(const Nuki::BatteryType battype, char* str) { - switch (battype) { - case Nuki::BatteryType::Alkali: - strcpy(str, "Alkali"); - break; - case Nuki::BatteryType::Accumulators: - strcpy(str, "Accumulators"); - break; - case Nuki::BatteryType::Lithium: - strcpy(str, "Lithium"); - break; - default: - strcpy(str, "undefined"); - break; - } -} - void NetworkOpener::buttonPressActionToString(const NukiOpener::ButtonPressAction btnPressAction, char* str) { switch (btnPressAction) { case NukiOpener::ButtonPressAction::NoAction: @@ -1059,175 +1042,6 @@ void NetworkOpener::buttonPressActionToString(const NukiOpener::ButtonPressActio } } -void NetworkOpener::advertisingModeToString(const Nuki::AdvertisingMode advmode, char* str) { - switch (advmode) { - case Nuki::AdvertisingMode::Automatic: - strcpy(str, "Automatic"); - break; - case Nuki::AdvertisingMode::Normal: - strcpy(str, "Normal"); - break; - case Nuki::AdvertisingMode::Slow: - strcpy(str, "Slow"); - break; - case Nuki::AdvertisingMode::Slowest: - strcpy(str, "Slowest"); - break; - default: - strcpy(str, "undefined"); - break; - } -} - -void NetworkOpener::timeZoneIdToString(const Nuki::TimeZoneId timeZoneId, char* str) { - switch (timeZoneId) { - case Nuki::TimeZoneId::Africa_Cairo: - strcpy(str, "Africa/Cairo"); - break; - case Nuki::TimeZoneId::Africa_Lagos: - strcpy(str, "Africa/Lagos"); - break; - case Nuki::TimeZoneId::Africa_Maputo: - strcpy(str, "Africa/Maputo"); - break; - case Nuki::TimeZoneId::Africa_Nairobi: - strcpy(str, "Africa/Nairobi"); - break; - case Nuki::TimeZoneId::America_Anchorage: - strcpy(str, "America/Anchorage"); - break; - case Nuki::TimeZoneId::America_Argentina_Buenos_Aires: - strcpy(str, "America/Argentina/Buenos_Aires"); - break; - case Nuki::TimeZoneId::America_Chicago: - strcpy(str, "America/Chicago"); - break; - case Nuki::TimeZoneId::America_Denver: - strcpy(str, "America/Denver"); - break; - case Nuki::TimeZoneId::America_Halifax: - strcpy(str, "America/Halifax"); - break; - case Nuki::TimeZoneId::America_Los_Angeles: - strcpy(str, "America/Los_Angeles"); - break; - case Nuki::TimeZoneId::America_Manaus: - strcpy(str, "America/Manaus"); - break; - case Nuki::TimeZoneId::America_Mexico_City: - strcpy(str, "America/Mexico_City"); - break; - case Nuki::TimeZoneId::America_New_York: - strcpy(str, "America/New_York"); - break; - case Nuki::TimeZoneId::America_Phoenix: - strcpy(str, "America/Phoenix"); - break; - case Nuki::TimeZoneId::America_Regina: - strcpy(str, "America/Regina"); - break; - case Nuki::TimeZoneId::America_Santiago: - strcpy(str, "America/Santiago"); - break; - case Nuki::TimeZoneId::America_Sao_Paulo: - strcpy(str, "America/Sao_Paulo"); - break; - case Nuki::TimeZoneId::America_St_Johns: - strcpy(str, "America/St_Johns"); - break; - case Nuki::TimeZoneId::Asia_Bangkok: - strcpy(str, "Asia/Bangkok"); - break; - case Nuki::TimeZoneId::Asia_Dubai: - strcpy(str, "Asia/Dubai"); - break; - case Nuki::TimeZoneId::Asia_Hong_Kong: - strcpy(str, "Asia/Hong_Kong"); - break; - case Nuki::TimeZoneId::Asia_Jerusalem: - strcpy(str, "Asia/Jerusalem"); - break; - case Nuki::TimeZoneId::Asia_Karachi: - strcpy(str, "Asia/Karachi"); - break; - case Nuki::TimeZoneId::Asia_Kathmandu: - strcpy(str, "Asia/Kathmandu"); - break; - case Nuki::TimeZoneId::Asia_Kolkata: - strcpy(str, "Asia/Kolkata"); - break; - case Nuki::TimeZoneId::Asia_Riyadh: - strcpy(str, "Asia/Riyadh"); - break; - case Nuki::TimeZoneId::Asia_Seoul: - strcpy(str, "Asia/Seoul"); - break; - case Nuki::TimeZoneId::Asia_Shanghai: - strcpy(str, "Asia/Shanghai"); - break; - case Nuki::TimeZoneId::Asia_Tehran: - strcpy(str, "Asia/Tehran"); - break; - case Nuki::TimeZoneId::Asia_Tokyo: - strcpy(str, "Asia/Tokyo"); - break; - case Nuki::TimeZoneId::Asia_Yangon: - strcpy(str, "Asia/Yangon"); - break; - case Nuki::TimeZoneId::Australia_Adelaide: - strcpy(str, "Australia/Adelaide"); - break; - case Nuki::TimeZoneId::Australia_Brisbane: - strcpy(str, "Australia/Brisbane"); - break; - case Nuki::TimeZoneId::Australia_Darwin: - strcpy(str, "Australia/Darwin"); - break; - case Nuki::TimeZoneId::Australia_Hobart: - strcpy(str, "Australia/Hobart"); - break; - case Nuki::TimeZoneId::Australia_Perth: - strcpy(str, "Australia/Perth"); - break; - case Nuki::TimeZoneId::Australia_Sydney: - strcpy(str, "Australia/Sydney"); - break; - case Nuki::TimeZoneId::Europe_Berlin: - strcpy(str, "Europe/Berlin"); - break; - case Nuki::TimeZoneId::Europe_Helsinki: - strcpy(str, "Europe/Helsinki"); - break; - case Nuki::TimeZoneId::Europe_Istanbul: - strcpy(str, "Europe/Istanbul"); - break; - case Nuki::TimeZoneId::Europe_London: - strcpy(str, "Europe/London"); - break; - case Nuki::TimeZoneId::Europe_Moscow: - strcpy(str, "Europe/Moscow"); - break; - case Nuki::TimeZoneId::Pacific_Auckland: - strcpy(str, "Pacific/Auckland"); - break; - case Nuki::TimeZoneId::Pacific_Guam: - strcpy(str, "Pacific/Guam"); - break; - case Nuki::TimeZoneId::Pacific_Honolulu: - strcpy(str, "Pacific/Honolulu"); - break; - case Nuki::TimeZoneId::Pacific_Pago_Pago: - strcpy(str, "Pacific/Pago_Pago"); - break; - case Nuki::TimeZoneId::None: - strcpy(str, "None"); - break; - default: - strcpy(str, "undefined"); - break; - } -} - void NetworkOpener::fobActionToString(const int fobact, char* str) { switch (fobact) { case 0: diff --git a/NetworkOpener.h b/NetworkOpener.h index 0f2b156..a7e0b31 100644 --- a/NetworkOpener.h +++ b/NetworkOpener.h @@ -65,10 +65,7 @@ private: void buildMqttPath(const char* path, char* outPath); void subscribe(const char* path); void logactionCompletionStatusToString(uint8_t value, char* out); - void batteryTypeToString(const Nuki::BatteryType battype, char* str); void buttonPressActionToString(const NukiOpener::ButtonPressAction btnPressAction, char* str); - void advertisingModeToString(const Nuki::AdvertisingMode advmode, char* str); - void timeZoneIdToString(const Nuki::TimeZoneId timeZoneId, char* str); void fobActionToString(const int fobact, char* str); void operatingModeToString(const int opmode, char* str); void doorbellSuppressionToString(const int dbsupr, char* str);