Merge branch 'dynamic-bt' of https://github.com/janmulder/subsurface

core/btdiscovery.cpp

@@ -60,6 +60,12 @@ BTDiscovery::BTDiscovery(QObject *parent)
 	}
 	m_instance = this;
 #if defined(BT_SUPPORT)
+	BTDiscoveryReDiscover();
+#endif
+}
+
+void BTDiscovery::BTDiscoveryReDiscover()
+{
 #if !defined(Q_OS_IOS)
 	if (localBtDevice.isValid() &&
 	    localBtDevice.hostMode() == QBluetoothLocalDevice::HostConnectable) {
@@ -100,7 +106,6 @@ BTDiscovery::BTDiscovery(QObject *parent)
 		m_btValid = false;
 	}
 #endif
-#endif
 }
 
 BTDiscovery::~BTDiscovery()

core/btdiscovery.h

@@ -46,6 +46,8 @@ public:
 	void getBluetoothDevices();
 #endif
 	QList<btVendorProduct> getBtDcs();
+	QBluetoothLocalDevice localBtDevice;
+	void BTDiscoveryReDiscover();
 
 private:
 	static BTDiscovery *m_instance;
@@ -59,7 +61,6 @@ private:
 #endif
 
 	QList<struct btPairedDevice> btPairedDevices;
-	QBluetoothLocalDevice localBtDevice;
 	QBluetoothDeviceDiscoveryAgent *discoveryAgent;
 
 signals:

core/connectionlistmodel.cpp

@@ -42,3 +42,10 @@ void ConnectionListModel::addAddress(const QString address)
 	m_addresses.append(address);
 	endInsertRows();
 }
+
+void ConnectionListModel::removeAllAddresses()
+{
+	beginRemoveRows(QModelIndex(), 0, rowCount());
+	m_addresses.clear();
+	endRemoveRows();
+}

core/connectionlistmodel.h

@@ -15,6 +15,7 @@ public:
 	QString address(int idx) const;
 	int rowCount(const QModelIndex &parent = QModelIndex()) const;
 	void addAddress(const QString address);
+	void removeAllAddresses();
 private:
 	QStringList m_addresses;
 };

core/qt-gui.h

@@ -7,6 +7,7 @@ void init_ui();
 
 void run_ui();
 void exit_ui();
+void set_non_bt_addresses();
 
 #if defined(SUBSURFACE_MOBILE)
 #include <QQuickWindow>

mobile-widgets/qml/DownloadFromDiveComputer.qml

@@ -17,8 +17,8 @@ Kirigami.Page {
 
 	property alias dcImportModel: importModel
 	property bool divesDownloaded: false
-	property bool btEnabled: manager.btEnabled()
+	property bool btEnabled: manager.btEnabled
-	property string btMessage: manager.btEnabled() ? "" : qsTr("Bluetooth is not enabled")
+	property string btMessage: manager.btEnabled ? "" : qsTr("Bluetooth is not enabled")
 
 	DCDownloadThread {
 		id: downloadThread

mobile-widgets/qmlmanager.cpp

@@ -12,6 +12,7 @@
 #include <QElapsedTimer>
 #include <QTimer>
 #include <QDateTime>
+#include <QBluetoothLocalDevice>
 
 #include "qt-models/divelistmodel.h"
 #include "qt-models/gpslistmodel.h"
@@ -77,6 +78,23 @@ extern "C" int gitProgressCB(const char *text)
 	return 0;
 }
 
+void QMLManager::btHostModeChange(QBluetoothLocalDevice::HostMode state)
+{
+	BTDiscovery *btDiscovery = BTDiscovery::instance();
+
+	qDebug() << "btHostModeChange to " << state;
+	if (state != QBluetoothLocalDevice::HostPoweredOff) {
+		connectionListModel.removeAllAddresses();
+		btDiscovery->BTDiscoveryReDiscover();
+		m_btEnabled = btDiscovery->btAvailable();
+	} else {
+		connectionListModel.removeAllAddresses();
+		set_non_bt_addresses();
+		m_btEnabled = false;
+	}
+	emit btEnabledChanged();
+}
+
 QMLManager::QMLManager() : m_locationServiceEnabled(false),
 	m_verboseEnabled(false),
 	reply(0),
@@ -117,6 +135,8 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false),
 	// to QML, but that doesn't seem to always work
 	BTDiscovery *btDiscovery = BTDiscovery::instance();
 	m_btEnabled = btDiscovery->btAvailable();
+	connect(&btDiscovery->localBtDevice, &QBluetoothLocalDevice::hostModeStateChanged,
+		this, &QMLManager::btHostModeChange);
 #else
 	m_btEnabled = false;
 #endif
@@ -1659,6 +1679,11 @@ bool QMLManager::btEnabled() const
 	return m_btEnabled;
 }
 
+void QMLManager::setBtEnabled(bool value)
+{
+	m_btEnabled = value;
+}
+
 #if defined (Q_OS_ANDROID)
 
 void writeToAppLogFile(QString logText)

mobile-widgets/qmlmanager.h

@@ -45,6 +45,7 @@ class QMLManager : public QObject {
 	Q_PROPERTY(QString progressMessage READ progressMessage WRITE setProgressMessage NOTIFY progressMessageChanged)
 	Q_PROPERTY(bool libdcLog READ libdcLog WRITE setLibdcLog NOTIFY libdcLogChanged)
 	Q_PROPERTY(bool developer READ developer WRITE setDeveloper NOTIFY developerChanged)
+	Q_PROPERTY(bool btEnabled READ btEnabled WRITE setBtEnabled NOTIFY btEnabledChanged)
 
 public:
 	QMLManager();
@@ -124,6 +125,9 @@ public:
 	bool developer() const;
 	void setDeveloper(bool value);
 
+	bool btEnabled() const;
+	void setBtEnabled(bool value);
+
 	typedef void (QMLManager::*execute_function_type)();
 	DiveListSortModel *dlSortModel;
 
@@ -134,7 +138,7 @@ public:
 	bool showPin() const;
 	void setShowPin(bool enable);
 	Q_INVOKABLE void setStatusbarColor(QColor color);
-	Q_INVOKABLE bool btEnabled() const;
+	void btHostModeChange(QBluetoothLocalDevice::HostMode state);
 
 #if defined(Q_OS_ANDROID)
 	void writeToAppLogFile(QString logText);
@@ -258,6 +262,7 @@ signals:
 	void progressMessageChanged();
 	void libdcLogChanged();
 	void developerChanged();
+	void btEnabledChanged();
 };
 
 #endif

subsurface-mobile-helper.cpp

@@ -30,6 +30,19 @@
 
 QObject *qqWindowObject = NULL;
 
+void set_non_bt_addresses() {
+#if defined(Q_OS_ANDROID)
+	connectionListModel.addAddress("FTDI");
+#elif defined(Q_OS_LINUX) // since this is in the else, it does NOT include Android
+	connectionListModel.addAddress("/dev/ttyS0");
+	connectionListModel.addAddress("/dev/ttyS1");
+	connectionListModel.addAddress("/dev/ttyS2");
+	connectionListModel.addAddress("/dev/ttyS3");
+	// this makes debugging so much easier - use the simulator
+	connectionListModel.addAddress("/tmp/ttyS1");
+#endif
+}
+
 void init_ui()
 {
 	init_qt_late();
@@ -76,16 +89,8 @@ void run_ui()
 	ctxt->setContextProperty("diveModel", sortModel);
 	ctxt->setContextProperty("gpsModel", gpsSortModel);
 	ctxt->setContextProperty("vendorList", vendorList);
-#if defined(Q_OS_ANDROID)
+	set_non_bt_addresses();
-	connectionListModel.addAddress("FTDI");
+
-#elif defined(Q_OS_LINUX) // since this is in the else, it does NOT include Android
-	connectionListModel.addAddress("/dev/ttyS0");
-	connectionListModel.addAddress("/dev/ttyS1");
-	connectionListModel.addAddress("/dev/ttyS2");
-	connectionListModel.addAddress("/dev/ttyS3");
-	// this makes debugging so much easier - use the simulator
-	connectionListModel.addAddress("/tmp/ttyS1");
-#endif
 	ctxt->setContextProperty("connectionListModel", &connectionListModel);
 	ctxt->setContextProperty("logModel", MessageHandlerModel::self());