Commit 25143ef1 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron
Browse files

Merge branch '1-tango-none-is-a-reserved-keyword-in-python' into 'master'

Resolve "Tango: None is a reserved keyword in python"

Closes #1

See merge request !11
parents f9462b0f 098ad8eb
Pipeline #11444 passed with stages
in 6 minutes and 52 seconds
...@@ -59,7 +59,7 @@ class Frelon(PyTango.Device_4Impl): ...@@ -59,7 +59,7 @@ class Frelon(PyTango.Device_4Impl):
self.__ImageMode = {'FRAME TRANSFER': FrelonHw.FTM, self.__ImageMode = {'FRAME TRANSFER': FrelonHw.FTM,
'FULL FRAME': FrelonHw.FFM} 'FULL FRAME': FrelonHw.FFM}
self.__RoiMode = {'NONE' : FrelonHw.None, self.__RoiMode = {'NONE' : 0,
'SLOW' : FrelonHw.Slow, 'SLOW' : FrelonHw.Slow,
'FAST' : FrelonHw.Fast, 'FAST' : FrelonHw.Fast,
'KINETIC' : FrelonHw.Kinetic} 'KINETIC' : FrelonHw.Kinetic}
...@@ -108,7 +108,7 @@ class Frelon(PyTango.Device_4Impl): ...@@ -108,7 +108,7 @@ class Frelon(PyTango.Device_4Impl):
return AttrHelper.get_attr_string_value_list(self, attr_name) return AttrHelper.get_attr_string_value_list(self, attr_name)
def __getattr__(self,name) : def __getattr__(self,name) :
obj = _FrelonAcq if name == 'E2VCorrectionActive' \ obj = _FrelonAcq if name.endswith("e2v_correction") \
else _FrelonAcq.getFrelonCamera() else _FrelonAcq.getFrelonCamera()
return AttrHelper.get_attr_4u(self, name, obj) return AttrHelper.get_attr_4u(self, name, obj)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment