catch (and avoid) some more serial port error types

3 files changed, 19 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index c146dac..a319531 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,9 @@ clean:
 DEXCOM_READER_PATH=$(PWD)/dexcom_reader
 SERVICE_CMDLINE=$(DEXCOM_READER_PATH)/dexcom_dumper.py -v --poll --http=$(REMOTE_HOST)
 
+install-rules: ModemManager.rules
+        install -m0644 ModemManager.rules /etc/udev/rules.d/77-mm-usb-device-blacklist.rules
+
 draco.service: draco.service.in
         $(if $(REMOTE_HOST),,$(error "You must define $$REMOTE_HOST"))
         sed -e "s?^\(ExecStart=\).*?\1$(SERVICE_CMDLINE)?" < $< > $@
diff --git a/ModemManager.rules b/ModemManager.rules
new file mode 100644
index 0000000..188f3fa
--- /dev/null
+++ b/ModemManager.rules
@@ -0,0 +1,8 @@
+ACTION!="add|change|move", GOTO="mm_usb_device_blacklist_end"
+SUBSYSTEM!="usb", GOTO="mm_usb_device_blacklist_end"
+ENV{DEVTYPE}!="usb_device",  GOTO="mm_usb_device_blacklist_end"
+
+# Dexcom G5
+ATTRS{idVendor}=="22a3", ATTRS{idProduct}=="0047", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+LABEL="mm_usb_device_blacklist_end"
diff --git a/dexcom_reader/readdata.py b/dexcom_reader/readdata.py
index 84c2356..84033f0 100644
--- a/dexcom_reader/readdata.py
+++ b/dexcom_reader/readdata.py
@@ -78,6 +78,8 @@ class Dexcom(object):
       return self.port.write(*args, **kwargs)
     except ValueError:
       raise constants.SerialPortError
+    except serial.serialutil.SerialException:
+      raise constants.SerialPortError
     except termios.error:
       raise constants.SerialPortError
 
@@ -86,6 +88,8 @@ class Dexcom(object):
       return self.port.read(*args, **kwargs)
     except ValueError:
       raise constants.SerialPortError
+    except serial.serialutil.SerialException:
+      raise constants.SerialPortError
     except termios.error:
       raise constants.SerialPortError
 
@@ -232,6 +236,8 @@ class Dexcom(object):
       self.port.flush()
     except ValueError:
       raise constants.SerialPortError
+    except serial.serialutil.SerialException:
+      raise constants.SerialPortError
     except termios.error:
       raise constants.SerialPortError
 
@@ -241,6 +247,8 @@ class Dexcom(object):
       self.port.flushOutput()
     except ValueError:
       raise constants.SerialPortError
+    except serial.serialutil.SerialException:
+      raise constants.SerialPortError
     except termios.error:
       raise constants.SerialPortError