Skip to content

Commit 9f7c33c

Browse files
committedAug 25, 2016
doc/rtio: make vis coloring consistent
1 parent c2e0e0b commit 9f7c33c

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed
 

‎doc/manual/rtio.rst

+9-6
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ The following diagram shows what is going on at the different levels of the soft
5757
.. wavedrom::
5858
{
5959
signal: [
60-
{name: 'kernel', wave: 'x32.4x', data: ['on()', 'delay(2*us)', 'off()'], node: '..A.XB'},
60+
{name: 'kernel', wave: 'x32.3x', data: ['on()', 'delay(2*us)', 'off()'], node: '..A.XB'},
6161
{name: 'now', wave: '2...2.', data: ['7000', '9000'], node: '..P..Q'},
62-
{name: 'slack', wave: 'x3x.4x', data: ['4400', '5800']},
62+
{},
63+
{name: 'slack', wave: 'x2x.2x', data: ['4400', '5800']},
6364
{},
6465
{name: 'rtio_counter', wave: 'x2x|2x|2x2x', data: ['2600', '3200', '7000', '9000'], node: ' V.W'},
6566
{name: 'ttl', wave: 'x1.0', node: ' R.S', phase: -7.5},
@@ -135,7 +136,7 @@ In these situations where ``count()`` leads to a synchronization of timeline cur
135136
.. wavedrom::
136137
{
137138
signal: [
138-
{name: 'kernel', wave: '3..4|..2.5..x..', data: ['gate_rising()', 'count()', 'delay()', 'pulse()'], node: '.A.B...C.ZD.E'},
139+
{name: 'kernel', wave: '3..5|..2.3..x..', data: ['gate_rising()', 'count()', 'delay()', 'pulse()'], node: '.A.B...C.ZD.E'},
139140
{name: 'now_mu', wave: '2.2.|....2.2.', node: '.P.Q.....XV.W'},
140141
{},
141142
{},
@@ -179,15 +180,17 @@ Here, ``run()`` calls ``k1()`` which exits leaving the cursor one second after t
179180
.. wavedrom::
180181
{
181182
signal: [
182-
{name: 'kernel', wave: '3.3..5..|4.', data: ['k1: on()', 'k1: delay(dt)', 'k1->k2 swap', 'k2: off()'], node: '..A........B'},
183+
{name: 'kernel', wave: '3.2..2..|3.', data: ['k1: on()', 'k1: delay(dt)', 'k1->k2 swap', 'k2: off()'], node: '..A........B'},
183184
{name: 'now', wave: '2....2...|.', data: ['t0', 't0+dt'], node: '..P........Q'},
184185
{},
185186
{},
186187
{name: 'rtio_counter', wave: 'x.........|2x|2', data: ['t0', 't0+dt'], node: '...........V..W'},
187188
{name: 'ttl', wave: 'x1..0', node: '.R..S', phase: -10.5},
189+
{ node: ' T..U', phase: -10.5}
188190
],
189191
edge: [
190-
'A~>R', 'P~>R', 'V~>R', 'B~>S', 'Q~>S', 'W~>S'
192+
'A~>R', 'P~>R', 'V~>R', 'B~>S', 'Q~>S', 'W~>S',
193+
'R-T', 'S-U', 'T<->U dt'
191194
],
192195
}
193196

@@ -202,7 +205,7 @@ When a kernel should wait until all the events on a particular channel have been
202205
.. wavedrom::
203206
{
204207
signal: [
205-
{name: 'kernel', wave: 'x3x.|2.|x', data: ['on()', 'sync()'], node: '..A.....Y'},
208+
{name: 'kernel', wave: 'x3x.|5.|x', data: ['on()', 'sync()'], node: '..A.....Y'},
206209
{name: 'now', wave: '2..', data: ['7000'], node: '..P'},
207210
{},
208211
{},

0 commit comments

Comments
 (0)
Please sign in to comment.