Serial Number checks fixed for real this time. #156

Signed-off-by: David Rebbe <drebbe@intrepidcs.com>

Author: drebbe-intrepid

examples/iso15765_example.py

@@ -6,7 +6,7 @@
 
 # Helper Functions ##########################################################
 def dev_name(device):
-    if int("AA0000", 36) < device.SerialNumber < int("ZZZZZZ", 36):
+    if int("0A0000", 36) <= device.SerialNumber <= int("ZZZZZZ", 36):
         return device.Name + " " + ics.base36enc(device.SerialNumber)
     else:
         return device.Name + " " + str(device.SerialNumber)

examples/open_device_example.py

@@ -6,7 +6,7 @@
 
 def dev_name(device):
     # Return a friendly name of the device (ie. neoVI FIRE2 CY1234)
-    if int("AA0000", 36) <= device.SerialNumber <= int("ZZZZZZ", 36):
+    if int("0A0000", 36) <= device.SerialNumber <= int("ZZZZZZ", 36):
         return device.Name + " " + ics.base36enc(device.SerialNumber)
     else:
         return device.Name + " " + str(device.SerialNumber)

examples/transmit_can_example.py

@@ -6,7 +6,7 @@
 
 def dev_name(device):
     # Return a friendly name of the device (ie. neoVI FIRE2 CY1234)
-    if int("AA0000", 36) <= device.SerialNumber <= int("ZZZZZZ", 36):
+    if int("0A0000", 36) <= device.SerialNumber <= int("ZZZZZZ", 36):
         return device.Name + " " + ics.base36enc(device.SerialNumber)
     else:
         return device.Name + " " + str(device.SerialNumber)

examples/transmit_can_xtd_example.py

@@ -6,7 +6,7 @@
 
 def dev_name(device):
     # Return a friendly name of the device (ie. neoVI FIRE2 CY1234)
-    if int("AA0000", 36) <= device.SerialNumber <= int("ZZZZZZ", 36):
+    if int("0A0000", 36) <= device.SerialNumber <= int("ZZZZZZ", 36):
         return device.Name + " " + ics.base36enc(device.SerialNumber)
     else:
         return device.Name + " " + str(device.SerialNumber)

examples/transmit_lin_example.py

@@ -8,7 +8,7 @@
 
 def dev_name(device):
     # Return a friendly name of the device (ie. neoVI FIRE2 CY1234)
-    if int("AA0000", 36) <= device.SerialNumber <= int("ZZZZZZ", 36):
+    if int("0A0000", 36) <= device.SerialNumber <= int("ZZZZZZ", 36):
         return device.Name + " " + ics.base36enc(device.SerialNumber)
     else:
         return device.Name + " " + str(device.SerialNumber)

examples/transmit_lin_ldf_example.py

@@ -10,7 +10,7 @@ def parse_ldf():
 
 def dev_name(device):
     # Return a friendly name of the device (ie. neoVI FIRE2 CY1234)
-    if int("AA0000", 36) <= device.SerialNumber <= int("ZZZZZZ", 36):
+    if int("0A0000", 36) <= device.SerialNumber <= int("ZZZZZZ", 36):
         return device.Name + " " + ics.base36enc(device.SerialNumber)
     else:
         return device.Name + " " + str(device.SerialNumber)

include/object_neo_device.h

@@ -143,10 +143,10 @@ static PyObject* neo_device_object_tp_repr(PyObject* o)
 {
     // example output: <ics.NeoDevice neoVI FIRE2 CY1234>
     neo_device_object* nd = (neo_device_object*)(o);
-    // Check range is A00000-ZZZZZZ
+    // Check range is 0A0000-ZZZZZZ
     PyObject* sn = NULL;
     uint32_t serial = (uint32_t)nd->dev.SerialNumber;
-    if (604661760 <= serial && serial <= 2176782335)
+    if (16796160 <= serial && serial <= 2176782335)
         sn = convert_to_base36(serial);
     else
         sn = PyUnicode_FromFormat("%lu", nd->dev.SerialNumber);