Merge branch 'lupien-serial_read_termination'

pyvisa · May 6, 2015 · c54a48b · c54a48b
2 parents e5f0649 + 8393f36
commit c54a48b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pyvisa/resources/messagebased.py b/pyvisa/resources/messagebased.py
@@ -137,6 +137,9 @@ def read_termination(self, value):
             self.set_visa_attribute(constants.VI_ATTR_TERMCHAR, ord(last_char))
             self.set_visa_attribute(constants.VI_ATTR_TERMCHAR_EN, constants.VI_TRUE)
         else:
+            # The termchar is also used in VI_ATTR_ASRL_END_IN (for serial termination)
+            # so return it to its default.
+            self.set_visa_attribute(constants.VI_ATTR_TERMCHAR, ord(self.LF))
             self.set_visa_attribute(constants.VI_ATTR_TERMCHAR_EN, constants.VI_FALSE)
 
         self._read_termination = value