diff --git a/src/NukiOfficial.cpp b/src/NukiOfficial.cpp index c692972..5c778ab 100644 --- a/src/NukiOfficial.cpp +++ b/src/NukiOfficial.cpp @@ -94,7 +94,7 @@ void NukiOfficial::onOfficialUpdateReceived(const char *topic, const char *value if(strcmp(topic, mqtt_topic_official_connected) == 0) { Log->print("Connected: "); - Log->println((strcmp(value, "true") == 0 ? 1 : 0)); + Log->println(strcmp(value, "true") == 0 ? 1 : 0); offConnected = (strcmp(value, "true") == 0 ? 1 : 0); _publisher->publishBool(mqtt_topic_hybrid_state, offConnected, true); } diff --git a/src/NukiOpenerWrapper.cpp b/src/NukiOpenerWrapper.cpp index b0fa58e..2706dc8 100644 --- a/src/NukiOpenerWrapper.cpp +++ b/src/NukiOpenerWrapper.cpp @@ -732,7 +732,7 @@ void NukiOpenerWrapper::updateAuthData(bool retrieved) while(retryCount < _nrOfRetries + 1) { - Log->print(("Retrieve log entries: ")); + Log->print("Retrieve log entries: "); result = _nukiOpener.retrieveLogEntries(0, _preferences->getInt(preference_authlog_max_entries, MAX_AUTHLOG), 1, false); if(result != Nuki::CmdResult::Success) @@ -786,7 +786,7 @@ void NukiOpenerWrapper::updateAuthData(bool retrieved) return a.index < b.index; }); - Log->print(("Log size: ")); + Log->print("Log size: "); Log->println(log.size()); if(log.size() > 0) @@ -818,7 +818,7 @@ void NukiOpenerWrapper::updateKeypad(bool retrieved) while(retryCount < _nrOfRetries + 1) { - Log->print(("Querying opener keypad: ")); + Log->print("Querying opener keypad: "); result = _nukiOpener.retrieveKeypadEntries(0, _preferences->getInt(preference_keypad_max_entries, MAX_KEYPAD)); if(result != Nuki::CmdResult::Success) @@ -842,7 +842,7 @@ void NukiOpenerWrapper::updateKeypad(bool retrieved) std::list entries; _nukiOpener.getKeypadEntries(&entries); - Log->print(("Opener keypad codes: ")); + Log->print("Opener keypad codes: "); Log->println(entries.size()); entries.sort([](const NukiOpener::KeypadEntry& a, const NukiOpener::KeypadEntry& b) @@ -898,7 +898,7 @@ void NukiOpenerWrapper::updateTimeControl(bool retrieved) while(retryCount < _nrOfRetries + 1) { - Log->print(("Querying opener timecontrol: ")); + Log->print("Querying opener timecontrol: "); result = _nukiOpener.retrieveTimeControlEntries(); if(result != Nuki::CmdResult::Success) @@ -922,7 +922,7 @@ void NukiOpenerWrapper::updateTimeControl(bool retrieved) std::list timeControlEntries; _nukiOpener.getTimeControlEntries(&timeControlEntries); - Log->print(("Opener timecontrol entries: ")); + Log->print("Opener timecontrol entries: "); Log->println(timeControlEntries.size()); timeControlEntries.sort([](const NukiOpener::TimeControlEntry& a, const NukiOpener::TimeControlEntry& b) @@ -975,7 +975,7 @@ void NukiOpenerWrapper::updateAuth(bool retrieved) while(retryCount < _nrOfRetries) { - Log->print(("Querying opener authorization: ")); + Log->print("Querying opener authorization: "); result = _nukiOpener.retrieveAuthorizationEntries(0, _preferences->getInt(preference_auth_max_entries, MAX_AUTH)); delay(250); if(result != Nuki::CmdResult::Success) @@ -999,7 +999,7 @@ void NukiOpenerWrapper::updateAuth(bool retrieved) std::list authEntries; _nukiOpener.getAuthorizationEntries(&authEntries); - Log->print(("Opener authorization entries: ")); + Log->print("Opener authorization entries: "); Log->println(authEntries.size()); authEntries.sort([](const NukiOpener::AuthorizationEntry& a, const NukiOpener::AuthorizationEntry& b) @@ -2748,7 +2748,7 @@ void NukiOpenerWrapper::onKeypadJsonCommandReceived(const char *value) { auto it1 = std::find(_keypadCodeIds.begin(), _keypadCodeIds.end(), codeId); int index = it1 - _keypadCodeIds.begin(); - Log->print(("Check keypad code: ")); + Log->print("Check keypad code: "); if(code == _keypadCodes[index]) { @@ -2787,7 +2787,7 @@ void NukiOpenerWrapper::onKeypadJsonCommandReceived(const char *value) if(idExists) { result = _nukiOpener.deleteKeypadEntry(codeId); - Log->print(("Delete keypad code: ")); + Log->print("Delete keypad code: "); Log->println((int)result); } else @@ -2994,7 +2994,7 @@ void NukiOpenerWrapper::onKeypadJsonCommandReceived(const char *value) } result = _nukiOpener.addKeypadEntry(entry); - Log->print(("Add keypad code: ")); + Log->print("Add keypad code: "); Log->println((int)result); } else if (strcmp(action, "update") == 0) @@ -3160,7 +3160,7 @@ void NukiOpenerWrapper::onKeypadJsonCommandReceived(const char *value) } result = _nukiOpener.updateKeypadEntry(entry); - Log->print(("Update keypad code: ")); + Log->print("Update keypad code: "); Log->println((int)result); } } @@ -3287,7 +3287,7 @@ void NukiOpenerWrapper::onTimeControlCommandReceived(const char *value) if(idExists) { result = _nukiOpener.removeTimeControlEntry(entryId); - Log->print(("Delete timecontrol: ")); + Log->print("Delete timecontrol: "); Log->println((int)result); } else @@ -3366,7 +3366,7 @@ void NukiOpenerWrapper::onTimeControlCommandReceived(const char *value) entry.lockAction = timeControlLockAction; result = _nukiOpener.addTimeControlEntry(entry); - Log->print(("Add timecontrol: ")); + Log->print("Add timecontrol: "); Log->println((int)result); } else if (strcmp(action, "update") == 0) @@ -3443,7 +3443,7 @@ void NukiOpenerWrapper::onTimeControlCommandReceived(const char *value) entry.lockAction = timeControlLockAction; result = _nukiOpener.updateTimeControlEntry(entry); - Log->print(("Update timecontrol: ")); + Log->print("Update timecontrol: "); Log->println((int)result); } } @@ -3597,7 +3597,7 @@ void NukiOpenerWrapper::onAuthCommandReceived(const char *value) if(idExists) { result = _nukiOpener.deleteAuthorizationEntry(authId); - Log->print(("Delete authorization: ")); + Log->print("Delete authorization: "); Log->println((int)result); } else @@ -3816,7 +3816,7 @@ void NukiOpenerWrapper::onAuthCommandReceived(const char *value) } result = _nukiOpener.addAuthorizationEntry(entry); - Log->print(("Add authorization: ")); + Log->print("Add authorization: "); Log->println((int)result); } else if (strcmp(action, "update") == 0) @@ -3981,7 +3981,7 @@ void NukiOpenerWrapper::onAuthCommandReceived(const char *value) } result = _nukiOpener.updateAuthorizationEntry(entry); - Log->print(("Update authorization: ")); + Log->print("Update authorization: "); Log->println((int)result); } } @@ -4094,7 +4094,7 @@ void NukiOpenerWrapper::readConfig() char resultStr[20]; NukiOpener::cmdResultToString(result, resultStr); - Log->print(("Opener config result: ")); + Log->print("Opener config result: "); Log->print(resultStr); Log->print("("); Log->print(result); @@ -4124,7 +4124,7 @@ void NukiOpenerWrapper::readAdvancedConfig() char resultStr[20]; NukiOpener::cmdResultToString(result, resultStr); - Log->print(("Opener advanced config result: ")); + Log->print("Opener advanced config result: "); Log->println(resultStr); postponeBleWatchdog(); } @@ -4211,6 +4211,6 @@ void NukiOpenerWrapper::updateTime() char resultStr[15] = {0}; NukiOpener::cmdResultToString(cmdResult, resultStr); - Log->print(("Opener time update result: ")); + Log->print("Opener time update result: "); Log->println(resultStr); } \ No newline at end of file diff --git a/src/NukiWrapper.cpp b/src/NukiWrapper.cpp index 9a3e6d2..7ef9542 100644 --- a/src/NukiWrapper.cpp +++ b/src/NukiWrapper.cpp @@ -215,11 +215,11 @@ void NukiWrapper::readSettings() _preferences->putInt(preference_restart_ble_beacon_lost, _restartBeaconTimeout); } - Log->print(("Lock state interval: ")); + Log->print("Lock state interval: "); Log->print(_intervalLockstate); - Log->print((" | Battery interval: ")); + Log->print(" | Battery interval: "); Log->print(_intervalBattery); - Log->print((" | Publish auth data: ")); + Log->print(" | Publish auth data: "); Log->println(_publishAuthData ? "yes" : "no"); if(!_publishAuthData) @@ -293,7 +293,7 @@ void NukiWrapper::update(bool reboot) NukiLock::cmdResultToString(cmdResult, resultStr); _network->publishCommandResult(resultStr); - Log->print(("Lock action result: ")); + Log->print("Lock action result: "); Log->println(resultStr); if(cmdResult != Nuki::CmdResult::Success) @@ -505,7 +505,7 @@ bool NukiWrapper::updateKeyTurnerState() { Log->print("Result (attempt "); Log->print(retryCount + 1); - Log->print(("): ")); + Log->print("): "); result =_nukiLock.requestKeyTurnerState(&_keyTurnerState); ++retryCount; } @@ -587,7 +587,7 @@ void NukiWrapper::updateBatteryState() while(retryCount < _nrOfRetries + 1) { - Log->print(("Result (attempt ")); + Log->print("Result (attempt "); Log->print(retryCount + 1); Log->print("): "); result = _nukiLock.requestBatteryReport(&_batteryReport); @@ -743,7 +743,7 @@ void NukiWrapper::updateAuthData(bool retrieved) while(retryCount < _nrOfRetries + 1) { - Log->print(("Retrieve log entries: ")); + Log->print("Retrieve log entries: "); result = _nukiLock.retrieveLogEntries(0, _preferences->getInt(preference_authlog_max_entries, MAX_AUTHLOG), 1, false); if(result != Nuki::CmdResult::Success) { @@ -795,7 +795,7 @@ void NukiWrapper::updateAuthData(bool retrieved) return a.index < b.index; }); - Log->print(("Log size: ")); + Log->print("Log size: "); Log->println(log.size()); if(log.size() > 0) @@ -827,7 +827,7 @@ void NukiWrapper::updateKeypad(bool retrieved) while(retryCount < _nrOfRetries + 1) { - Log->print(("Querying lock keypad: ")); + Log->print("Querying lock keypad: "); result = _nukiLock.retrieveKeypadEntries(0, _preferences->getInt(preference_keypad_max_entries, MAX_KEYPAD)); if(result != Nuki::CmdResult::Success) { @@ -850,7 +850,7 @@ void NukiWrapper::updateKeypad(bool retrieved) std::list entries; _nukiLock.getKeypadEntries(&entries); - Log->print(("Lock keypad codes: ")); + Log->print("Lock keypad codes: "); Log->println(entries.size()); entries.sort([](const NukiLock::KeypadEntry& a, const NukiLock::KeypadEntry& b) @@ -906,7 +906,7 @@ void NukiWrapper::updateTimeControl(bool retrieved) while(retryCount < _nrOfRetries + 1) { - Log->print(("Querying lock timecontrol: ")); + Log->print("Querying lock timecontrol: "); result = _nukiLock.retrieveTimeControlEntries(); if(result != Nuki::CmdResult::Success) { @@ -929,7 +929,7 @@ void NukiWrapper::updateTimeControl(bool retrieved) std::list timeControlEntries; _nukiLock.getTimeControlEntries(&timeControlEntries); - Log->print(("Lock timecontrol entries: ")); + Log->print("Lock timecontrol entries: "); Log->println(timeControlEntries.size()); timeControlEntries.sort([](const NukiLock::TimeControlEntry& a, const NukiLock::TimeControlEntry& b) @@ -982,7 +982,7 @@ void NukiWrapper::updateAuth(bool retrieved) while(retryCount < _nrOfRetries) { - Log->print(("Querying lock authorization: ")); + Log->print("Querying lock authorization: "); result = _nukiLock.retrieveAuthorizationEntries(0, _preferences->getInt(preference_auth_max_entries, MAX_AUTH)); delay(250); if(result != Nuki::CmdResult::Success) @@ -1006,7 +1006,7 @@ void NukiWrapper::updateAuth(bool retrieved) std::list authEntries; _nukiLock.getAuthorizationEntries(&authEntries); - Log->print(("Lock authorization entries: ")); + Log->print("Lock authorization entries: "); Log->println(authEntries.size()); authEntries.sort([](const NukiLock::AuthorizationEntry& a, const NukiLock::AuthorizationEntry& b) @@ -2848,7 +2848,7 @@ void NukiWrapper::onKeypadJsonCommandReceived(const char *value) { auto it1 = std::find(_keypadCodeIds.begin(), _keypadCodeIds.end(), codeId); int index = it1 - _keypadCodeIds.begin(); - Log->print(("Check keypad code: ")); + Log->print("Check keypad code: "); if(code == _keypadCodes[index]) { @@ -2888,7 +2888,7 @@ void NukiWrapper::onKeypadJsonCommandReceived(const char *value) if(idExists) { result = _nukiLock.deleteKeypadEntry(codeId); - Log->print(("Delete keypad code: ")); + Log->print("Delete keypad code: "); Log->println((int)result); } else @@ -3095,7 +3095,7 @@ void NukiWrapper::onKeypadJsonCommandReceived(const char *value) } result = _nukiLock.addKeypadEntry(entry); - Log->print(("Add keypad code: ")); + Log->print("Add keypad code: "); Log->println((int)result); } else if (strcmp(action, "update") == 0) @@ -3261,7 +3261,7 @@ void NukiWrapper::onKeypadJsonCommandReceived(const char *value) } result = _nukiLock.updateKeypadEntry(entry); - Log->print(("Update keypad code: ")); + Log->print("Update keypad code: "); Log->println((int)result); } } @@ -3388,7 +3388,7 @@ void NukiWrapper::onTimeControlCommandReceived(const char *value) if(idExists) { result = _nukiLock.removeTimeControlEntry(entryId); - Log->print(("Delete timecontrol: ")); + Log->print("Delete timecontrol: "); Log->println((int)result); } else @@ -3468,7 +3468,7 @@ void NukiWrapper::onTimeControlCommandReceived(const char *value) entry.lockAction = timeControlLockAction; result = _nukiLock.addTimeControlEntry(entry); - Log->print(("Add timecontrol: ")); + Log->print("Add timecontrol: "); Log->println((int)result); } else if (strcmp(action, "update") == 0) @@ -3546,7 +3546,7 @@ void NukiWrapper::onTimeControlCommandReceived(const char *value) entry.lockAction = timeControlLockAction; result = _nukiLock.updateTimeControlEntry(entry); - Log->print(("Update timecontrol: ")); + Log->print("Update timecontrol: "); Log->println((int)result); } } @@ -3701,7 +3701,7 @@ void NukiWrapper::onAuthCommandReceived(const char *value) { result = _nukiLock.deleteAuthorizationEntry(authId); delay(250); - Log->print(("Delete authorization: ")); + Log->print("Delete authorization: "); Log->println((int)result); } else @@ -3921,7 +3921,7 @@ void NukiWrapper::onAuthCommandReceived(const char *value) result = _nukiLock.addAuthorizationEntry(entry); delay(250); - Log->print(("Add authorization: ")); + Log->print("Add authorization: "); Log->println((int)result); } else if (strcmp(action, "update") == 0) @@ -4087,7 +4087,7 @@ void NukiWrapper::onAuthCommandReceived(const char *value) result = _nukiLock.updateAuthorizationEntry(entry); delay(250); - Log->print(("Update authorization: ")); + Log->print("Update authorization: "); Log->println((int)result); } } @@ -4191,7 +4191,7 @@ void NukiWrapper::readConfig() char resultStr[20]; NukiLock::cmdResultToString(result, resultStr); - Log->print(("Lock config result: ")); + Log->print("Lock config result: "); Log->println(resultStr); if(result != Nuki::CmdResult::Success) @@ -4219,7 +4219,7 @@ void NukiWrapper::readAdvancedConfig() char resultStr[20]; NukiLock::cmdResultToString(result, resultStr); - Log->print(("Lock advanced config result: ")); + Log->print("Lock advanced config result: "); Log->println(resultStr); if(result != Nuki::CmdResult::Success) @@ -4327,6 +4327,6 @@ void NukiWrapper::updateTime() char resultStr[15] = {0}; NukiLock::cmdResultToString(cmdResult, resultStr); - Log->print(("Lock time update result: ")); + Log->print("Lock time update result: "); Log->println(resultStr); } \ No newline at end of file