Merge PR #19: Handle Bluetooth controller resets better

This commit is contained in:
Jenkins nymea 2022-03-10 12:34:12 +01:00
commit 80a47028c0

View File

@ -290,6 +290,7 @@ void BluetoothServer::onHostModeStateChanged(const QBluetoothLocalDevice::HostMo
break; break;
case QBluetoothLocalDevice::HostPoweredOff: case QBluetoothLocalDevice::HostPoweredOff:
qCDebug(dcNetworkManagerBluetoothServer()) << "Bluetooth host in power off mode."; qCDebug(dcNetworkManagerBluetoothServer()) << "Bluetooth host in power off mode.";
setRunning(false);
break; break;
case QBluetoothLocalDevice::HostDiscoverableLimitedInquiry: case QBluetoothLocalDevice::HostDiscoverableLimitedInquiry:
qCDebug(dcNetworkManagerBluetoothServer()) << "Bluetooth host in discoverable limited inquiry mode."; qCDebug(dcNetworkManagerBluetoothServer()) << "Bluetooth host in discoverable limited inquiry mode.";
@ -310,7 +311,7 @@ void BluetoothServer::onDeviceDisconnected(const QBluetoothAddress &address)
void BluetoothServer::onError(QLowEnergyController::Error error) void BluetoothServer::onError(QLowEnergyController::Error error)
{ {
qCWarning(dcNetworkManagerBluetoothServer()) << "Bluetooth error occured:" << error << m_controller->errorString(); qCWarning(dcNetworkManagerBluetoothServer()) << "Bluetooth error occurred:" << error << m_controller->errorString();
} }
void BluetoothServer::onConnected() void BluetoothServer::onConnected()
@ -322,6 +323,7 @@ void BluetoothServer::onConnected()
void BluetoothServer::onDisconnected() void BluetoothServer::onDisconnected()
{ {
qCDebug(dcNetworkManagerBluetoothServer()) << "Client disconnected"; qCDebug(dcNetworkManagerBluetoothServer()) << "Client disconnected";
setConnected(false);
stop(); stop();
} }
@ -330,6 +332,7 @@ void BluetoothServer::onControllerStateChanged(QLowEnergyController::ControllerS
switch (state) { switch (state) {
case QLowEnergyController::UnconnectedState: case QLowEnergyController::UnconnectedState:
qCDebug(dcNetworkManagerBluetoothServer()) << "Controller state disonnected."; qCDebug(dcNetworkManagerBluetoothServer()) << "Controller state disonnected.";
setConnected(false);
setRunning(false); setRunning(false);
break; break;
case QLowEnergyController::ConnectingState: case QLowEnergyController::ConnectingState: