d

microcontroller/Demo.C

@@ -198,7 +198,7 @@ void lock_StabPulse_i2c(void) {
 
   // Initialize locking parameter defaults
   // This will likely be selected using the Pi
-  N = 10;
+  N = 1;
   Vin = 0;
   Vin_gnd = 0;
   start = 25;

pi/Vout_carac.py

@@ -1,14 +0,0 @@
-from struct import*
-import ctypes
-import array
-import numpy as np
-import matplotlib.pyplot as plt
-
-from ADUCv2p0 import*
-
-
-chip1 = ADUCv2p0(0x50,True)
-
-
-chip1.set_Vout(1,1010)
-chip1.set_Vout(2,1011) 

pi/read_scan.py

@@ -1,13 +0,0 @@
-from struct import*
-import ctypes
-import array
-import numpy as np
-import matplotlib.pyplot as plt
-import time
-
-ADC = np.load("scan_data_ag2.npy")
-
-for g in range(1,8):
-    plt.plot(ADC[g-1])
-    
-plt.show()

pi/server.py

@@ -486,9 +486,9 @@ eel.renderUI(state)
 
 i = 0
 while(True):
-	#eel.renderUI(state) # TO DO
-	save_waveform() # TO DO
+	save_waveform()
 	eel.sleep(1/state["pi_freq"])
+	update_state()
 	eel.renderUI(state)
 	if(i%100==0):
 		clean_old_files("data/waveforms/", 1000)

pi/web/main.css

@@ -64,11 +64,11 @@ span{
 	border: 1px solid black;
 }
 
-input[type="text"]{
+input[type="text"], input[type="number"]{
 	width: 50px;
 	margin-left: 10px;
 }
-input[type="text"]:disabled{
+input[type="text"]:disabled, input[type="number"]:disabled{
 	background: rgba(0,0,0,0);
 }
 input[type="radio"], input[type="checkbox"]{

pi/web/main.html

@@ -35,9 +35,9 @@
 			</div>
 			
 			<div class="row">
-				<span>Pi communication freq. / Hz</span><input type="text" id="piFreq">
+				<span>Pi communication freq. / Hz</span><input type="number" id="piFreq">
 				<span class="spacing">&nbsp</span>
-				<span>Current board freq. / Hz</span><input type="text" id="boardFreq" disabled>
+				<span>Current board freq. / Hz</span><input type="number" id="boardFreq" disabled>
 				<span class="spacing">&nbsp</span>
 				<input type="checkbox" id="remoteTrigg"> Ignore trigger
 			</div>
@@ -101,30 +101,30 @@
 				<div class="row">
 					<input type="checkbox" id="enabGnd"> Subtract ground
 					<span class="spacing">&nbsp</span>
-					<span>Vlearn</span><input type="text" id="Vlearn">
+					<span>Vlearn</span><input type="number" id="Vlearn">
 				</div>
 				<div class="row">
-					<span>Start</span><input type="text" id="start">
+					<span>Start</span><input type="number" id="start">
 					<span class="spacing">&nbsp</span>
-					<span>Stop</span><input type="text" id="stop">
+					<span>Stop</span><input type="number" id="stop">
 				</div>
 				<div class="row" id="gndOptions">
-					<span>Start gnd</span><input type="text" id="startGnd">
+					<span>Start gnd</span><input type="number" id="startGnd">
 					<span class="spacing">&nbsp</span>
-					<span>Stop gnd</span><input type="text" id="stopGnd">
+					<span>Stop gnd</span><input type="number" id="stopGnd">
 				</div>
 				<div class="row" id="gndOptions">
-					<span>Nº of wf</span><input type="text" id="N">
+					<span>Nº of wf</span><input type="number" id="N">
 					<span class="spacing">&nbsp</span>
-					<span>Wf length</span><input type="text" id="wfLen">
+					<span>Wf length</span><input type="number" id="wfLen">
 				</div>
 				<span class="label">____ Locking options _________________</span>
 				<div class="row">
-					<span>Max. step</span><input type="text" id="stepMax">
+					<span>Max. step</span><input type="number" id="stepMax">
 					<span class="spacing" style="opacity: 0">&nbsp</span>
 				</div>
 				<div class="row">
-					<span>Loop gain</span><input type="text" id="Gain">
+					<span>Loop gain</span><input type="number" id="Gain">
 					<span class="spacing">&nbsp</span>
 					<input type="button" id="calibrateGain" value="Calibrate gain">
 				</div>
@@ -134,13 +134,13 @@
 					<span class="spacing" style="opacity: 0">&nbsp</span>
 				</div>
 				<div class="row">
-					<span>Input gain</span><input type="text" id="inputGain">
+					<span>Input gain</span><input type="number" id="inputGain">
 					<span class="spacing">&nbsp</span>
-					<span> Offset</span><input type="text" id="offset">
+					<span> Offset</span><input type="number" id="offset">
 				</div>
 				<span class="label">____ Output options _________________</span>
 				<div class="row">
-					<span>Broad/fine ratio</span><input type="text" id="coarseFineRatio">
+					<span>Broad/fine ratio</span><input type="number" id="coarseFineRatio">
 					<span class="spacing">&nbsp</span>
 					<input type="button" id="calibrateCoarseFineRatio" value="Calibrate ratio">
 				</div>