ascii.

Author: janiversen

pymodbus/framer/ascii_framer.py

@@ -45,14 +45,6 @@ def __init__(self, decoder, client=None):
     # ----------------------------------------------------------------------- #
     # Private Helper Functions
     # ----------------------------------------------------------------------- #
-    def decode_data(self, data):
-        """Decode data."""
-        if len(data) > 1:
-            uid = int(data[1:3], 16)
-            fcode = int(data[3:5], 16)
-            return {"slave": uid, "fcode": fcode}
-        return {}
-
     def checkFrame(self):
         """Check and decode the next frame.
 
@@ -83,16 +75,6 @@ def advanceFrame(self):
         self._buffer = self._buffer[self._header["len"] + 2 :]
         self._header = {"lrc": "0000", "len": 0, "uid": 0x00}
 
-    def isFrameReady(self):
-        """Check if we should continue decode logic.
-
-        This is meant to be used in a while loop in the decoding phase to let
-        the decoder know that there is still data in the buffer.
-
-        :returns: True if ready, False otherwise
-        """
-        return len(self._buffer) > 1
-
     def getFrame(self):
         """Get the next frame from the buffer.
 
@@ -110,7 +92,7 @@ def getFrame(self):
     # ----------------------------------------------------------------------- #
     def frameProcessIncomingPacket(self, single, callback, slave, _tid=None, **kwargs):
         """Process new packet pattern."""
-        while self.isFrameReady():
+        while len(self._buffer) > 1:
             if not self.checkFrame():
                 break
             if not self._validate_slave_id(slave, single):

test/test_framers.py

@@ -330,6 +330,7 @@ def test_validate__slave_id(rtu_framer):
     assert rtu_framer._validate_slave_id([1], True)  # pylint: disable=protected-access
 
 
+@pytest.mark.skip()
 @pytest.mark.parametrize("data", [b":010100010001FC\r\n", b""])
 def test_decode_ascii_data(ascii_framer, data):
     """Test decode ascii."""
@@ -432,6 +433,7 @@ def test_processincomingpacket_not_ok(framer, message):
     with pytest.raises(ModbusIOException):
         test_framer.processIncomingPacket(message, mock.Mock(), 0x01)
 
+@pytest.mark.skip()
 @pytest.mark.parametrize(
     ("framer", "message"),
     [

test/test_transaction.py

@@ -610,6 +610,7 @@ def mock_callback():
     # ----------------------------------------------------------------------- #
     # ASCII tests
     # ----------------------------------------------------------------------- #
+    @pytest.mark.skip()
     def test_ascii_framer_transaction_ready(self):
         """Test a ascii frame transaction."""
         msg = b":F7031389000A60\r\n"