Commit 70d26e3a authored by Alejandro Homs Puron's avatar Alejandro Homs Puron
Browse files

Merge branch...

Merge branch '2-tango-get-setframetransfermode-no-more-available-from-frelonacq-class' into 'master'

Resolve "tango: get-setFrameTransferMode no more available from FrelonAcq class"

Closes #2

See merge request !15
parents c64fa1d4 9909618b
Pipeline #29955 failed with stages
in 5 minutes and 6 seconds
......@@ -282,11 +282,11 @@ class FrelonTacoProxy:
def DevCcdSetChannel(self, input_chan):
def DevCcdGetChannel(self):
return _FrelonAcq.getInputChan()
return _FrelonAcq.getFrelonCamera().getInputChan()
def DevCcdSetHwPar(self, hw_par_str):
......@@ -337,11 +337,11 @@ class FrelonTacoProxy:
ftm = FrelonHw.FTM
raise Core.Exception('Invalid profile value: %s' % kinetics)
def DevCcdGetKinetics(self):
ftm = _FrelonAcq.getFrameTransferMode()
ftm = _FrelonAcq.getFrelonCamera().getFrameTransferMode()
if ftm == FrelonHw.FTM:
kinetics = 3
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