ETM-Schurig/powersync-networkmanager
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Init with correct state values

Browse Source
This commit is contained in:
Simon Stürz 2018-05-11 16:21:37 +02:00
parent 05f949b176
commit 01d5387533
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nymea-networkmanager.service
View File

@ -4,7 +4,7 @@ Documentation=https://github.com/guh/nymea-networkmanager
After=network.target After=network.target
[Service] [Service]
ExecStart=/usr/bin/nymea-networkmanager -a nymea -p nymea-box ExecStart=/usr/bin/nymea-networkmanager -d -a nymea -p nymea-box
StandardOutput=journal StandardOutput=journal
StandardError=journal StandardError=journal
Restart=on-failure Restart=on-failure

2
nymea-networkmanager/bluetooth/bluetoothserver.cpp
View File

@ -390,7 +390,7 @@ void BluetoothServer::start(WirelessNetworkDevice *wirelessDevice)
m_genericAttributeService = m_controller->addService(genericAttributeServiceData(), m_controller); m_genericAttributeService = m_controller->addService(genericAttributeServiceData(), m_controller);
// Create services // 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); m_wirelessService = new WirelessService(m_controller->addService(WirelessService::serviceData(), m_controller), wirelessDevice, m_controller);
startAdvertising(); startAdvertising();

10
nymea-networkmanager/bluetooth/networkservice.cpp
View File

@ -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(characteristicWritten(QLowEnergyCharacteristic, QByteArray)), this, SLOT(characteristicWritten(QLowEnergyCharacteristic, QByteArray)));
connect(m_service, SIGNAL(descriptorWritten(QLowEnergyDescriptor, QByteArray)), this, SLOT(descriptorWritten(QLowEnergyDescriptor, 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(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() QLowEnergyService *NetworkService::service()

1
nymea-networkmanager/bluetooth/wirelessservice.cpp
View File

@ -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(descriptorWritten(QLowEnergyDescriptor, QByteArray)), this, SLOT(descriptorWritten(QLowEnergyDescriptor, QByteArray)));
connect(m_service, SIGNAL(error(QLowEnergyService::ServiceError)), this, SLOT(serviceError(QLowEnergyService::ServiceError))); connect(m_service, SIGNAL(error(QLowEnergyService::ServiceError)), this, SLOT(serviceError(QLowEnergyService::ServiceError)));
qCDebug(dcBluetoothServer()) << "WirelessService: Using" << m_device; qCDebug(dcBluetoothServer()) << "WirelessService: Using" << m_device;
connect(m_device, &WirelessNetworkDevice::bitRateChanged, this, &WirelessService::onWirelessDeviceBitRateChanged); connect(m_device, &WirelessNetworkDevice::bitRateChanged, this, &WirelessService::onWirelessDeviceBitRateChanged);
connect(m_device, &WirelessNetworkDevice::stateChanged, this, &WirelessService::onWirelessDeviceStateChanged); connect(m_device, &WirelessNetworkDevice::stateChanged, this, &WirelessService::onWirelessDeviceStateChanged);

2
nymea-networkmanager/core.cpp
View File

@ -240,7 +240,7 @@ void Core::onNetworkManagerNetworkingEnabledChanged(bool enabled)
void Core::onNetworkManagerWirelessEnabledChanged(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); m_bluetoothServer->onWirelessNetworkingEnabledChanged(enabled);
evaluateNetworkManagerState(m_networkManager->state()); evaluateNetworkManagerState(m_networkManager->state());
} }