diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2011-12-13 20:34:56 -0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2011-12-13 20:34:56 -0800 |
commit | 4b77a5def6df965cae63dec8b836e18e1e09cd58 (patch) | |
tree | b360828cae21dce1c3cb3640de609dd02d4aa941 | |
parent | 001f6d05dca762de232c68b7ff10fdc999a61514 (diff) | |
download | subsurface-4b77a5def6df965cae63dec8b836e18e1e09cd58.tar.gz |
Add reasonable default device names for divecomputer import
So far we hard coded /dev/ttyUSB0 - which is a good starting point in
Linux but not so useful on Windows or MacOS. This was now moved into one
of our OS helper functions with (somewhat) reasonable defaults.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | display-gtk.h | 2 | ||||
-rw-r--r-- | gtk-gui.c | 2 | ||||
-rw-r--r-- | linux.c | 5 | ||||
-rw-r--r-- | macos.c | 5 | ||||
-rw-r--r-- | windows.c | 5 |
5 files changed, 18 insertions, 1 deletions
diff --git a/display-gtk.h b/display-gtk.h index 8ca5a450e..b20495731 100644 --- a/display-gtk.h +++ b/display-gtk.h @@ -32,6 +32,8 @@ extern void subsurface_set_conf(char *name, pref_type_t type, const void *value) extern const void *subsurface_get_conf(char *name, pref_type_t type); extern void subsurface_close_conf(void); +extern const char *subsurface_USB_name(void); + extern visible_cols_t visible_cols; extern const char *divelist_font; @@ -913,7 +913,7 @@ static GtkEntry *dive_computer_device(GtkWidget *vbox) entry = gtk_entry_new(); gtk_container_add(GTK_CONTAINER(frame), entry); - gtk_entry_set_text(GTK_ENTRY(entry), "/dev/ttyUSB0"); + gtk_entry_set_text(GTK_ENTRY(entry), subsurface_USB_name()); return GTK_ENTRY(entry); } @@ -46,3 +46,8 @@ void subsurface_close_conf(void) { /* this is a no-op */ } + +const char *subsurface_USB_name() +{ + return("/dev/ttyUSB0"); +} @@ -89,3 +89,8 @@ void subsurface_close_conf(void) CFRelease(xmlData); CFRelease(propertyList); } + +const char *subsurface_USB_name() +{ + return("/dev/tty.SLAB_USBtoUART"); +} @@ -78,3 +78,8 @@ void subsurface_close_conf(void) printf("RegFlushKey failed \n"); RegCloseKey(hkey); } + +const char *subsurface_USB_name() +{ + return("COM3"); +} |