PyVLCB 0.2.0__tar.gz → 0.2.2__tar.gz

{pyvlcb-0.2.0/src/PyVLCB.egg-info → pyvlcb-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyVLCB
-Version: 0.2.0
+Version: 0.2.2
 Summary: A library for CBUS / VLCB communication
 Author-email: "Stewart Watkiss (penguintutor)" <5587863+penguintutor@users.noreply.github.com>
 License: MIT License

{pyvlcb-0.2.0 → pyvlcb-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PyVLCB"
-version = "0.2.0"
+version = "0.2.2"
 description = "A library for CBUS / VLCB communication"
 readme = {file="README.md",  content-type = "text/markdown"} 
 requires-python = ">=3.6"

{pyvlcb-0.2.0 → pyvlcb-0.2.2/src/PyVLCB.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyVLCB
-Version: 0.2.0
+Version: 0.2.2
 Summary: A library for CBUS / VLCB communication
 Author-email: "Stewart Watkiss (penguintutor)" <5587863+penguintutor@users.noreply.github.com>
 License: MIT License

{pyvlcb-0.2.0 → pyvlcb-0.2.2}/src/pyvlcb/vlcbformat.py

@@ -152,6 +152,7 @@ class VLCBOpcode:
     """
     # Dict from opcode to dict of opcode information
     opcodes = {
+        '':  {'opc': 'N/A', 'title': 'Null', 'format': '', 'minpri': 0, 'comment': 'Null Opcode / data packet'},
         '00':  {'opc': 'ACK', 'title': 'General Acknowledgement', 'format': '', 'minpri': 2, 'comment': 'Positive response to query/request performed for report of availability online'},
         '01':  {'opc': 'NAK', 'title': 'General No Ack', 'format': '', 'minpri': 2, 'comment': 'Negative response to query/request denied'},
         '02':  {'opc': 'HLT', 'title': 'Bus Halt', 'format': '', 'minpri': 0, 'comment': 'Commonly broadcasted to all nodes to indicate CBUS is not available and no further packets should be sent until a BON or ARST is received'},
@@ -462,14 +463,15 @@ class VLCBOpcode:
 
         Returns:
             String: shortened opcode string
+            or empty string for NULL opcode
 
-        Raises:
-            ValueError: If string does not contain at least 2 characters
         """
-        if len(opcode_string) >= 2:
+        # Also ignore - in position 1 (eg. " - ")
+        if len(opcode_string) >= 2 and opcode_string[1] != "-":
             return opcode_string[0:2]
         else:
-            raise ValueError(f"String {opcode_string} is too short.")
+            # If not a opcode_string (eg. Null) return ""
+            return ""
     
     # Get min priority from opcode
     @staticmethod
@@ -483,7 +485,7 @@ class VLCBOpcode:
             ValueError: If opcode not found
         """
         opcode = VLCBOpcode.opcode_extract(opcode)
-        if opcode in VLCBOpcode.opcodes.keys():
+        if opcode in VLCBOpcode.opcodes:
             return VLCBOpcode.opcodes[opcode]['minpri']
         else:
             raise ValueError(f"Opcode {opcode} is not defined.")