Better Bluetooth device support on Mac

We now show the correct device name for Bluetooth connected dive computers in
the drop down menu in the Download dialog.

This also updates the corresponding chapter in user manual.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

2 files changed, 10 insertions, 8 deletions

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index c91aaba9d..c780fa830 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -304,13 +304,14 @@ Shearwater Desktop).
 
 .On MacOS:
 
-In general this should be similar straight forward as described in the Windows
-section.
-
-Select your dive computer in the Bluetooth system settings. Choosing
-"Connections" next to the "-" will bring up a window showing the device name at
-the bottom. Watch out for something like "/dev/tty.Predator-COM1" and copy/paste
-this to the download dialog in Subsurface.
+Click on the Bluetooth symbol in the menu bar and select 'Set up
+Bluetooth Device...'. Make sure that your dive computer is in upload
+mode; it should then show up in the list of devices. Select it and go
+through the pairing process. This step should only be needed once for
+initial setup.
+
+Once the pairing is completed the correct device will be shown in the
+'Device or Mount Point' drop down in the Subsurface Download dialog.
 
 .On Linux
 Please make sure you have bluetooth enabled on your computer running Subsurface.
diff --git a/macos.c b/macos.c
index 0e2afbb1f..cdfce4c67 100644
--- a/macos.c
+++ b/macos.c
@@ -87,7 +87,8 @@ int subsurface_fill_device_list(GtkListStore *store)
 
 	dev = g_dir_open("/dev", 0, NULL);
 	while (dev && (name = g_dir_read_name(dev)) != NULL) {
-		if (strstr(name, "usbserial")) {
+		if (strstr(name, "usbserial") ||
+		    (strstr(name, "SerialPort") && strstr(name, "cu"))) {
 			int len = strlen(name) + 6;
 			char *devicename = malloc(len);
 			snprintf(devicename, len, "/dev/%s", name);