Update parser to quick-convert node ids to hex from dec

oresat · May 11, 2021 · 4518e49 · 4518e49
1 parent c20adcb
commit 4518e49
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/canopen_monitor/parse/eds.py b/canopen_monitor/parse/eds.py
@@ -124,10 +124,10 @@ def __len__(self) -> int:
 def convert_value(value: str) -> Union[int, str]:
     # Turn number-like objects into numbers
     if (value != ''):
-        if (all(c in string.digits for c in value)):
-            return int(value, 10)
-        elif (all(c in string.hexdigits for c in value)):
+        if (all(c in string.hexdigits for c in value)):
             return int(value, 16)
+        elif (all(c in string.digits for c in value)):
+            return int(value, 10)
         else:
             return value
 

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -7750,4 +7750,4 @@
 ParameterValue=
 PDOMapping=0
 
-"""
+"""
diff --git a/tests/spec_eds_parser.py b/tests/spec_eds_parser.py
@@ -102,7 +102,7 @@ def test_get_node_id(self):
         """
         DCF Parsing set node id attribute
         """
-        self.assertEqual(10,
+        self.assertEqual(0x10,
                          self.eds.node_id,
                          "Error parsing node id")
-Original file line number
+Diff line change
@@ Expand Up / @@ -7750,4 +7750,4 @@ @@
     ParameterValue=
     PDOMapping=0
-    """
+    """