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

Fix compile warnings

Browse Source
This commit is contained in:
iranl
2024-05-05 15:32:47 +02:00
parent 22441e3814
commit 5c818d0cfe
6 changed files with 579 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

994
Network.cpp
View File

File diff suppressed because it is too large Load Diff

14
NetworkLock.cpp
View File

@@ -389,7 +389,7 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
if(_authName[sizeName - 1] != '\0') _authName[sizeName] = '\0'; if(_authName[sizeName - 1] != '\0') _authName[sizeName] = '\0';
} }
auto entry = json.add(); auto entry = json.add<JsonVariant>();
entry["index"] = log.index; entry["index"] = log.index;
entry["authorizationId"] = log.authId; entry["authorizationId"] = log.authId;
@@ -623,7 +623,7 @@ void NetworkLock::publishKeypad(const std::list<NukiLock::KeypadEntry>& entries,
basePath.concat(std::to_string(index).c_str()); basePath.concat(std::to_string(index).c_str());
publishKeypadEntry(basePath, entry); publishKeypadEntry(basePath, entry);
auto jsonEntry = json.add(); auto jsonEntry = json.add<JsonVariant>();
jsonEntry["codeId"] = entry.codeId; jsonEntry["codeId"] = entry.codeId;
jsonEntry["enabled"] = entry.enabled; jsonEntry["enabled"] = entry.enabled;
@@ -724,7 +724,7 @@ void NetworkLock::publishTimeControl(const std::list<NukiLock::TimeControlEntry>
for(const auto& entry : timeControlEntries) for(const auto& entry : timeControlEntries)
{ {
auto jsonEntry = json.add(); auto jsonEntry = json.add<JsonVariant>();
jsonEntry["entryId"] = entry.entryId; jsonEntry["entryId"] = entry.entryId;
jsonEntry["enabled"] = entry.enabled; jsonEntry["enabled"] = entry.enabled;
@@ -874,7 +874,7 @@ void NetworkLock::publishHASSConfig(char *deviceType, const char *baseTopic, cha
} }
else else
{ {
_network->removeHASSConfigTopic("binary_sensor", "door_sensor", uidString); _network->removeHASSConfigTopic((char*)"binary_sensor", (char*)"door_sensor", uidString);
} }
_network->publishHASSWifiRssiConfig(deviceType, baseTopic, name, uidString); _network->publishHASSWifiRssiConfig(deviceType, baseTopic, name, uidString);
@@ -884,7 +884,7 @@ void NetworkLock::publishHASSConfig(char *deviceType, const char *baseTopic, cha
} }
else else
{ {
_network->removeHASSConfigTopic("sensor", "last_action_authorization", uidString); _network->removeHASSConfigTopic((char*)"sensor", (char*)"last_action_authorization", uidString);
} }
if(hasKeypad) if(hasKeypad)
@@ -893,8 +893,8 @@ void NetworkLock::publishHASSConfig(char *deviceType, const char *baseTopic, cha
} }
else else
{ {
_network->removeHASSConfigTopic("sensor", "keypad_status", uidString); _network->removeHASSConfigTopic((char*)"sensor", (char*)"keypad_status", uidString);
_network->removeHASSConfigTopic("binary_sensor", "keypad_battery_low", uidString); _network->removeHASSConfigTopic((char*)"binary_sensor", (char*)"keypad_battery_low", uidString);
} }
} }

6
NetworkOpener.cpp
View File

@@ -380,7 +380,7 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
if(_authName[sizeName - 1] != '\0') _authName[sizeName] = '\0'; if(_authName[sizeName - 1] != '\0') _authName[sizeName] = '\0';
} }
auto entry = json.add(); auto entry = json.add<JsonVariant>();
entry["index"] = log.index; entry["index"] = log.index;
entry["authorizationId"] = log.authId; entry["authorizationId"] = log.authId;
@@ -682,7 +682,7 @@ void NetworkOpener::publishKeypad(const std::list<NukiLock::KeypadEntry>& entrie
basePath.concat(std::to_string(index).c_str()); basePath.concat(std::to_string(index).c_str());
publishKeypadEntry(basePath, entry); publishKeypadEntry(basePath, entry);
auto jsonEntry = json.add(); auto jsonEntry = json.add<JsonVariant>();
jsonEntry["codeId"] = entry.codeId; jsonEntry["codeId"] = entry.codeId;
jsonEntry["enabled"] = entry.enabled; jsonEntry["enabled"] = entry.enabled;
@@ -783,7 +783,7 @@ void NetworkOpener::publishTimeControl(const std::list<NukiOpener::TimeControlEn
for(const auto& entry : timeControlEntries) for(const auto& entry : timeControlEntries)
{ {
auto jsonEntry = json.add(); auto jsonEntry = json.add<JsonVariant>();
jsonEntry["entryId"] = entry.entryId; jsonEntry["entryId"] = entry.entryId;
jsonEntry["enabled"] = entry.enabled; jsonEntry["enabled"] = entry.enabled;

4
NukiOpenerWrapper.cpp
View File

@@ -1983,11 +1983,11 @@ void NukiOpenerWrapper::setupHASS()
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"); _network->publishHASSConfig((char*)"Opener", baseTopic.c_str(), (char*)_nukiConfig.name, uidString, (char*)"deactivateCM", (char*)"activateCM", (char*)"electricStrikeActuation");
} }
else else
{ {
_network->publishHASSConfig("Opener", baseTopic.c_str(), (char*)_nukiConfig.name, uidString, "deactivateRTO", "activateRTO", "electricStrikeActuation"); _network->publishHASSConfig((char*)"Opener", baseTopic.c_str(), (char*)_nukiConfig.name, uidString, (char*)"deactivateRTO", (char*)"activateRTO", (char*)"electricStrikeActuation");
} }
_hassSetupCompleted = true; _hassSetupCompleted = true;

2
NukiWrapper.cpp
View File

@@ -1956,7 +1956,7 @@ void NukiWrapper::setupHASS()
char uidString[20]; char uidString[20];
itoa(_nukiConfig.nukiId, uidString, 16); itoa(_nukiConfig.nukiId, uidString, 16);
_network->publishHASSConfig("SmartLock", baseTopic.c_str(),(char*)_nukiConfig.name, uidString, hasDoorSensor(), _hasKeypad, _publishAuthData, "lock", "unlock", "unlatch"); _network->publishHASSConfig((char*)"SmartLock", baseTopic.c_str(),(char*)_nukiConfig.name, uidString, hasDoorSensor(), _hasKeypad, _publishAuthData, (char*)"lock", (char*)"unlock", (char*)"unlatch");
_hassSetupCompleted = true; _hassSetupCompleted = true;
Log->println("HASS setup for lock completed."); Log->println("HASS setup for lock completed.");

138
PreferencesKeys.h
View File

@@ -2,75 +2,75 @@
#include <vector> #include <vector>
#define preference_started_before "run" #define preference_started_before (char*)"run"
#define preference_config_version "confVersion" #define preference_config_version (char*)"confVersion"
#define preference_device_id_lock "deviceId" #define preference_device_id_lock (char*)"deviceId"
#define preference_device_id_opener "deviceIdOp" #define preference_device_id_opener (char*)"deviceIdOp"
#define preference_nuki_id_lock "nukiId" #define preference_nuki_id_lock (char*)"nukiId"
#define preference_nuki_id_opener "nukidOp" #define preference_nuki_id_opener (char*)"nukidOp"
#define preference_mqtt_broker "mqttbroker" #define preference_mqtt_broker (char*)"mqttbroker"
#define preference_mqtt_broker_port "mqttport" #define preference_mqtt_broker_port (char*)"mqttport"
#define preference_mqtt_user "mqttuser" #define preference_mqtt_user (char*)"mqttuser"
#define preference_mqtt_password "mqttpass" #define preference_mqtt_password (char*)"mqttpass"
#define preference_mqtt_log_enabled "mqttlog" #define preference_mqtt_log_enabled (char*)"mqttlog"
#define preference_lock_enabled "lockena" #define preference_lock_enabled (char*)"lockena"
#define preference_lock_pin_status "lockpin" #define preference_lock_pin_status (char*)"lockpin"
#define preference_mqtt_lock_path "mqttpath" #define preference_mqtt_lock_path (char*)"mqttpath"
#define preference_opener_enabled "openerena" #define preference_opener_enabled (char*)"openerena"
#define preference_opener_pin_status "openerpin" #define preference_opener_pin_status (char*)"openerpin"
#define preference_opener_continuous_mode "openercont" #define preference_opener_continuous_mode (char*)"openercont"
#define preference_mqtt_opener_path "mqttoppath" #define preference_mqtt_opener_path (char*)"mqttoppath"
#define preference_check_updates "checkupdates" #define preference_check_updates (char*)"checkupdates"
#define preference_lock_max_keypad_code_count "maxkpad" #define preference_lock_max_keypad_code_count (char*)"maxkpad"
#define preference_opener_max_keypad_code_count "opmaxkpad" #define preference_opener_max_keypad_code_count (char*)"opmaxkpad"
#define preference_mqtt_ca "mqttca" #define preference_mqtt_ca (char*)"mqttca"
#define preference_mqtt_crt "mqttcrt" #define preference_mqtt_crt (char*)"mqttcrt"
#define preference_mqtt_key "mqttkey" #define preference_mqtt_key (char*)"mqttkey"
#define preference_mqtt_hass_discovery "hassdiscovery" #define preference_mqtt_hass_discovery (char*)"hassdiscovery"
#define preference_mqtt_hass_cu_url "hassConfigUrl" #define preference_mqtt_hass_cu_url (char*)"hassConfigUrl"
#define preference_ip_dhcp_enabled "dhcpena" #define preference_ip_dhcp_enabled (char*)"dhcpena"
#define preference_ip_address "ipaddr" #define preference_ip_address (char*)"ipaddr"
#define preference_ip_subnet "ipsub" #define preference_ip_subnet (char*)"ipsub"
#define preference_ip_gateway "ipgtw" #define preference_ip_gateway (char*)"ipgtw"
#define preference_ip_dns_server "dnssrv" #define preference_ip_dns_server (char*)"dnssrv"
#define preference_network_hardware "nwhw" #define preference_network_hardware (char*)"nwhw"
#define preference_network_hardware_gpio "nwhwdt" // obsolete #define preference_network_hardware_gpio (char*)"nwhwdt" // obsolete
#define preference_network_wifi_fallback_disabled "nwwififb" #define preference_network_wifi_fallback_disabled (char*)"nwwififb"
#define preference_rssi_publish_interval "rssipb" #define preference_rssi_publish_interval (char*)"rssipb"
#define preference_hostname "hostname" #define preference_hostname (char*)"hostname"
#define preference_network_timeout "nettmout" #define preference_network_timeout (char*)"nettmout"
#define preference_restart_on_disconnect "restdisc" #define preference_restart_on_disconnect (char*)"restdisc"
#define preference_restart_timer "resttmr" #define preference_restart_timer (char*)"resttmr"
#define preference_restart_ble_beacon_lost "rstbcn" #define preference_restart_ble_beacon_lost (char*)"rstbcn"
#define preference_query_interval_lockstate "lockStInterval" #define preference_query_interval_lockstate (char*)"lockStInterval"
#define preference_query_interval_configuration "configInterval" #define preference_query_interval_configuration (char*)"configInterval"
#define preference_query_interval_battery "batInterval" #define preference_query_interval_battery (char*)"batInterval"
#define preference_query_interval_keypad "kpInterval" #define preference_query_interval_keypad (char*)"kpInterval"
#define preference_access_level "accLvl" #define preference_access_level (char*)"accLvl"
#define preference_keypad_info_enabled "kpInfoEnabled" #define preference_keypad_info_enabled (char*)"kpInfoEnabled"
#define preference_keypad_control_enabled "kpCntrlEnabled" #define preference_keypad_control_enabled (char*)"kpCntrlEnabled"
#define preference_timecontrol_control_enabled "tcCntrlEnabled" #define preference_timecontrol_control_enabled (char*)"tcCntrlEnabled"
#define preference_timecontrol_info_enabled "tcInfoEnabled" #define preference_timecontrol_info_enabled (char*)"tcInfoEnabled"
#define preference_publish_authdata "pubAuth" #define preference_publish_authdata (char*)"pubAuth"
#define preference_acl "aclLckOpn" #define preference_acl (char*)"aclLckOpn"
#define preference_conf_lock_basic_acl "confLckBasAcl" #define preference_conf_lock_basic_acl (char*)"confLckBasAcl"
#define preference_conf_lock_advanced_acl "confLckAdvAcl" #define preference_conf_lock_advanced_acl (char*)"confLckAdvAcl"
#define preference_conf_opener_basic_acl "confOpnBasAcl" #define preference_conf_opener_basic_acl (char*)"confOpnBasAcl"
#define preference_conf_opener_advanced_acl "confOpnAdvAcl" #define preference_conf_opener_advanced_acl (char*)"confOpnAdvAcl"
#define preference_register_as_app "regAsApp" // true = register as hub; false = register as app #define preference_register_as_app (char*)"regAsApp" // true = register as hub; false = register as app
#define preference_command_nr_of_retries "nrRetry" #define preference_command_nr_of_retries (char*)"nrRetry"
#define preference_command_retry_delay "rtryDelay" #define preference_command_retry_delay (char*)"rtryDelay"
#define preference_cred_user "crdusr" #define preference_cred_user (char*)"crdusr"
#define preference_cred_password "crdpass" #define preference_cred_password (char*)"crdpass"
#define preference_gpio_locking_enabled "gpiolck" // obsolete #define preference_gpio_locking_enabled (char*)"gpiolck" // obsolete
#define preference_gpio_configuration "gpiocfg" #define preference_gpio_configuration (char*)"gpiocfg"
#define preference_publish_debug_info "pubdbg" #define preference_publish_debug_info (char*)"pubdbg"
#define preference_presence_detection_timeout "prdtimeout" #define preference_presence_detection_timeout (char*)"prdtimeout"
#define preference_has_mac_saved "hasmac" #define preference_has_mac_saved (char*)"hasmac"
#define preference_has_mac_byte_0 "macb0" #define preference_has_mac_byte_0 (char*)"macb0"
#define preference_has_mac_byte_1 "macb1" #define preference_has_mac_byte_1 (char*)"macb1"
#define preference_has_mac_byte_2 "macb2" #define preference_has_mac_byte_2 (char*)"macb2"
#define preference_latest_version "latest" #define preference_latest_version (char*)"latest"
class DebugPreferences class DebugPreferences
{ {