Pull original PR rscada#20, rscada#23, rscada#26 part rscada#29

Author: phlundblom

mbus/MBusFrame.py

@@ -1,4 +1,4 @@
-from ctypes import Structure, c_uint8, c_long, c_size_t, POINTER
+from ctypes import Structure, c_uint8, c_int, c_long, c_size_t, POINTER
 
 c_time_t = c_long
 
@@ -7,18 +7,18 @@ def __str__(self):
         return "MBusFrame: XXX"
 
 MBusFrame._fields_ = [
-        ("start1",   c_uint8 * 16),  # MBusFrameFixed
+        ("start1",   c_uint8),  # MBusFrameFixed
         ("length1",  c_uint8),
         ("length2",  c_uint8),
         ("start2",   c_uint8),
         ("control",  c_uint8),
         ("address",  c_uint8),
-        ("control_infomation",  c_uint8),
+        ("control_information",  c_uint8),
         ("checksum", c_uint8),
         ("stop",     c_uint8),
         ("data",     c_uint8 * 252),
         ("data_size", c_size_t),
-        ("stop",      c_uint8),
+        ("type",      c_int),
         ("timestamp", c_time_t),
         ("next",      POINTER(MBusFrame))
 ]

mbus/MBusLowLevel.py

@@ -358,7 +358,7 @@ def __init__(self, libpath=None):
         self.data_record_append.restypes    = None
 
         self.frame_new                      = lib.mbus_frame_new
-        self.frame_new.argtypes             = []
+        self.frame_new.argtypes             = [c_int]
         self.frame_new.restype              = mbus_frame_p
 
         self.frame_free                     = lib.mbus_frame_free