From fa5e685279b66b14d8069b5214890ca7148487ef Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Wed, 11 Oct 2017 19:38:24 +0200 Subject: [PATCH] Add function for non-BT connection addresses 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 --- core/qt-gui.h | 1 + subsurface-mobile-helper.cpp | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/core/qt-gui.h b/core/qt-gui.h index 59e79c268..1fc7d161e 100644 --- a/core/qt-gui.h +++ b/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 diff --git a/subsurface-mobile-helper.cpp b/subsurface-mobile-helper.cpp index 56ad029e1..ae7143404 100644 --- a/subsurface-mobile-helper.cpp +++ b/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) - 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 + set_non_bt_addresses(); + ctxt->setContextProperty("connectionListModel", &connectionListModel); ctxt->setContextProperty("logModel", MessageHandlerModel::self());