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 May 8, 2021
2 parents 9e70fc6 + 8aab6a5 commit 04888b5
Show file tree
Hide file tree
Showing 13 changed files with 363 additions and 402 deletions.
87 changes: 35 additions & 52 deletions docs/SCPI reference guide/Commands/EEZ BB3 SCPI reference 5.13 - ROUTe.html
View file

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions docs/SCPI reference guide/Commands/EEZ BB3 SCPI reference 5.16 - STATus.html
View file

Large diffs are not rendered by default.

429 changes: 138 additions & 291 deletions docs/SCPI reference guide/Commands/EEZ BB3 SCPI reference 5.17 - SYSTem.html
View file

Large diffs are not rendered by default.

142 changes: 121 additions & 21 deletions docs/SCPI reference guide/Commands/EEZ BB3 SCPI reference 5.9 - MEASure.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
.scpi2 { text-align: left; margin-left: 10mm; }
.scpi3 { text-align: left; margin-left: 14.99mm; }
.table_header { text-align: center; }
.DCP405 { font-family: "Arial"; font-size: 12.0pt; font-weight: bold; font-style: normal; background-color: #ff6600; color: #ffffff; }

/* Footnotes & endnotes */
#webpub_footnotes_divider { clear: both; margin-top: 2em; width: 25%; border-top: 1px solid black; }
Expand All @@ -43,79 +44,95 @@
<p class="Heading_2">5.9. <a name="_measure"></a>MEASure</p>
<p>Measure commands return back the output voltage, current, power or temperature. They trigger the acquisition of new data before returning the reading. Measurements are performed by digitizing the instantaneous output voltage, current or temperature. Output power is calculated as product of measured voltage and current. Keyword [:DC] is optional since all measurement are by default of the DC level of the signal.</p>
<p>&#160;</p>
<table style="border-collapse: collapse; background: transparent; width: 175.02mm;">
<table style="border-collapse: collapse; background: transparent; width: 170.06mm;">
<tr style="background: transparent;">
<td style="border-left: 0; border-right: 0; border-top: 1px solid #000000; border-bottom: 1px solid #000000; vertical-align: top; background: transparent; width: 42%;">
<td style="border-left: 0; border-right: 0; border-top: 1px solid #000000; border-bottom: 1px solid #000000; vertical-align: top; background: transparent; width: 43%;">
<p class="table_header">SCPI command</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 1px solid #000000; border-bottom: 1px solid #000000; vertical-align: top; background: transparent; width: 58%;">
<td style="border-left: 0; border-right: 0; border-top: 1px solid #000000; border-bottom: 1px solid #000000; vertical-align: top; background: transparent; width: 57%;">
<p class="table_header">Description</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: 42%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 43%;">
<p class="scpi0">MEASure</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 58%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 57%;">
<p>&#160;</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: 42%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 43%;">
<p class="scpi1">[:SCALar]</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 58%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 57%;">
<p>&#160;</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: 42%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 43%;">
<p class="scpi2">:CURRent</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 58%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 57%;">
<p>&#160;</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: 42%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 43%;">
<p class="scpi3"><a href="#meas_curr"><span style="text-decoration: underline;">[:DC]? [&lt;channel&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: 58%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 57%;">
<p>Takes a measurement; returns the average current</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: 42%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 43%;">
<p class="scpi2">:POWer</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 58%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 57%;">
<p>&#160;</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: 42%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 43%;">
<p class="scpi3"><a href="#meas_pow"><span style="text-decoration: underline;">[:DC]? [&lt;channel&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: 58%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 57%;">
<p>Takes a measurement; returns the average power</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: 42%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 43%;">
<p class="scpi2">[:VOLTage]</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 58%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 57%;">
<p>&#160;</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: 42%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 43%;">
<p class="scpi3"><a href="#meas_volt"><span style="text-decoration: underline;">[:DC]? [&lt;channel&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: 58%;">
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 57%;">
<p>Takes a measurement; returns the average voltage</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: 43%;">
<p class="scpi2">:TEMPerature</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 57%;">
<p>&#160;</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: 43%;">
<p class="scpi3"><a href="#meas_temp"><span style="text-decoration: underline;">[:THERmistor][:DC]? {&lt;chanlist&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: 57%;">
<p>Takes a measurement; returns the average temperature</p>
</td>
</tr>
</table>
<p>&#160;</p>
<p class="Heading_3">5.9.1. <a name="meas_curr"></a>MEASure[:SCALar]:CURRent[:DC]</p>
Expand Down Expand Up @@ -240,7 +257,7 @@
<p style="text-align: center;">CH1|CH2|CH3|CH4|CH5|CH6</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;">n/a</p>
<p style="text-align: center;">–</p>
</td>
</tr>
<tr style="background: transparent;">
Expand Down Expand Up @@ -315,7 +332,7 @@
<p style="text-align: center;">CH1|CH2|CH3|CH4|CH5|CH6</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;">n/a</p>
<p style="text-align: center;">–</p>
</td>
</tr>
<tr style="background: transparent;">
Expand Down Expand Up @@ -348,6 +365,89 @@
</td>
</tr>
</table>
<p class="Heading_3">5.9.4. <a name="meas_temp"></a>MEASure[:SCALar]:TEMPerature[:THERmistor][:DC]</p>
<table style="border-collapse: collapse; background: transparent; width: 169.92mm;">
<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">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">MEASure[:SCALar]:TEMPerature[:THERmistor][:DC]? [&lt;chanlist&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" style="background-color: #ff66cc;">&#160;MUX&#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>Query the temperature measured on the temperature sensor of the selected channel.</p>
</td>
</tr>
<tr style="background: transparent;">
<td rowspan="2" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 13%;">
<p class="Default_nt2">Parameters</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 1px solid #000000; vertical-align: top; background: transparent; width: 22%;">
<p style="text-align: center;">Name</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 1px solid #000000; vertical-align: top; background: transparent; width: 22%;">
<p style="text-align: center;">Type</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 1px solid #000000; vertical-align: top; background: transparent; width: 22%;">
<p style="text-align: center;">Range</p>
</td>
<td style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 1px solid #000000; vertical-align: top; background: transparent; width: 22%;">
<p style="text-align: center;">Default</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: 22%;">
<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;">ChannelList</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;">MUX: (@n31) where n is the slot number</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;">–</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">Return</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>Returns the average output voltage in volts as decimal number (NR2).</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">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">MEAS:TEMP? (@131)</p>
<p class="cmd_code_single">29</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">Related Commands</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>SYSTem:MEASure[:SCALar]:TEMPerature[:THERmistor][:DC]</p>
</td>
</tr>
</table>
<p>&#160;</p>
<p>&#160;</p>
</body>
Expand Down
Loading

0 comments on commit 04888b5

Please sign in to comment.