Commit 34a23d5d authored by Sergio Poppi's avatar Sergio Poppi
Browse files

Added devios to pyLo

parent 967e18e3

Common/Servers/PyLocalOscillator/src/LocalOscillatorImpl/LocalOscillator.py

+5 −3
Original line number Diff line number Diff line
@@ -87,9 +87,11 @@ class LocalOscillator(Receivers__POA.LocalOscillator, CharacteristicComponent, C 
   

   

   def initialize(self):

       addProperty(self, 'frequency', devio_ref=frequencyDevIO())

       addProperty(self, 'amplitude', devio_ref=amplitudeDevIO())

       addProperty(self, 'isLocked', devio_ref=isLockedDevIO())

       self.cl.configure(IP,PORT)



       addProperty(self, 'frequency', devio_ref=frequencyDevIO(self.cl))

       addProperty(self, 'amplitude', devio_ref=amplitudeDevIO(self.cl))

       addProperty(self, 'isLocked', devio_ref=isLockedDevIO(self.cl))

       self.cl.configure(IP,PORT)

   

   def set(self,rf_power,rf_freq):

Common/Servers/PyLocalOscillator/src/LocalOscillatorImpl/devios.py

+4 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ class GenericDevIO(DevIO): 




class amplitudeDevIO(DevIO):

    def __init__(self, value=0):

    def __init__(self, cl,value=0):

        DevIO.__init__(self, value)



    def read(self):
@@ -22,8 +22,8 @@ class amplitudeDevIO(DevIO): 
        self.value = value

                                    

class frequencyDevIO(DevIO):

    def __init__(self, cl):

        DevIO.__init__(self, cl)

    def __init__(self, cl,value=0):

        DevIO.__init__(self,value)

        self.cl=cl

    def read(self):

        self.cl.getFrequency()
@@ -32,7 +32,7 @@ class frequencyDevIO(DevIO): 
    def write(self, value):

        self.value = value

class isLockedDevIO(DevIO):

    def __init__(self, value=0):

    def __init__(self, cl,value=0):

        DevIO.__init__(self, value)



    def read(self):