From 01d5387533578e4d0d416b5eeb8e3bf50d59817d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 11 May 2018 16:21:37 +0200 Subject: [PATCH] Init with correct state values --- nymea-networkmanager.service | 2 +- nymea-networkmanager/bluetooth/bluetoothserver.cpp | 2 +- nymea-networkmanager/bluetooth/networkservice.cpp | 10 ++++++++++ nymea-networkmanager/bluetooth/wirelessservice.cpp | 1 - nymea-networkmanager/core.cpp | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/nymea-networkmanager.service b/nymea-networkmanager.service index 354c524..0bcbe24 100644 --- a/nymea-networkmanager.service +++ b/nymea-networkmanager.service @@ -4,7 +4,7 @@ Documentation=https://github.com/guh/nymea-networkmanager After=network.target [Service] -ExecStart=/usr/bin/nymea-networkmanager -a nymea -p nymea-box +ExecStart=/usr/bin/nymea-networkmanager -d -a nymea -p nymea-box StandardOutput=journal StandardError=journal Restart=on-failure diff --git a/nymea-networkmanager/bluetooth/bluetoothserver.cpp b/nymea-networkmanager/bluetooth/bluetoothserver.cpp index e604854..147fff8 100644 --- a/nymea-networkmanager/bluetooth/bluetoothserver.cpp +++ b/nymea-networkmanager/bluetooth/bluetoothserver.cpp @@ -390,7 +390,7 @@ void BluetoothServer::start(WirelessNetworkDevice *wirelessDevice) m_genericAttributeService = m_controller->addService(genericAttributeServiceData(), m_controller); // Create services - m_networkService = new NetworkService(m_controller->addService(NetworkService::serviceData(), m_controller), m_controller); + m_networkService = new NetworkService(m_controller->addService(NetworkService::serviceData(), m_controller), m_controller); m_wirelessService = new WirelessService(m_controller->addService(WirelessService::serviceData(), m_controller), wirelessDevice, m_controller); startAdvertising(); diff --git a/nymea-networkmanager/bluetooth/networkservice.cpp b/nymea-networkmanager/bluetooth/networkservice.cpp index db162ba..39f0d14 100644 --- a/nymea-networkmanager/bluetooth/networkservice.cpp +++ b/nymea-networkmanager/bluetooth/networkservice.cpp @@ -40,6 +40,16 @@ NetworkService::NetworkService(QLowEnergyService *service, QObject *parent) : connect(m_service, SIGNAL(characteristicWritten(QLowEnergyCharacteristic, QByteArray)), this, SLOT(characteristicWritten(QLowEnergyCharacteristic, QByteArray))); connect(m_service, SIGNAL(descriptorWritten(QLowEnergyDescriptor, QByteArray)), this, SLOT(descriptorWritten(QLowEnergyDescriptor, QByteArray))); connect(m_service, SIGNAL(error(QLowEnergyService::ServiceError)), this, SLOT(serviceError(QLowEnergyService::ServiceError))); + + connect(Core::instance()->networkManager(), &NetworkManager::stateChanged, this, &NetworkService::setNetworkManagerState); + connect(Core::instance()->networkManager(), &NetworkManager::availableChanged, this, &NetworkService::setNetworkManagerAvailable); + connect(Core::instance()->networkManager(), &NetworkManager::networkingEnabledChanged, this, &NetworkService::setNetworkingEnabled); + connect(Core::instance()->networkManager(), &NetworkManager::wirelessEnabledChanged, this, &NetworkService::setWirelessNetworkingEnabled); + + setNetworkManagerState(Core::instance()->networkManager()->state()); + setNetworkManagerAvailable(Core::instance()->networkManager()->available()); + setNetworkingEnabled(Core::instance()->networkManager()->networkingEnabled()); + setWirelessNetworkingEnabled(Core::instance()->networkManager()->wirelessEnabled()); } QLowEnergyService *NetworkService::service() diff --git a/nymea-networkmanager/bluetooth/wirelessservice.cpp b/nymea-networkmanager/bluetooth/wirelessservice.cpp index 7294995..a0f480e 100644 --- a/nymea-networkmanager/bluetooth/wirelessservice.cpp +++ b/nymea-networkmanager/bluetooth/wirelessservice.cpp @@ -45,7 +45,6 @@ WirelessService::WirelessService(QLowEnergyService *service, WirelessNetworkDevi connect(m_service, SIGNAL(descriptorWritten(QLowEnergyDescriptor, QByteArray)), this, SLOT(descriptorWritten(QLowEnergyDescriptor, QByteArray))); connect(m_service, SIGNAL(error(QLowEnergyService::ServiceError)), this, SLOT(serviceError(QLowEnergyService::ServiceError))); - qCDebug(dcBluetoothServer()) << "WirelessService: Using" << m_device; connect(m_device, &WirelessNetworkDevice::bitRateChanged, this, &WirelessService::onWirelessDeviceBitRateChanged); connect(m_device, &WirelessNetworkDevice::stateChanged, this, &WirelessService::onWirelessDeviceStateChanged); diff --git a/nymea-networkmanager/core.cpp b/nymea-networkmanager/core.cpp index 88afd05..0135685 100644 --- a/nymea-networkmanager/core.cpp +++ b/nymea-networkmanager/core.cpp @@ -240,7 +240,7 @@ void Core::onNetworkManagerNetworkingEnabledChanged(bool enabled) void Core::onNetworkManagerWirelessEnabledChanged(bool enabled) { - qCDebug(dcApplication()) << "Networkmanager wireless networking is now" << (enabled ? "enabled" : "disabled"); + qCDebug(dcApplication()) << "Networkmanager wireless networking is now" << (enabled ? "enabled" : "disabled"); m_bluetoothServer->onWirelessNetworkingEnabledChanged(enabled); evaluateNetworkManagerState(m_networkManager->state()); }