diff --git a/pydevices/MitDevices/dt100.py b/pydevices/MitDevices/dt100.py index c43aa2899b..c8e7ac1319 100755 --- a/pydevices/MitDevices/dt100.py +++ b/pydevices/MitDevices/dt100.py @@ -158,7 +158,7 @@ def acq2sh(self, command): def waitState(self, state): import pexpect - regstr = '([0-9\.]*) [0-9] ST_(.*)\r\n' + regstr = '([0-9\\.]*) [0-9] ST_(.*)\r\n' dprint("waitState %s" % regstr) wantex = re.compile(regstr) diff --git a/pydevices/RfxDevices/CYGNET4K.py b/pydevices/RfxDevices/CYGNET4K.py index d1803ce73e..536d5d01d3 100644 --- a/pydevices/RfxDevices/CYGNET4K.py +++ b/pydevices/RfxDevices/CYGNET4K.py @@ -358,7 +358,7 @@ def setValue(self, addrlist, value, useExtReg=False): def resetMicro(self): """Will trap Micro causing watchdog and reset of firmware.""" # The camera will give no response to this command - self.serialIO(b'\x55\x99\x66\x11\x50\EB', None) + self.serialIO(b'\x55\x99\x66\x11\x50\xEB', None) return self def setSystemState(self, byte): @@ -458,7 +458,7 @@ def setRoiXSize(self, value): def setRoiXOffset(self, value): """set ROI X offset as 12-bit value""" - return self.setValue(b'\81\x82', min(0xFFF, value), True) + return self.setValue(b'\x81\x82', min(0xFFF, value), True) def setRoiYSize(self, value): """set ROI Y size as 12-bit value""" diff --git a/pydevices/RfxDevices/FAKECAMERA.py b/pydevices/RfxDevices/FAKECAMERA.py index b802e769ea..5c188a5af6 100644 --- a/pydevices/RfxDevices/FAKECAMERA.py +++ b/pydevices/RfxDevices/FAKECAMERA.py @@ -37,7 +37,7 @@ class FAKECAMERA(Device): {'path': ':COMMENT', 'type': 'text'}, {'path': ':EXP_NAME', 'type': 'text', 'value': 'cameratest'}, {'path': ':EXP_SHOT', 'type': 'text', 'value': '84'}, - {'path': ':EXP_NODE', 'type': 'text', 'value': '\CAMERATEST::FLIR:FRAMES'}, + {'path': ':EXP_NODE', 'type': 'text', 'value': '\\CAMERATEST::FLIR:FRAMES'}, {'path': ':FRAME_RATE', 'type': 'numeric', 'value': 25}, {'path': ':READ_LOOP', 'type': 'text', 'value': 'NO'}, {'path': ':STREAMING', 'type': 'text', 'value': 'Stream and Store'}, diff --git a/pydevices/RfxDevices/PLFE.py b/pydevices/RfxDevices/PLFE.py index 3da78adffa..f8e502bcaf 100644 --- a/pydevices/RfxDevices/PLFE.py +++ b/pydevices/RfxDevices/PLFE.py @@ -217,9 +217,9 @@ def copyBits(self, source, dest, mask): def deserialize_msg(self, msg): assert re.match( - '^(\#[0-5][01]([01][0-9][0-9]|2[0-4][0-9]|25[0-5])){6}$', msg) + '^(\\#[0-5][01]([01][0-9][0-9]|2[0-4][0-9]|25[0-5])){6}$', msg) - # assert re.match('^(\#[0-5][01]([01][0-9][0-9]|2[0-5][0-5])){6}$', msg) + # assert re.match('^(\\#[0-5][01]([01][0-9][0-9]|2[0-5][0-5])){6}$', msg) data = []