M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

wavesynth: fix frame/segment terminology

This commit is contained in:
Sebastien Bourdeauducq 2015-03-22 10:56:34 +01:00
parent 1b7f71bda9
commit c18efa11b3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
artiq/wavesynth/compute_samples.py
View File

@ -110,9 +110,9 @@ class Synthesizer:
def main(): def main():
program = [ program = [
[ [
# segment 0 # frame 0
{ {
# segment 0, line 0 # frame 0, segment 0, line 0
"dac_divider": 1, "dac_divider": 1,
"duration": 100, "duration": 100,
"channel_data": [ "channel_data": [
@ -127,7 +127,7 @@ def main():
"jump": False "jump": False
}, },
{ {
# segment 1, line 1 # frame 0, segment 0, line 1
"dac_divider": 1, "dac_divider": 1,
"duration": 100, "duration": 100,
"channel_data": [ "channel_data": [
@ -143,9 +143,9 @@ def main():
}, },
], ],
[ [
# segment 1 # frame 1
{ {
# segment 1, line 0 # frame 1, segment 0, line 0
"dac_divider": 1, "dac_divider": 1,
"duration": 100, "duration": 100,
"channel_data": [ "channel_data": [
@ -160,7 +160,7 @@ def main():
"jump": False "jump": False
}, },
{ {
# segment 1, line 1 # frame 1, segment 0, line 1
"dac_divider": 1, "dac_divider": 1,
"duration": 100, "duration": 100,
"channel_data": [ "channel_data": [
@ -176,9 +176,9 @@ def main():
} }
], ],
[ [
# segment 2 # frame 2
{ {
# segment 2, line 0 # frame 2, segment 0, line 0
"dac_divider": 1, "dac_divider": 1,
"duration": 84, "duration": 84,
"channel_data": [ "channel_data": [
@ -193,7 +193,7 @@ def main():
"jump": False "jump": False
}, },
{ {
# segment 2, line 1 # frame 2, segment 1, line 0
"dac_divider": 1, "dac_divider": 1,
"duration": 116, "duration": 116,
"channel_data": [ "channel_data": [