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

opener config struct changes

Browse Source
This commit is contained in:
technyon
2022-05-30 23:39:24 +02:00
parent e68c3453db
commit 1fb1f9b6a6
3 changed files with 24 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Network.cpp
View File

@@ -292,12 +292,8 @@ void Network::publishKeyTurnerState(const NukiLock::KeyTurnerState& keyTurnerSta
if(_firstTunerStatePublish || keyTurnerState.criticalBatteryState != lastKeyTurnerState.criticalBatteryState) if(_firstTunerStatePublish || keyTurnerState.criticalBatteryState != lastKeyTurnerState.criticalBatteryState)
{ {
uint8_t level = (keyTurnerState.criticalBatteryState & 0b11111100) >> 1;
bool critical = (keyTurnerState.criticalBatteryState & 0b00000001) > 0; bool critical = (keyTurnerState.criticalBatteryState & 0b00000001) > 0;
bool charging = (keyTurnerState.criticalBatteryState & 0b00000010) > 0;
publishInt(mqtt_topic_battery_level, level); // percent
publishBool(mqtt_topic_battery_critical, critical); publishBool(mqtt_topic_battery_critical, critical);
publishBool(mqtt_topic_battery_charging, charging);
} }
_firstTunerStatePublish = false; _firstTunerStatePublish = false;

9
NetworkOpener.cpp
View File

@@ -157,21 +157,18 @@ void NetworkOpener::publishBatteryReport(const NukiOpener::BatteryReport& batter
{ {
publishFloat(mqtt_topic_battery_voltage, (float)batteryReport.batteryVoltage / 1000.0); publishFloat(mqtt_topic_battery_voltage, (float)batteryReport.batteryVoltage / 1000.0);
publishInt(mqtt_topic_battery_drain, batteryReport.batteryDrain); // milliwatt seconds publishInt(mqtt_topic_battery_drain, batteryReport.batteryDrain); // milliwatt seconds
publishFloat(mqtt_topic_battery_max_turn_current, (float)batteryReport.maxTurnCurrent / 1000.0);
publishInt(mqtt_topic_battery_lock_distance, batteryReport.lockDistance); // degrees
} }
void NetworkOpener::publishConfig(const NukiOpener::Config &config) void NetworkOpener::publishConfig(const NukiOpener::Config &config)
{ {
publishBool(mqtt_topic_config_button_enabled, config.buttonEnabled == 1); publishBool(mqtt_topic_config_button_enabled, config.buttonEnabled == 1);
publishBool(mqtt_topic_config_led_enabled, config.ledEnabled == 1); publishBool(mqtt_topic_config_led_enabled, config.ledFlashEnabled == 1);
publishInt(mqtt_topic_config_led_brightness, config.ledBrightness);
} }
void NetworkOpener::publishAdvancedConfig(const NukiOpener::AdvancedConfig &config) void NetworkOpener::publishAdvancedConfig(const NukiOpener::AdvancedConfig &config)
{ {
publishBool(mqtt_topic_config_auto_unlock, config.autoUnLockDisabled == 0); // publishBool(mqtt_topic_config_auto_unlock, config.autoUnLockDisabled == 0);
publishBool(mqtt_topic_config_auto_lock, config.autoLockEnabled == 1); // publishBool(mqtt_topic_config_auto_lock, config.autoLockEnabled == 1);
} }
void NetworkOpener::setLockActionReceivedCallback(bool (*lockActionReceivedCallback)(const char *)) void NetworkOpener::setLockActionReceivedCallback(bool (*lockActionReceivedCallback)(const char *))

70
NukiOpenerWrapper.cpp
View File

@@ -89,22 +89,22 @@ void NukiOpenerWrapper::update()
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)
{ {
@@ -148,7 +148,7 @@ void NukiOpenerWrapper::unpair()
void NukiOpenerWrapper::updateKeyTurnerState() void NukiOpenerWrapper::updateKeyTurnerState()
{ {
_nukiOpener.requestKeyTurnerState(&_keyTurnerState); _nukiOpener.requestKeyTurnerState(&_keyTurnerState);
// _network->publishKeyTurnerState(_keyTurnerState, _lastKeyTurnerState); _network->publishKeyTurnerState(_keyTurnerState, _lastKeyTurnerState);
if(_keyTurnerState.lockState != _lastKeyTurnerState.lockState) if(_keyTurnerState.lockState != _lastKeyTurnerState.lockState)
{ {
@@ -167,15 +167,15 @@ void NukiOpenerWrapper::updateKeyTurnerState()
void NukiOpenerWrapper::updateBatteryState() void NukiOpenerWrapper::updateBatteryState()
{ {
_nukiOpener.requestBatteryReport(&_batteryReport); _nukiOpener.requestBatteryReport(&_batteryReport);
// _network->publishBatteryReport(_batteryReport); _network->publishBatteryReport(_batteryReport);
} }
void NukiOpenerWrapper::updateConfig() void NukiOpenerWrapper::updateConfig()
{ {
readConfig(); readConfig();
readAdvancedConfig(); readAdvancedConfig();
// _network->publishConfig(_nukiConfig); _network->publishConfig(_nukiConfig);
// _network->publishAdvancedConfig(_nukiAdvancedConfig); _network->publishAdvancedConfig(_nukiAdvancedConfig);
} }
void NukiOpenerWrapper::updateAuthData() void NukiOpenerWrapper::updateAuthData()
@@ -254,38 +254,10 @@ void NukiOpenerWrapper::onConfigUpdateReceived(const char *topic, const char *va
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.ledFlashEnabled == newValue) return;
_nukiOpener.enableLedFlash(newValue); _nukiOpener.enableLedFlash(newValue);
_nextConfigUpdateTs = millis() + 300; _nextConfigUpdateTs = millis() + 300;
} }
else if(strcmp(topic, mqtt_topic_config_led_brightness) == 0)
{
int newValue = atoi(value);
if(!_nukiConfigValid || _nukiConfig.ledBrightness == newValue) return;
_nukiOpener.setLedBrightness(newValue);
_nextConfigUpdateTs = millis() + 300;
}
else if(strcmp(topic, mqtt_topic_config_auto_unlock) == 0)
{
bool newValue = !(atoi(value) > 0);
if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoUnLockDisabled == newValue) return;
_nukiOpener.disableAutoUnlock(newValue);
_nextConfigUpdateTs = millis() + 300;
}
else if(strcmp(topic, mqtt_topic_config_auto_lock) == 0)
{
bool newValue = atoi(value) > 0;
if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoLockEnabled == newValue) return;
_nukiOpener.enableAutoLock(newValue);
_nextConfigUpdateTs = millis() + 300;
}
else if(strcmp(topic, mqtt_topic_config_auto_lock) == 0)
{
bool newValue = atoi(value) > 0;
if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoLockEnabled == newValue) return;
_nukiOpener.enableAutoLock(newValue);
_nextConfigUpdateTs = millis() + 300;
}
} }
const NukiOpener::KeyTurnerState &NukiOpenerWrapper::keyTurnerState() const NukiOpener::KeyTurnerState &NukiOpenerWrapper::keyTurnerState()