Skip to content

Commit

Permalink
AWG amplitude / offset mode fixes
Browse files Browse the repository at this point in the history 
Fixes and enhancements were made to the AWG controls when in amplitude / offset mode to include gain / offset variable support when using external AWG buffer amplifiers.

And other general house keeping changes.
  • Loading branch information
damercer committed Jun 25, 2020
1 parent 0372d1d commit 3c4ae46
Show file tree
Hide file tree
Showing 97 changed files with 29,112 additions and 28,423 deletions.
4 changes: 4 additions & 0 deletions ALICE-docs/alice_init.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,8 @@ global AllowFlashFirmware; AllowFlashFirmware = 1
global AWG_Amp_Mode; AWG_Amp_Mode.set(0) # 0 = Min/Max mode, 1 = Amp/Offset
global PhaseOffset1x; PhaseOffset1x = 30
global PhaseOffset2x; PhaseOffset2x = 30
AWGA_Ext_Gain.set(0.5)
AWGA_Ext_Offset.set(2.50)
AWGB_Ext_Gain.set(0.5)
AWGB_Ext_Offset.set(2.50)
MultipleBoards.set(1)
36 changes: 26 additions & 10 deletions ALICE-docs/html/alice-desktop-1_83_8pyw.html
View file

Large diffs are not rendered by default.

11 changes: 8 additions & 3 deletions ALICE-docs/html/alice-desktop-1_83_8pyw.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ var alice_desktop_1_83_8pyw =
[ "BSendDA1", "alice-desktop-1_83_8pyw.html#ae09f9a65d89c2f9029b2c8044a9ce135", null ],
[ "BSendGS", "alice-desktop-1_83_8pyw.html#a37750a67906d515cadcdb84678ba6367", null ],
[ "BSendMG", "alice-desktop-1_83_8pyw.html#a8b0162792a0fbacde5f55504b70e0526", null ],
[ "BSetFmin", "alice-desktop-1_83_8pyw.html#a5709ed34d0084191df86f254c9b5212e", null ],
[ "BSetMarkerLocation", "alice-desktop-1_83_8pyw.html#aaebc9c30b00c20a46555b2ebf3317c28", null ],
[ "BShowCurvesAll", "alice-desktop-1_83_8pyw.html#ae6368591b0faae9f01174f0f1aec30d0", null ],
[ "BShowCurvesAllBP", "alice-desktop-1_83_8pyw.html#a0902ca2541c28b064a6faec332c1f413", null ],
Expand Down Expand Up @@ -451,6 +452,8 @@ var alice_desktop_1_83_8pyw =
[ "AWG_2X", "alice-desktop-1_83_8pyw.html#aa7cf8132a4ebfd508139b84b718a7f22", null ],
[ "AWG_Amp_Mode", "alice-desktop-1_83_8pyw.html#ad3120d05adde617fb1491d900b369560", null ],
[ "AWGA2X", "alice-desktop-1_83_8pyw.html#a385442952cd61c71af073f871badb7e3", null ],
[ "AWGA_Ext_Gain", "alice-desktop-1_83_8pyw.html#af118e04cd738b6e9b396db24aa72fcba", null ],
[ "AWGA_Ext_Offset", "alice-desktop-1_83_8pyw.html#a59dca61327525d2563219262060fac8e", null ],
[ "AWGAAmplvalue", "alice-desktop-1_83_8pyw.html#a6f7b43cd140854a1554817a07db242df", null ],
[ "AWGABurstDelay", "alice-desktop-1_83_8pyw.html#a8097993480d8a693c64c9b34bab482fc", null ],
[ "AWGACycles", "alice-desktop-1_83_8pyw.html#a60b5338dc9756e5c418cb23349cf5340", null ],
Expand All @@ -463,6 +466,8 @@ var alice_desktop_1_83_8pyw =
[ "AWGAWave", "alice-desktop-1_83_8pyw.html#ac8b03d7d469093abb54e1fcafdd1969a", null ],
[ "AWGAwaveform", "alice-desktop-1_83_8pyw.html#a4918fba22ccb6f42a72c0488ebd7ee73", null ],
[ "AWGB2X", "alice-desktop-1_83_8pyw.html#ab3fe385d5dcaf263c359a035e5138dbb", null ],
[ "AWGB_Ext_Gain", "alice-desktop-1_83_8pyw.html#accb41fe21d7bb725baa9c9455b876822", null ],
[ "AWGB_Ext_Offset", "alice-desktop-1_83_8pyw.html#a6d07c808a744238789bb0edb65c96e3d", null ],
[ "AWGBAmplvalue", "alice-desktop-1_83_8pyw.html#a32fa3dc0acfaf9573d129088b712beb5", null ],
[ "AWGBBurstDelay", "alice-desktop-1_83_8pyw.html#ae2c1c59f484f407e4eb1a039e46f1736", null ],
[ "AWGBCycles", "alice-desktop-1_83_8pyw.html#ae7bb97f01bb245a791e2888be897cec1", null ],
Expand Down Expand Up @@ -632,9 +637,9 @@ var alice_desktop_1_83_8pyw =
[ "COLORtrace7", "alice-desktop-1_83_8pyw.html#a6676130d9d6a7902054d009ff815a6fe", null ],
[ "COLORtraceR1", "alice-desktop-1_83_8pyw.html#a78a99cef0d5fa63c107e1031531ac7df", null ],
[ "COLORtraceR2", "alice-desktop-1_83_8pyw.html#a99a21d5558a6e5a31fe9e9afccf85508", null ],
[ "COLORtraceR3", "alice-desktop-1_83_8pyw.html#ae76c617f6eb9d7d725ade5ec81d75bc0", null ],
[ "COLORtraceR4", "alice-desktop-1_83_8pyw.html#a6008ebd67d4f18069b54ca66fa1bd2e5", null ],
[ "COLORtraceR5", "alice-desktop-1_83_8pyw.html#a04165bdd6e3d35a946b3d734e95ec459", null ],
[ "COLORtraceR3", "alice-desktop-1_83_8pyw.html#a23b340c4722b1ce5fa225357e86d73c5", null ],
[ "COLORtraceR4", "alice-desktop-1_83_8pyw.html#a7d98f1b70ef7b2c235d157b88e065719", null ],
[ "COLORtraceR5", "alice-desktop-1_83_8pyw.html#a9b211efc0145380675cff4096ce6f223", null ],
[ "COLORtraceR6", "alice-desktop-1_83_8pyw.html#ae829092fad7f2d73e08ea2429eca981a", null ],
[ "COLORtraceR7", "alice-desktop-1_83_8pyw.html#a220834d033ed4dbd01a268582d79bb19", null ],
[ "COLORtrigger", "alice-desktop-1_83_8pyw.html#aec17016c8fa56cd0280de07ae643ab48", null ],
Expand Down
39,095 changes: 19,612 additions & 19,483 deletions ALICE-docs/html/alice-desktop-1_83_8pyw_source.html
View file

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions ALICE-docs/html/classalice-desktop-1_1_1_create_tool_tip.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
<div class="textblock"><p>Tool Tip Ballon help stuff. </p>

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00683">683</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00691">691</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
</div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
<a id="a8336d19f13ca2553ebc3980f507479e0"></a>
<h2 class="memtitle"><span class="permalink"><a href="#a8336d19f13ca2553ebc3980f507479e0">&#9670;&nbsp;</a></span>__init__()</h2>
Expand Down Expand Up @@ -179,7 +179,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#a8336d19f13ca2553ebc3980f

<p>create a tooltip for a given widget </p>

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00685">685</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00693">693</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>

</div>
</div>
Expand Down Expand Up @@ -212,7 +212,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#a41df9e5362fe569b9173a4c6

<p>Action when mouse enters. </p>

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00696">696</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00704">704</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>

</div>
</div>
Expand All @@ -234,7 +234,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ab5e9ac7b2957f299e378b70d

<p>Hide Tip Action. </p>

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00728">728</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00736">736</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>

</div>
</div>
Expand Down Expand Up @@ -266,7 +266,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#af4c5bff90dc4d63a5078f75e

<p>Action when mouse leaves. </p>

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00699">699</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00707">707</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>

</div>
</div>
Expand All @@ -288,7 +288,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#a9dbe38d24ce698abeb7da28c

<p>Sehedule Action. </p>

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00703">703</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00711">711</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>

</div>
</div>
Expand Down Expand Up @@ -320,7 +320,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#a39aff01fca7cee00c2055918

<p>Display Tip Text. </p>

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00713">713</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00721">721</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>

</div>
</div>
Expand All @@ -342,7 +342,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#aafb79b3b414f91127bc8cf6a

<p>Un-schedule Action. </p>

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00707">707</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00715">715</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>

</div>
</div>
Expand All @@ -359,7 +359,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#acf2488b95c97e0378c9bf49d
</table>
</div><div class="memdoc">

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00693">693</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00701">701</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>

</div>
</div>
Expand All @@ -375,7 +375,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#af575f17e6be3f269b86b041a
</table>
</div><div class="memdoc">

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00689">689</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00697">697</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>

</div>
</div>
Expand All @@ -391,7 +391,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#a8ab281a7bda6fe9c9075975f
</table>
</div><div class="memdoc">

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00694">694</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00702">702</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>

</div>
</div>
Expand All @@ -407,7 +407,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ac2edb22a0448abbb5ad4922d
</table>
</div><div class="memdoc">

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00686">686</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00694">694</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>

</div>
</div>
Expand All @@ -423,7 +423,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#a60d5947424f4fcd4ca9ed05e
</table>
</div><div class="memdoc">

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00688">688</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00696">696</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>

</div>
</div>
Expand All @@ -439,7 +439,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#a7d99fa5003da39b5f1673f2a
</table>
</div><div class="memdoc">

<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00687">687</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>
<p class="definition">Definition at line <a class="el" href="alice-desktop-1_83_8pyw_source.html#l00695">695</a> of file <a class="el" href="alice-desktop-1_83_8pyw_source.html">alice-desktop-1.3.pyw</a>.</p>

</div>
</div>
Expand Down
Loading

0 comments on commit 3c4ae46

Please sign in to comment.