srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

SUServo: remove references to non-existent a0 parameter (#1268) 

Signed-off-by: Thomas Harty <thomas.harty@physics.ox.ac.uk>
This commit is contained in:
hartytp 2019-02-07 15:29:32 +00:00 committed by GitHub
parent df6c1fca2c
commit fe63c9b366
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artiq/coredevice/suservo.py
View File

@ -319,7 +319,7 @@ class Channel:
The recurrence relation is (all data signed and MSB aligned): The recurrence relation is (all data signed and MSB aligned):
.. math:: .. math::
a_0 y_n = a_1 y_{n - 1} + b_0 (x_n + o)/2 + b_1 (x_{n - 1} + o)/2 y_n = a_1 y_{n - 1} + b_0 (x_n + o)/2 + b_1 (x_{n - 1} + o)/2
Where: Where:
@ -328,7 +328,6 @@ class Channel:
* :math:`x_n` and :math:`x_{n-1}` are the current and previous * :math:`x_n` and :math:`x_{n-1}` are the current and previous
filter inputs in :math:`[-1, 1[`. filter inputs in :math:`[-1, 1[`.
* :math:`o` is the offset * :math:`o` is the offset
* :math:`a_0` is the normalization factor :math:`2^{11}`
* :math:`a_1` is the feedback gain * :math:`a_1` is the feedback gain
* :math:`b_0` and :math:`b_1` are the feedforward gains for the two * :math:`b_0` and :math:`b_1` are the feedforward gains for the two
delays delays