diff options
| author |  Christof Arnosti <charno@charno.ch> | 2020-03-05 22:38:33 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-03-07 12:34:43 -0800 |
| commit | 6e38f85ba7365efd2f27b407cf001b1e10dff1c8 (patch) | |
| tree | 6504a8634b78523c02c72cf07280a01177785485 /subsurface-mobile-main.cpp | |
| parent | 6ffb1e3129a95ad30c2a1951373b1001db930ed6 (diff) | |
| download | subsurface-6e38f85ba7365efd2f27b407cf001b1e10dff1c8.tar.gz | |
usb-serial-for-android: Implementation
Implement the libdivecomputer API in Java and create C/JNI translation
layer.
[Dirk Hohndel: whitespace harmonization - yes, some of this is Java,
this still makes it much easier to read for me;
also changed the FTDI conditional compilation to make
sure we can still use that for mobile-on-desktop if
necessary]
Signed-off-by: Christof Arnosti <charno@charno.ch>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-mobile-main.cpp')
| -rw-r--r-- | subsurface-mobile-main.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/subsurface-mobile-main.cpp b/subsurface-mobile-main.cpp index 7b7269f85..9529682df 100644 --- a/subsurface-mobile-main.cpp +++ b/subsurface-mobile-main.cpp @@ -88,10 +88,8 @@ int main(int argc, char **argv) void set_non_bt_addresses() { -#if SERIAL_FTDI - connectionListModel.addAddress("FTDI"); -#endif #if defined(Q_OS_ANDROID) + connectionListModel.addAddress("usb-serial"); #elif defined(Q_OS_LINUX) // since this is in the else, it does NOT include Android connectionListModel.addAddress("/dev/ttyS0"); connectionListModel.addAddress("/dev/ttyS1"); @@ -100,6 +98,9 @@ void set_non_bt_addresses() // this makes debugging so much easier - use the simulator connectionListModel.addAddress("/tmp/ttyS1"); #endif +#if defined(SERIAL_FTDI) + connectionListModel.addAddress("FTDI"); +#endif } bool haveFilesOnCommandLine() |