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

opener fixes

Browse Source
This commit is contained in:
technyon
2022-05-30 21:24:35 +02:00
parent 875dc34012
commit 836b84b549
7 changed files with 57 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -7,7 +7,7 @@ project(nuki_hub CXX)
# ARDUHAL_LOG_LEVEL_NONE, define ARDUHAL_LOG_LEVEL_ERROR, define ARDUHAL_LOG_LEVEL_WARN, define ARDUHAL_LOG_LEVEL_INFO, # ARDUHAL_LOG_LEVEL_NONE, define ARDUHAL_LOG_LEVEL_ERROR, define ARDUHAL_LOG_LEVEL_WARN, define ARDUHAL_LOG_LEVEL_INFO,
# define ARDUHAL_LOG_LEVEL_DEBUG, define ARDUHAL_LOG_LEVEL_VERBOSE # define ARDUHAL_LOG_LEVEL_DEBUG, define ARDUHAL_LOG_LEVEL_VERBOSE
set(LOG_LEVEL ARDUHAL_LOG_LEVEL_NONE) set(LOG_LEVEL ARDUHAL_LOG_LEVEL_DEBUG)
include_directories(${PROJECT_NAME} include_directories(${PROJECT_NAME}
PRIVATE PRIVATE

15
Network.cpp
View File

@@ -89,21 +89,6 @@ void Network::initialize()
_preferences->putString(preference_mqtt_lock_path, _mqttPath); _preferences->putString(preference_mqtt_lock_path, _mqttPath);
} }
String mqttOpenerPath = _preferences->getString(preference_mqtt_opener_path);
if(mqttOpenerPath.length() > 0)
{
size_t len = mqttOpenerPath.length();
for(int i=0; i < len; i++)
{
_mqttOpenerPath[i] = mqttOpenerPath.charAt(i);
}
}
else
{
strcpy(_mqttOpenerPath, "nukiopener");
_preferences->putString(preference_mqtt_opener_path, _mqttOpenerPath);
}
String mqttUser = _preferences->getString(preference_mqtt_user); String mqttUser = _preferences->getString(preference_mqtt_user);
if(mqttUser.length() > 0) if(mqttUser.length() > 0)
{ {

1
Network.h
View File

@@ -67,7 +67,6 @@ private:
unsigned long _nextReconnect = 0; unsigned long _nextReconnect = 0;
char _mqttBrokerAddr[101] = {0}; char _mqttBrokerAddr[101] = {0};
char _mqttPath[181] = {0}; char _mqttPath[181] = {0};
char _mqttOpenerPath[181] = {0};
char _mqttUser[31] = {0}; char _mqttUser[31] = {0};
char _mqttPass[31] = {0}; char _mqttPass[31] = {0};
int _networkTimeout = 0; int _networkTimeout = 0;

97
NukiOpenerWrapper.cpp
View File

@@ -6,9 +6,10 @@
NukiOpenerWrapper* nukiOpenerInst; NukiOpenerWrapper* nukiOpenerInst;
NukiOpenerWrapper::NukiOpenerWrapper(const std::string& deviceName, uint32_t id, Network* network, Preferences* preferences) NukiOpenerWrapper::NukiOpenerWrapper(const std::string& deviceName, uint32_t id, BleScanner::Scanner* scanner, Network* network, Preferences* preferences)
: _deviceName(deviceName), : _deviceName(deviceName),
_nukiBle(deviceName, id), _nukiOpener(deviceName, id),
_bleScanner(scanner),
_network(network), _network(network),
_preferences(preferences) _preferences(preferences)
{ {
@@ -27,18 +28,14 @@ NukiOpenerWrapper::NukiOpenerWrapper(const std::string& deviceName, uint32_t id,
NukiOpenerWrapper::~NukiOpenerWrapper() NukiOpenerWrapper::~NukiOpenerWrapper()
{ {
delete _bleScanner;
_bleScanner = nullptr; _bleScanner = nullptr;
} }
void NukiOpenerWrapper::initialize() void NukiOpenerWrapper::initialize()
{ {
_bleScanner = new BleScanner::Scanner(); _nukiOpener.initialize();
_bleScanner->initialize(_deviceName); _nukiOpener.registerBleScanner(_bleScanner);
_bleScanner->setScanDuration(10);
_nukiBle.initialize();
_nukiBle.registerBleScanner(_bleScanner);
_intervalLockstate = _preferences->getInt(preference_query_interval_lockstate); _intervalLockstate = _preferences->getInt(preference_query_interval_lockstate);
_intervalBattery = _preferences->getInt(preference_query_interval_battery); _intervalBattery = _preferences->getInt(preference_query_interval_battery);
@@ -55,7 +52,7 @@ void NukiOpenerWrapper::initialize()
_preferences->putInt(preference_query_interval_battery, _intervalBattery); _preferences->putInt(preference_query_interval_battery, _intervalBattery);
} }
_nukiBle.setEventHandler(this); _nukiOpener.setEventHandler(this);
Serial.print(F("Lock state interval: ")); Serial.print(F("Lock state interval: "));
Serial.print(_intervalLockstate); Serial.print(_intervalLockstate);
@@ -73,12 +70,12 @@ void NukiOpenerWrapper::initialize()
void NukiOpenerWrapper::update() void NukiOpenerWrapper::update()
{ {
if (!_paired) { if (!_paired) {
Serial.println(F("Nuki start pairing")); Serial.println(F("Nuki opener start pairing"));
_bleScanner->update(); _bleScanner->update();
vTaskDelay( 5000 / portTICK_PERIOD_MS); vTaskDelay( 5000 / portTICK_PERIOD_MS);
if (_nukiBle.pairNuki() == NukiOpener::PairingResult::Success) { if (_nukiOpener.pairNuki() == NukiOpener::PairingResult::Success) {
Serial.println(F("Nuki paired")); Serial.println(F("Nuki opener paired"));
_paired = true; _paired = true;
} }
else else
@@ -88,32 +85,30 @@ void NukiOpenerWrapper::update()
} }
} }
vTaskDelay( 20 / portTICK_PERIOD_MS); _nukiOpener.updateConnectionState();
_bleScanner->update();
_nukiBle.updateConnectionState();
unsigned long ts = millis(); unsigned long ts = millis();
if(_statusUpdated || _nextLockStateUpdateTs == 0 || ts >= _nextLockStateUpdateTs) // if(_statusUpdated || _nextLockStateUpdateTs == 0 || ts >= _nextLockStateUpdateTs)
{ // {
_statusUpdated = false; // _statusUpdated = false;
_nextLockStateUpdateTs = ts + _intervalLockstate * 1000; // _nextLockStateUpdateTs = ts + _intervalLockstate * 1000;
updateKeyTurnerState(); // updateKeyTurnerState();
} // }
if(_nextBatteryReportTs == 0 || ts > _nextBatteryReportTs) // if(_nextBatteryReportTs == 0 || ts > _nextBatteryReportTs)
{ // {
_nextBatteryReportTs = ts + _intervalBattery * 1000; // _nextBatteryReportTs = ts + _intervalBattery * 1000;
updateBatteryState(); // updateBatteryState();
} // }
if(_nextConfigUpdateTs == 0 || ts > _nextConfigUpdateTs) // if(_nextConfigUpdateTs == 0 || ts > _nextConfigUpdateTs)
{ // {
_nextConfigUpdateTs = ts + _intervalConfig * 1000; // _nextConfigUpdateTs = ts + _intervalConfig * 1000;
updateConfig(); // updateConfig();
} // }
if(_nextLockAction != (NukiOpener::LockAction)0xff) if(_nextLockAction != (NukiOpener::LockAction)0xff)
{ {
NukiOpener::CmdResult cmdResult = _nukiBle.lockAction(_nextLockAction, 0, 0); NukiOpener::CmdResult cmdResult = _nukiOpener.lockAction(_nextLockAction, 0, 0);
char resultStr[15] = {0}; char resultStr[15] = {0};
NukiOpener::cmdResultToString(cmdResult, resultStr); NukiOpener::cmdResultToString(cmdResult, resultStr);
@@ -136,30 +131,30 @@ void NukiOpenerWrapper::update()
_clearAuthData = false; _clearAuthData = false;
} }
memcpy(&_lastKeyTurnerState, &_keyTurnerState, sizeof(NukiLock::KeyTurnerState)); memcpy(&_lastKeyTurnerState, &_keyTurnerState, sizeof(NukiOpener::KeyTurnerState));
} }
void NukiOpenerWrapper::setPin(const uint16_t pin) void NukiOpenerWrapper::setPin(const uint16_t pin)
{ {
_nukiBle.saveSecurityPincode(pin); _nukiOpener.saveSecurityPincode(pin);
} }
void NukiOpenerWrapper::unpair() void NukiOpenerWrapper::unpair()
{ {
_nukiBle.unPairNuki(); _nukiOpener.unPairNuki();
_paired = false; _paired = false;
} }
void NukiOpenerWrapper::updateKeyTurnerState() void NukiOpenerWrapper::updateKeyTurnerState()
{ {
_nukiBle.requestKeyTurnerState(&_keyTurnerState); _nukiOpener.requestKeyTurnerState(&_keyTurnerState);
// _network->publishKeyTurnerState(_keyTurnerState, _lastKeyTurnerState); // _network->publishKeyTurnerState(_keyTurnerState, _lastKeyTurnerState);
if(_keyTurnerState.lockState != _lastKeyTurnerState.lockState) if(_keyTurnerState.lockState != _lastKeyTurnerState.lockState)
{ {
char lockStateStr[20]; char lockStateStr[20];
lockstateToString(_keyTurnerState.lockState, lockStateStr); lockstateToString(_keyTurnerState.lockState, lockStateStr);
Serial.print(F("Nuki lock state: ")); Serial.print(F("Nuki opener state: "));
Serial.println(lockStateStr); Serial.println(lockStateStr);
} }
@@ -171,7 +166,7 @@ void NukiOpenerWrapper::updateKeyTurnerState()
void NukiOpenerWrapper::updateBatteryState() void NukiOpenerWrapper::updateBatteryState()
{ {
_nukiBle.requestBatteryReport(&_batteryReport); _nukiOpener.requestBatteryReport(&_batteryReport);
// _network->publishBatteryReport(_batteryReport); // _network->publishBatteryReport(_batteryReport);
} }
@@ -185,7 +180,7 @@ void NukiOpenerWrapper::updateConfig()
void NukiOpenerWrapper::updateAuthData() void NukiOpenerWrapper::updateAuthData()
{ {
Nuki::CmdResult result = _nukiBle.retrieveLogEntries(0, 0, 0, true); Nuki::CmdResult result = _nukiOpener.retrieveLogEntries(0, 0, 0, true);
if(result != Nuki::CmdResult::Success) if(result != Nuki::CmdResult::Success)
{ {
_network->publishAuthorizationInfo(0, ""); _network->publishAuthorizationInfo(0, "");
@@ -193,7 +188,7 @@ void NukiOpenerWrapper::updateAuthData()
} }
vTaskDelay( 100 / portTICK_PERIOD_MS); vTaskDelay( 100 / portTICK_PERIOD_MS);
result = _nukiBle.retrieveLogEntries(_nukiBle.getLogEntryCount() - 2, 1, 0, false); result = _nukiOpener.retrieveLogEntries(_nukiOpener.getLogEntryCount() - 2, 1, 0, false);
if(result != Nuki::CmdResult::Success) if(result != Nuki::CmdResult::Success)
{ {
_network->publishAuthorizationInfo(0, ""); _network->publishAuthorizationInfo(0, "");
@@ -202,7 +197,7 @@ void NukiOpenerWrapper::updateAuthData()
vTaskDelay( 200 / portTICK_PERIOD_MS); vTaskDelay( 200 / portTICK_PERIOD_MS);
std::list<NukiOpener::LogEntry> log; std::list<NukiOpener::LogEntry> log;
_nukiBle.getLogEntries(&log); _nukiOpener.getLogEntries(&log);
if(log.size() > 0) if(log.size() > 0)
{ {
@@ -253,42 +248,42 @@ void NukiOpenerWrapper::onConfigUpdateReceived(const char *topic, const char *va
{ {
bool newValue = atoi(value) > 0; bool newValue = atoi(value) > 0;
if(!_nukiConfigValid || _nukiConfig.buttonEnabled == newValue) return; if(!_nukiConfigValid || _nukiConfig.buttonEnabled == newValue) return;
_nukiBle.enableButton(newValue); _nukiOpener.enableButton(newValue);
_nextConfigUpdateTs = millis() + 300; _nextConfigUpdateTs = millis() + 300;
} }
if(strcmp(topic, mqtt_topic_config_led_enabled) == 0) if(strcmp(topic, mqtt_topic_config_led_enabled) == 0)
{ {
bool newValue = atoi(value) > 0; bool newValue = atoi(value) > 0;
if(!_nukiConfigValid || _nukiConfig.ledEnabled == newValue) return; if(!_nukiConfigValid || _nukiConfig.ledEnabled == newValue) return;
_nukiBle.enableLedFlash(newValue); _nukiOpener.enableLedFlash(newValue);
_nextConfigUpdateTs = millis() + 300; _nextConfigUpdateTs = millis() + 300;
} }
else if(strcmp(topic, mqtt_topic_config_led_brightness) == 0) else if(strcmp(topic, mqtt_topic_config_led_brightness) == 0)
{ {
int newValue = atoi(value); int newValue = atoi(value);
if(!_nukiConfigValid || _nukiConfig.ledBrightness == newValue) return; if(!_nukiConfigValid || _nukiConfig.ledBrightness == newValue) return;
_nukiBle.setLedBrightness(newValue); _nukiOpener.setLedBrightness(newValue);
_nextConfigUpdateTs = millis() + 300; _nextConfigUpdateTs = millis() + 300;
} }
else if(strcmp(topic, mqtt_topic_config_auto_unlock) == 0) else if(strcmp(topic, mqtt_topic_config_auto_unlock) == 0)
{ {
bool newValue = !(atoi(value) > 0); bool newValue = !(atoi(value) > 0);
if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoUnLockDisabled == newValue) return; if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoUnLockDisabled == newValue) return;
_nukiBle.disableAutoUnlock(newValue); _nukiOpener.disableAutoUnlock(newValue);
_nextConfigUpdateTs = millis() + 300; _nextConfigUpdateTs = millis() + 300;
} }
else if(strcmp(topic, mqtt_topic_config_auto_lock) == 0) else if(strcmp(topic, mqtt_topic_config_auto_lock) == 0)
{ {
bool newValue = atoi(value) > 0; bool newValue = atoi(value) > 0;
if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoLockEnabled == newValue) return; if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoLockEnabled == newValue) return;
_nukiBle.enableAutoLock(newValue); _nukiOpener.enableAutoLock(newValue);
_nextConfigUpdateTs = millis() + 300; _nextConfigUpdateTs = millis() + 300;
} }
else if(strcmp(topic, mqtt_topic_config_auto_lock) == 0) else if(strcmp(topic, mqtt_topic_config_auto_lock) == 0)
{ {
bool newValue = atoi(value) > 0; bool newValue = atoi(value) > 0;
if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoLockEnabled == newValue) return; if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoLockEnabled == newValue) return;
_nukiBle.enableAutoLock(newValue); _nukiOpener.enableAutoLock(newValue);
_nextConfigUpdateTs = millis() + 300; _nextConfigUpdateTs = millis() + 300;
} }
} }
@@ -318,16 +313,16 @@ void NukiOpenerWrapper::notify(Nuki::EventType eventType)
void NukiOpenerWrapper::readConfig() void NukiOpenerWrapper::readConfig()
{ {
Serial.print(F("Reading config. Result: ")); Serial.print(F("Reading opener config. Result: "));
Nuki::CmdResult result = _nukiBle.requestConfig(&_nukiConfig); Nuki::CmdResult result = _nukiOpener.requestConfig(&_nukiConfig);
_nukiConfigValid = result == Nuki::CmdResult::Success; _nukiConfigValid = result == Nuki::CmdResult::Success;
Serial.println(result); Serial.println(result);
} }
void NukiOpenerWrapper::readAdvancedConfig() void NukiOpenerWrapper::readAdvancedConfig()
{ {
Serial.print(F("Reading advanced config. Result: ")); Serial.print(F("Reading opener advanced config. Result: "));
Nuki::CmdResult result = _nukiBle.requestAdvancedConfig(&_nukiAdvancedConfig); Nuki::CmdResult result = _nukiOpener.requestAdvancedConfig(&_nukiAdvancedConfig);
_nukiAdvancedConfigValid = result == Nuki::CmdResult::Success; _nukiAdvancedConfigValid = result == Nuki::CmdResult::Success;
Serial.println(result); Serial.println(result);
} }

4
NukiOpenerWrapper.h
View File

@@ -9,7 +9,7 @@
class NukiOpenerWrapper : public NukiOpener::SmartlockEventHandler class NukiOpenerWrapper : public NukiOpener::SmartlockEventHandler
{ {
public: public:
NukiOpenerWrapper(const std::string& deviceName, uint32_t id, Network* network, Preferences* preferences); NukiOpenerWrapper(const std::string& deviceName, uint32_t id, BleScanner::Scanner* scanner, Network* network, Preferences* preferences);
virtual ~NukiOpenerWrapper(); virtual ~NukiOpenerWrapper();
void initialize(); void initialize();
@@ -42,7 +42,7 @@ private:
NukiOpener::LockAction lockActionToEnum(const char* str); // char array at least 14 characters NukiOpener::LockAction lockActionToEnum(const char* str); // char array at least 14 characters
std::string _deviceName; std::string _deviceName;
NukiOpener::NukiOpener _nukiBle; NukiOpener::NukiOpener _nukiOpener;
BleScanner::Scanner* _bleScanner; BleScanner::Scanner* _bleScanner;
Network* _network; Network* _network;
Preferences* _preferences; Preferences* _preferences;

8
main.cpp
View File

@@ -33,6 +33,7 @@ void nukiTask(void *pvParameters)
while(true) while(true)
{ {
nuki->update(); nuki->update();
nukiOpener->update();
} }
} }
@@ -122,10 +123,13 @@ void setup()
initEthServer(networkDevice); initEthServer(networkDevice);
nuki = new NukiWrapper("NukiHub", deviceId, network, preferences); nuki = new NukiWrapper("NukiHub", deviceId, network, preferences);
// nukiOpener = new NukiOpenerWrapper("NukiHub", deviceId, network, preferences); nuki->initialize();
nukiOpener = new NukiOpenerWrapper("NukiHub", deviceId, nuki->bleScanner(), network, preferences);
nukiOpener->initialize();
webCfgServer = new WebCfgServer(nuki, network, ethServer, preferences, networkDevice == NetworkDeviceType::WiFi); webCfgServer = new WebCfgServer(nuki, network, ethServer, preferences, networkDevice == NetworkDeviceType::WiFi);
webCfgServer->initialize(); webCfgServer->initialize();
nuki->initialize();
presenceDetection = new PresenceDetection(preferences, nuki->bleScanner(), network); presenceDetection = new PresenceDetection(preferences, nuki->bleScanner(), network);
presenceDetection->initialize(); presenceDetection->initialize();