Doing THD calc

main.py

@@ -1,7 +1,6 @@
 
 import numpy as np
-import fft_meas
-import zerocross_meas
+import measurements
 
 
 # to do
@@ -12,33 +11,38 @@ import zerocross_meas
 def main():
 	time = 0
 	delta_t = 1e-6
-	t_stop = 1.1
+	t_stop = 1.2
+
+	ADC_sample_frequency = 50e3
+	ADC_sample_period = 1/ADC_sample_frequency
+	ADC_timer = 0
 
 
 
 	amplitude = 1
-	base_freq = 50
+	base_freq = 60
 
+	Meas_ADC = measurements.measurements(fs=ADC_sample_frequency)
 
-	fft_measurements = fft_meas.fft_meas(fs=50e3, tn=0.2)
-	zerocross = zerocross_meas.zerocross_meas(fs=50e3, tn=1)
 
 	for i in range(0, int(t_stop/delta_t)+1):
+
+
 		Ph1 = np.sin(2*np.pi*time*base_freq)
 
 
-		zerocross.step(x=Ph1, time=time)
+		if time - ADC_timer >= ADC_sample_period:
+			ADC_timer += ADC_sample_period
 
-		fft_measurements.step(data=Ph1, time=time, f_H1=zerocross.freq, unit="I")
+			Meas_ADC.Interupt(Ph1)
 		
 
 
 		time += delta_t
 
+	Meas_ADC.print()
+	Meas_ADC.plot()
 
-	zerocross.print()
-	#fft_measurements.plot()
-