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

Add wireless device mode

Browse Source
This commit is contained in:
Simon Stürz 2018-11-02 15:19:03 +01:00
parent c603acdb44
commit 60278c43e3
6 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea-networkmanager/networkconnection.cpp
View File

@ -50,9 +50,9 @@ NetworkConnection::NetworkConnection(const QDBusObjectPath &objectPath, QObject
const QDBusArgument &argument = query.arguments().at(0).value<QDBusArgument>(); const QDBusArgument &argument = query.arguments().at(0).value<QDBusArgument>();
m_connectionSettings = qdbus_cast<ConnectionSettings>(argument); m_connectionSettings = qdbus_cast<ConnectionSettings>(argument);
foreach (const QVariant &connectionVariant, m_connectionSettings.values()) { // foreach (const QVariant &connectionVariant, m_connectionSettings.values()) {
qCDebug(dcNetworkManager()) << connectionVariant; // qCDebug(dcNetworkManager()) << connectionVariant;
} // }
} }
/*! Delete this \l{NetworkConnection} in the \l{NetworkManager}. */ /*! Delete this \l{NetworkConnection} in the \l{NetworkManager}. */

4
libnymea-networkmanager/wirelessnetworkdevice.cpp
View File

@ -224,6 +224,10 @@ void WirelessNetworkDevice::propertiesChanged(const QVariantMap &properties)
if (properties.contains("ActiveAccessPoint")) if (properties.contains("ActiveAccessPoint"))
setActiveAccessPoint(qdbus_cast<QDBusObjectPath>(properties.value("ActiveAccessPoint"))); setActiveAccessPoint(qdbus_cast<QDBusObjectPath>(properties.value("ActiveAccessPoint")));
if (properties.contains("Mode"))
setMode(static_cast<Mode>(m_wirelessInterface->property("Mode").toUInt()));
} }
/*! Writes the given \a device to the given to \a debug. \sa WirelessNetworkDevice, */ /*! Writes the given \a device to the given to \a debug. \sa WirelessNetworkDevice, */

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

@ -430,7 +430,6 @@ void BluetoothServer::stop()
m_localDevice = nullptr; m_localDevice = nullptr;
} }
setConnected(false); setConnected(false);
setRunning(false); setRunning(false);
} }
@ -465,6 +464,12 @@ void BluetoothServer::onWirelessDeviceBitRateChanged(int bitRate)
m_wirelessService->onWirelessDeviceBitRateChanged(bitRate); m_wirelessService->onWirelessDeviceBitRateChanged(bitRate);
} }
void BluetoothServer::onWirelessDeviceModeChanged(WirelessNetworkDevice::Mode mode)
{
if (m_wirelessService)
m_wirelessService->onWirelessModeChanged(mode);
}
void BluetoothServer::onWirelessDeviceStateChanged(const NetworkDevice::NetworkDeviceState state) void BluetoothServer::onWirelessDeviceStateChanged(const NetworkDevice::NetworkDeviceState state)
{ {
if (m_wirelessService) if (m_wirelessService)

1
nymea-networkmanager/bluetooth/bluetoothserver.h
View File

@ -120,6 +120,7 @@ public slots:
// Wireless device // Wireless device
void onWirelessDeviceBitRateChanged(int bitRate); void onWirelessDeviceBitRateChanged(int bitRate);
void onWirelessDeviceModeChanged(WirelessNetworkDevice::Mode mode);
void onWirelessDeviceStateChanged(const NetworkDevice::NetworkDeviceState state); void onWirelessDeviceStateChanged(const NetworkDevice::NetworkDeviceState state);
}; };

16
nymea-networkmanager/core.cpp
View File

@ -271,8 +271,11 @@ void Core::onBluetoothServerConnectedChanged(bool connected)
m_bluetoothServer->onNetworkManagerStateChanged(m_networkManager->state()); m_bluetoothServer->onNetworkManagerStateChanged(m_networkManager->state());
m_bluetoothServer->onNetworkingEnabledChanged(m_networkManager->networkingEnabled()); m_bluetoothServer->onNetworkingEnabledChanged(m_networkManager->networkingEnabled());
m_bluetoothServer->onWirelessNetworkingEnabledChanged(m_networkManager->wirelessEnabled()); m_bluetoothServer->onWirelessNetworkingEnabledChanged(m_networkManager->wirelessEnabled());
if (m_wirelessDevice)
if (m_wirelessDevice) {
m_bluetoothServer->onWirelessDeviceStateChanged(m_wirelessDevice->deviceState()); m_bluetoothServer->onWirelessDeviceStateChanged(m_wirelessDevice->deviceState());
m_bluetoothServer->onWirelessDeviceModeChanged(m_wirelessDevice->mode());
}
} else { } else {
m_advertisingTimer->stop(); m_advertisingTimer->stop();
@ -333,7 +336,8 @@ void Core::onNetworkManagerWirelessDeviceAdded(WirelessNetworkDevice *wirelessDe
} }
m_wirelessDevice = wirelessDevice; m_wirelessDevice = wirelessDevice;
connect(m_wirelessDevice, &WiredNetworkDevice::stateChanged, this, &Core::onWirelessDeviceStateChanged); connect(m_wirelessDevice, &WirelessNetworkDevice::stateChanged, this, &Core::onWirelessDeviceStateChanged);
connect(m_wirelessDevice, &WirelessNetworkDevice::modeChanged, this, &Core::onWirelessDeviceModeChanged);
} }
void Core::onNetworkManagerWirelessDeviceRemoved(const QString &interface) void Core::onNetworkManagerWirelessDeviceRemoved(const QString &interface)
@ -344,7 +348,7 @@ void Core::onNetworkManagerWirelessDeviceRemoved(const QString &interface)
} }
if (m_wirelessDevice->interface() == interface) { if (m_wirelessDevice->interface() == interface) {
disconnect(m_wirelessDevice, &WiredNetworkDevice::stateChanged, this, &Core::onWirelessDeviceStateChanged); disconnect(m_wirelessDevice, &WirelessNetworkDevice::stateChanged, this, &Core::onWirelessDeviceStateChanged);
m_wirelessDevice = nullptr; m_wirelessDevice = nullptr;
} }
} }
@ -355,6 +359,12 @@ void Core::onWirelessDeviceBitRateChanged(int bitRate)
m_bluetoothServer->onWirelessDeviceBitRateChanged(bitRate); m_bluetoothServer->onWirelessDeviceBitRateChanged(bitRate);
} }
void Core::onWirelessDeviceModeChanged(WirelessNetworkDevice::Mode mode)
{
qCDebug(dcApplication()) << "Wireless device mode" << mode;
m_bluetoothServer->onWirelessDeviceModeChanged(mode);
}
void Core::onWirelessDeviceStateChanged(const NetworkDevice::NetworkDeviceState state) void Core::onWirelessDeviceStateChanged(const NetworkDevice::NetworkDeviceState state)
{ {
qCDebug(dcApplication()) << state; qCDebug(dcApplication()) << state;

1
nymea-networkmanager/core.h
View File

@ -99,6 +99,7 @@ private slots:
// Wireless device // Wireless device
void onWirelessDeviceBitRateChanged(int bitRate); void onWirelessDeviceBitRateChanged(int bitRate);
void onWirelessDeviceModeChanged(WirelessNetworkDevice::Mode mode);
void onWirelessDeviceStateChanged(const NetworkDevice::NetworkDeviceState state); void onWirelessDeviceStateChanged(const NetworkDevice::NetworkDeviceState state);
void onNymeaServiceAvailableChanged(bool available); void onNymeaServiceAvailableChanged(bool available);