Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/eez-open/modular-psu-firm…
Browse files Browse the repository at this point in the history 
…ware
  • Loading branch information
@mvladic
mvladic committed Mar 27, 2020
2 parents a95a509 + 61fb0fd commit 2566217
Show file tree
Hide file tree
Showing 31 changed files with 3,583 additions and 1,435 deletions.
302 changes: 251 additions & 51 deletions docs/SCPI reference guide/Commands/EEZ BB3 SCPI reference 12 - SCPI commands summary.html
View file

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions docs/SCPI reference guide/Commands/EEZ BB3 SCPI reference 2 - syntax and style.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
.cmd_code_End { text-align: left; margin-bottom: 1.99mm; font-family: "Courier New"; }
.cmd_code_Start { text-align: left; margin-top: 1.99mm; font-family: "Courier New"; }
.cmd_code_single { text-align: left; margin-top: 1.99mm; margin-bottom: 1.99mm; font-family: "Courier New"; }
.note { font-style: italic; }
.scpi0 { text-align: left; }
.scpi1 { text-align: left; margin-left: 4.99mm; }
.scpi2 { text-align: left; margin-left: 10mm; }
Expand Down Expand Up @@ -479,6 +480,20 @@
<p class="cmd_code">MMEM:DOWN:FNAM &quot;&quot;</p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 14%;">
<p>Channel list</p>
</td>
<td colspan="3" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 86%;">
<p class="Default_ntt">The channel list parameter is used for identifying the channel number as well as the numeric suffix. A channel list always starts with an @ and is enclosed in parenthese.</p>
<p class="Default_ntt">&#160;</p>
<p class="Default_ntt">The notation (@1,2) specifies a channel list that includes channels 1 and 2.</p>
<p class="Default_ntt">The notation (@2:4) specifies a channel list that includes channels 2 to 4.</p>
<p class="Default_ntt">The notation (@1,3:4) specifies a channel list that includes channels 1, 3 and 4. No space is allowed after or before comma separator.</p>
<p class="Default_ntt">&#160;</p>
<p class="note">The channel list parameter is only available on certain commands.</p>
</td>
</tr>
</table>
<p>&#160;</p>
<p>&#160;</p>
Expand Down
79 changes: 12 additions & 67 deletions docs/SCPI reference guide/Commands/EEZ BB3 SCPI reference 5.12 - OUTPut.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@
.scpi1 { text-align: left; margin-left: 4.99mm; }
.scpi2 { text-align: left; margin-left: 10mm; }
.table_header { text-align: center; }
.DCM220 { font-family: "Arial"; font-size: 12.0pt; font-weight: bold; font-style: normal; background-color: #66ccff; color: #ffffff; }
.DCP405 { font-family: "Arial"; font-size: 12.0pt; font-weight: bold; font-style: normal; background-color: #ff6600; color: #ffffff; }
.DCP405B { font-family: "Arial"; font-size: 12.0pt; font-weight: bold; font-style: normal; background-color: #cc9900; color: #ffffff; }
.backtick { font-family: "Courier New"; font-size: 10.0pt; font-weight: normal; font-style: normal; background-color: #dddddd; }

/* Footnotes & endnotes */
Expand Down Expand Up @@ -157,7 +155,7 @@
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 41%;">
<p class="scpi1"><a href="#outp_trac"><span style="text-decoration: underline;">:TRACk[:STATe] {&lt;bool&gt;}</span></a></p>
<p class="scpi1"><a href="#outp_trac"><span style="text-decoration: underline;">:TRACk[:STATe] {&lt;</span></a><a href="#outp_trac"><span style="text-decoration: underline;">chanlist</span></a><a href="#outp_trac"><span style="text-decoration: underline;">&gt;}</span></a></p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 59%;">
<p>Enables channels to operate in the track mode</p>
Expand All @@ -176,14 +174,6 @@
<p class="cmd_root">OUTPut[:STATe]? [&lt;channel&gt;]</p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Modules</p>
</td>
<td colspan="4" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 87%;">
<p><span class="DCP405">&#160;DCP405&#160;</span>&#160;<span class="DCP405B">&#160;DCP405B&#160;</span>&#160;<span class="DCM220">&#160;DCM220&#160;</span></p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Description</p>
Expand Down Expand Up @@ -293,14 +283,6 @@
<p class="cmd_root">OUTPut[:STATe]:TRIGgered? [&lt;channel&gt;]</p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Modules</p>
</td>
<td colspan="4" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 87%;">
<p><span class="DCP405">&#160;DCP405&#160;</span>&#160;<span class="DCP405B">&#160;DCP405B&#160;</span>&#160;<span class="DCM220">&#160;DCM220&#160;</span></p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Description</p>
Expand Down Expand Up @@ -509,14 +491,6 @@
<p class="cmd_root">OUTPut:MODE? [&lt;channel&gt;]</p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Modules</p>
</td>
<td colspan="4" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 87%;">
<p><span class="DCP405">&#160;DCP405&#160;</span>&#160;<span class="DCP405B">&#160;DCP405B&#160;</span>&#160;<span class="DCM220">&#160;DCM220&#160;</span></p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Description</p>
Expand Down Expand Up @@ -604,14 +578,6 @@
<p class="cmd_root">OUTPut:PROTection:CLEar [&lt;channel&gt;]</p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Modules</p>
</td>
<td colspan="4" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 87%;">
<p><span class="DCP405">&#160;DCP405&#160;</span>&#160;<span class="DCP405B">&#160;DCP405B&#160;</span>&#160;<span class="DCM220">&#160;DCM220&#160;</span></p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Description</p>
Expand Down Expand Up @@ -683,14 +649,6 @@
<p class="cmd_root">OUTPut:PROTection:COUPle?</p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Modules</p>
</td>
<td colspan="4" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 87%;">
<p><span class="DCP405">&#160;DCP405&#160;</span>&#160;<span class="DCP405B">&#160;DCP405B&#160;</span>&#160;<span class="DCM220">&#160;DCM220&#160;</span></p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Description</p>
Expand Down Expand Up @@ -768,14 +726,6 @@
<p class="cmd_root">OUTPut:PROTection:MEASure?</p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Modules</p>
</td>
<td colspan="4" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 87%;">
<p><span class="DCP405">&#160;DCP405&#160;</span>&#160;<span class="DCP405B">&#160;DCP405B&#160;</span>&#160;<span class="DCM220">&#160;DCM220&#160;</span></p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Description</p>
Expand Down Expand Up @@ -859,24 +809,18 @@
<p class="Default_nt2">Syntax</p>
</td>
<td colspan="4" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 87%;">
<p class="cmd_root">OUTPut:TRACk[:STATe] {&lt;bool&gt;}</p>
<p class="cmd_root">OUTPut:TRACk[:STATe] {&lt;chanlist&gt;}</p>
<p class="cmd_root">OUTPut:TRACk[:STATe]?</p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Modules</p>
</td>
<td colspan="4" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 87%;">
<p><span class="DCP405">&#160;DCP405&#160;</span>&#160;<span class="DCP405B">&#160;DCP405B&#160;</span>&#160;<span class="DCM220">&#160;DCM220&#160;</span></p>
</td>
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Description</p>
</td>
<td colspan="4" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 87%;">
<p>This command enables or disables two or more power modules to operate in the track mode. For example, when the track mode is first enabled, the CH2 output will be set to the same voltage level as the CH1 output. Once enabled, any change of the programmed voltage level in either CH1 or CH2 will be reflected in the other channel. The TRACk OFF command returns the power modules to the non-track mode.</p>
<p>This command enables or disables two or more channels to operate in the track mode defined with the channel list. Once enabled, any change on any of the channel from the channel list will be applied to the whole channel list. </p>
<p>&#160;</p>
<p>The OUTPut:TRACk OFF command returns all affected channels to the non-track mode.</p>
<p>&#160;</p>
<p>A device-specific error 312 will be generated if this command is tried to executed when channels are in any of coupled mode.</p>
<p>&#160;</p>
Expand All @@ -890,7 +834,6 @@
<ul>
<li class="List_1_Start" style="text-indent: 0; list-style-type: disc;">CALibrate, </li>
<li class="List_1" style="text-indent: 0; list-style-type: disc;">INSTrument:COUPle:TRACking,</li>
<li class="List_1" style="text-indent: 0; list-style-type: disc;">OUTPut:TRACk[:STATe],</li>
<li class="List_1" style="text-indent: 0; list-style-type: disc;">SIMUlator:RPOL, SIMUlator:VOLTage:PROGram,</li>
<li class="List_1" style="text-indent: 0; list-style-type: disc;">[SOURce[&lt;n&gt;]]:VOLTage:PROGram,</li>
</ul>
Expand All @@ -917,13 +860,13 @@
</tr>
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 22%;">
<p>&lt;bool&gt;</p>
<p>&lt;chanlist&gt;</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 22%;">
<p style="text-align: center;">Boolean</p>
<p style="text-align: center;">ChannelList|Boolean</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 22%;">
<p>ON|OFF|0|1</p>
<p>List of channels, OFF|0</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 22%;">
<p style="text-align: center;">OFF</p>
Expand All @@ -942,11 +885,13 @@
<p class="Default_nt2">Usage<span style="font-style: italic;"> </span>example</p>
</td>
<td colspan="4" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 87%;">
<p class="cmd_code">OUTP:TRAC ON</p>
<p>Define track group that contains channel 1, 3 and 4:</p>
<p class="cmd_code">&#160;</p>
<p class="cmd_code">OUTP:TRAC (@1,3:4)</p>
<p class="cmd_code">VOLT 12</p>
<p class="cmd_code">MEAS?</p>
<p class="cmd_code_single">12.00</p>
<p class="cmd_code">MEAS? CH2</p>
<p class="cmd_code">MEAS? CH3</p>
<p class="cmd_code_Start">12.00</p>
</td>
</tr>
Expand Down
Loading

0 comments on commit 2566217

Please sign in to comment.