linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ultrasound.PE: fix control loop

Browse Source 
Change-Id: I2b2bdf4ad48887ae256a68119f53e6a38048ce1e
This commit is contained in:
zolliker
2025-04-01 09:54:18 +02:00
parent 1febb7bacf
commit 56bee015b3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frappy_psi/ultrasound.py
View File

@ -102,17 +102,19 @@ class ControlRoi(Roi, Readable):
self._freq_target = freq self._freq_target = freq
# do no control 2 times after changing frequency # do no control 2 times after changing frequency
self._skipctrl = 2 self._skipctrl = 2
fdif = freq - self._old[0]
if self.control_active: if self.control_active:
if self._old: if self._old:
newfreq = freq + inphase * self.slope newfreq = freq + inphase * self.slope
fdif = freq - self._old[0] self.log.info('fdif %r minstep %r', fdif, self.minstep)
if abs(fdif) >= self.minstep:
idif = inphase - self._old[1]
self.slope = - fdif / idif
else: else:
# do a 'test' step # do a 'test' step
newfreq = freq + self.minstep newfreq = freq + self.minstep
self.old = (freq, inphase) if abs(fdif) > self.minstep * 0.99:
idif = inphase - self._old[1]
if idif:
self.slope = - fdif / idif
self._old = (freq, inphase)
if self._skipctrl > 0: # do no control for some time after changing frequency if self._skipctrl > 0: # do no control for some time after changing frequency
self._skipctrl -= 1 self._skipctrl -= 1
elif self.control_active: elif self.control_active: