inject ble scanner into nuki ble

This commit is contained in:
technyon
2022-04-02 08:53:05 +02:00
parent 8132f1da43
commit 8761c0f764
3 changed files with 6 additions and 3 deletions

View File

@@ -21,7 +21,9 @@ Nuki::Nuki(const std::string& name, uint32_t id, Network* network, Preferences*
void Nuki::initialize() void Nuki::initialize()
{ {
_bleScanner.initialize();
_nukiBle.initialize(); _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);
@@ -61,7 +63,8 @@ void Nuki::update()
} }
} }
vTaskDelay( 200 / portTICK_PERIOD_MS); vTaskDelay( 20 / portTICK_PERIOD_MS);
_bleScanner.update();
unsigned long ts = millis(); unsigned long ts = millis();
@@ -81,7 +84,6 @@ void Nuki::update()
_nukiBle.lockAction(_nextLockAction, 0, 0); _nukiBle.lockAction(_nextLockAction, 0, 0);
_nextLockAction = (LockAction)0xff; _nextLockAction = (LockAction)0xff;
} }
_nukiBle.update();
} }
void Nuki::updateKeyTurnerState() void Nuki::updateKeyTurnerState()

1
Nuki.h
View File

@@ -30,6 +30,7 @@ private:
void doorSensorStateToString(const DoorSensorState state, char* str); // char arry at least 17 characters void doorSensorStateToString(const DoorSensorState state, char* str); // char arry at least 17 characters
NukiBle _nukiBle; NukiBle _nukiBle;
BleScanner _bleScanner;
Network* _network; Network* _network;
Preferences* _preferences; Preferences* _preferences;
int _intervalLockstate = 0; // seconds int _intervalLockstate = 0; // seconds