Update flexnet files to match new API

Author: jorticus

pymate/matenet/flexnetdc.py

@@ -9,9 +9,9 @@
 
 __author__ = 'Jared'
 
-from value import Value
-from struct import Struct
-from matenet import Mate
+from pymate.value import Value
+from pymate.cstruct import Struct
+from pymate.matenet import Mate
 
 class DCStatusPacket(object):
     fmt = Struct('>28B')
@@ -60,27 +60,27 @@ def __str__(self):
 """
         return fmt.format(**self.__dict__)
 
-class MateDCDevice(Mate):
+class MateDCDevice(MateDevice):
     """
     Communicate with a FLEXnet DC unit attached to the MateNET bus
     """
     def scan(self):
         """
         Query the attached device to make sure we're communicating with an FLEXnet DC unit
         """
-        devid = super(MateFlexNetDC, self).scan(port)
+        devid = super(MateFlexNetDC, self).scan()
         if devid == None:
             raise RuntimeError("No response from the FLEXnet DC unit")
-        if devid != Mate.DEVICE_FLEXNETDC:
+        if devid != MateDevice.DEVICE_FLEXNETDC:
             raise RuntimeError("Attached device is not a FLEXnet DC unit! (DeviceID: %s)" % devid)
 
     def get_status(self):
         """
         Request a status packet from the FLEXnet DC
         :return: A DCStatusPacket
         """
-        resp1 = self.send(Mate.TYPE_STATUS, addr=1)
-        resp2 = self.send(Mate.TYPE_STATUS, addr=2) # TODO: This also returns data!
+        resp1 = self.send(MateDevice.TYPE_STATUS, addr=1)
+        resp2 = self.send(MateDevice.TYPE_STATUS, addr=2) # TODO: This also returns data!
         if resp1 and resp2:
             print 'RAW[1]:', (' '.join("{:02x}".format(ord(c)) for c in resp1[1:]))
             print 'RAW[2]:', (' '.join("{:02x}".format(ord(c)) for c in resp2[1:]))
@@ -94,7 +94,7 @@ def get_logpage(self, day):
         """
         # TODO: This doesn't return anything. It must have a different command.
         # The UserGuide does mention having access to log pages
-        #resp = self.send(Mate.TYPE_LOG, addr=0, param=-day)
+        #resp = self.send(MateDevice.TYPE_LOG, addr=0, param=-day)
         #if resp:
         #    print 'RAW:', (' '.join("{:02x}".format(ord(c)) for c in resp[1:]))
         #    #return DCLogPagePacket.from_buffer(resp)

testflexnet.py

@@ -1,4 +1,4 @@
-from matenet import MateNET, MateDCDevice
+from pymate.matenet import MateNET, MateDCDevice
 from time import sleep
 
 print "MATE emulator (FLEXnet DC)"

testfx.py

@@ -1,4 +1,4 @@
-from matenet import MateNET, MateFXDevice
+from pymate.matenet import MateNET, MateFXDevice
 from time import sleep
 
 print "MATE emulator (FX)"