mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add function for non-BT connection addresses

Browse source 
Simple rewrite of a piece of code separated to its own function
so that is can be used in other places as well. To avoid code
duplication for dynamic BT on/off switching on mobile.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2017-10-11 19:38:24 +02:00
parent 8b8863b640
commit fa5e685279
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/qt-gui.h
View file

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

25
subsurface-mobile-helper.cpp
View file

@ -30,6 +30,19 @@
QObject *qqWindowObject = NULL; 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() void init_ui()
{ {
init_qt_late(); init_qt_late();
@ -76,16 +89,8 @@ void run_ui()
ctxt->setContextProperty("diveModel", sortModel); ctxt->setContextProperty("diveModel", sortModel);
ctxt->setContextProperty("gpsModel", gpsSortModel); ctxt->setContextProperty("gpsModel", gpsSortModel);
ctxt->setContextProperty("vendorList", vendorList); 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("connectionListModel", &connectionListModel);
ctxt->setContextProperty("logModel", MessageHandlerModel::self()); ctxt->setContextProperty("logModel", MessageHandlerModel::self());