diff --git a/reference_designs/Figure_1.png b/reference_designs/Figure_1.png new file mode 100644 index 0000000..17ae595 Binary files /dev/null and b/reference_designs/Figure_1.png differ diff --git a/reference_designs/Figure_2.png b/reference_designs/Figure_2.png new file mode 100644 index 0000000..6d827c5 Binary files /dev/null and b/reference_designs/Figure_2.png differ diff --git a/reference_designs/salinity.ods b/reference_designs/salinity.ods new file mode 100644 index 0000000..f0126e6 Binary files /dev/null and b/reference_designs/salinity.ods differ diff --git a/reference_designs/salinity_r100k.csv b/reference_designs/salinity_r100k.csv new file mode 100644 index 0000000..43a0c54 --- /dev/null +++ b/reference_designs/salinity_r100k.csv @@ -0,0 +1,6 @@ +R [kΩ],Input Amplitude [Vpp],Input Frequency [Hz],Output Amplitude [Vpp],Output Phase Shift [degrees],CSV File +100.00,3.30,0.10,2.77,-7.16,scope_3 +,,1.00,3.06,-5.90,Scope_4 +,,5.00,3.26,-3.10,Scope_5 +,,10.00,3.34,-2.60,Scope_6 +,,100.00,3.50,0.00,Scope_7 diff --git a/reference_designs/salinity_r10k.csv b/reference_designs/salinity_r10k.csv new file mode 100644 index 0000000..8309ed4 --- /dev/null +++ b/reference_designs/salinity_r10k.csv @@ -0,0 +1,10 @@ +R [kΩ],Input Amplitude [Vpp],Input Frequency [Hz],Output Amplitude [Vpp],Output Phase Shift [degrees],CSV File +1.00,3.30,0.10,1.37,-35.79,scope_9 +,,1.00,1.81,-22.74,scope_10 +,,5.00,2.21,-19.74,scope_11 +,,10.00,2.30,-22.30,scope_12 +,,100.00,2.70,-7.20,scope_13 +,,250.00,2.77,-4.50,scope_14 +,,500.00,2.85,-3.00,scope_15 +,,1000.00,2.93,-2.20,scope_16 +,,5000.00,3.14,0.00,scope_17 diff --git a/reference_designs/salinity_r1k.csv b/reference_designs/salinity_r1k.csv new file mode 100644 index 0000000..8309ed4 --- /dev/null +++ b/reference_designs/salinity_r1k.csv @@ -0,0 +1,10 @@ +R [kΩ],Input Amplitude [Vpp],Input Frequency [Hz],Output Amplitude [Vpp],Output Phase Shift [degrees],CSV File +1.00,3.30,0.10,1.37,-35.79,scope_9 +,,1.00,1.81,-22.74,scope_10 +,,5.00,2.21,-19.74,scope_11 +,,10.00,2.30,-22.30,scope_12 +,,100.00,2.70,-7.20,scope_13 +,,250.00,2.77,-4.50,scope_14 +,,500.00,2.85,-3.00,scope_15 +,,1000.00,2.93,-2.20,scope_16 +,,5000.00,3.14,0.00,scope_17 diff --git a/reference_designs/salinity_salinitychange.csv b/reference_designs/salinity_salinitychange.csv new file mode 100644 index 0000000..8e6d290 --- /dev/null +++ b/reference_designs/salinity_salinitychange.csv @@ -0,0 +1,32 @@ +R [kΩ],Input Amplitude [Vpp],Input Frequency [Hz],Salinity,Output Amplitude [Vpp],Output Phase Shift [degrees],CSV File +1.00,3.30,10.00,Least Salty,4.10,-17.00,scope_18 +,,,Medium Salty,4.60,-16.50,scope_25 +,,,Most Salty,4.70,-16.20,scope_31 + +,,25.00,Least Salty,4.50,-13.76,scope_19 +,,,Medium Salty,4.40,-16.00,scope_26 +,,,Most Salty,4.80,-16.00,scope_32 + +,,50.00,Least Salty,4.70,-10.60,scope_20 +,,,Medium Salty,4.60,-13.00,scope_27 +,,,Most Salty,5.10,-12.05,scope_33 + +,,100.00,Least Salty,4.90,-9.60,scope_21 +,,,Medium Salty,4.90,-9.70,woops +,,,Most Salty,5.20,-10.33,scope_34 + +,,250.00,Least Salty,5.10,-5.70,scope_22 +,,,Medium Salty,5.10,-6.00,scope_28 +,,,Most Salty,5.50,-7.04,scope_34 + +,,500.00,Least Salty,5.20,-5.60,scope_23 +,,,Medium Salty,5.20,-5.50,scope_29 +,,,Most Salty,5.60,-4.90,scope_35 + +,,1000.00,Least Salty,5.50,-4.00,scope_24 +,,,Medium Salty,5.40,-4.00,scope_24 +,,,Most Salty,5.90,-5.00,scope_36 + +,,2500.00,Least Salty,5.80,-4.00,scope_25 +,,,Medium Salty,5.80,-4.30,scope_30 +,,,Most Salty,6.30,-2.00,scope_37 diff --git a/reference_designs/scripts/plot.py b/reference_designs/scripts/plot.py new file mode 100644 index 0000000..53f078c --- /dev/null +++ b/reference_designs/scripts/plot.py @@ -0,0 +1,5 @@ +import numpy as np +import pandas as pd +import matplotlib.pyplot as plt + +data = pd.read_csv('salinity_r1k.csv') diff --git a/reference_designs/scripts/plot_sal.py b/reference_designs/scripts/plot_sal.py new file mode 100644 index 0000000..b35717d --- /dev/null +++ b/reference_designs/scripts/plot_sal.py @@ -0,0 +1,19 @@ +import numpy as np +import pandas as pd + +df = pd.read_csv('salinity_salinitychange.csv') + +least_salty = df[df['Salinity'] == 'Least Salty'] +medium_salty = df[df['Salinity'] == 'Medium Salty'] +most_salty = df[df['Salinity'] == 'Most Salty'] + +medium_salty['Input Frequency [Hz]'] = least_salty['Input Frequency [Hz]'].to_numpy() +most_salty['Input Frequency [Hz]'] = least_salty['Input Frequency [Hz]'].to_numpy() + +fig, axis = plt.subplots() + +least_salty.plot.scatter(x = 'Input Frequency [Hz]', y = 'Output Amplitude [Vpp]', ax = axis, label = 'Least Salty', c = "red") +medium_salty.plot.scatter(x = 'Input Frequency [Hz]', y = 'Output Amplitude [Vpp]', ax = axis, label = 'Meduim Salty', c = "blue") +most_salty.plot.scatter(x = 'Input Frequency [Hz]', y = 'Output Amplitude [Vpp]', ax = axis, label = 'Most Salty', c = "green") + +plt.show() diff --git a/reference_designs/scripts/plot_sal_wallplug.py b/reference_designs/scripts/plot_sal_wallplug.py new file mode 100644 index 0000000..2256810 --- /dev/null +++ b/reference_designs/scripts/plot_sal_wallplug.py @@ -0,0 +1,6 @@ +import numpy as np +import pandas as pd + +data = pd.read_csv("fixed_1k_1k_5vpp.csv") + + diff --git a/reference_designs/scripts/plot_wallplug.py b/reference_designs/scripts/plot_wallplug.py new file mode 100644 index 0000000..cfad452 --- /dev/null +++ b/reference_designs/scripts/plot_wallplug.py @@ -0,0 +1,10 @@ +import numpy as np +import pandas as pd + +data = pd.csv_read('wallplug_trials.csv') + +data.plot(kind = 'scatter', x = 'Series Resistor [Ohms].1', y = 'Differences [Vpp]') + +data['Differences Abs [Vpp]'] = data['Differences [Vpp]'].abs() + +data.plot(kind = 'scatter', x = 'Series Resistor [Ohms].1', y = 'Differences Abs [Vpp]', logx = True) diff --git a/reference_designs/scripts/plot_wallplug_trials.py b/reference_designs/scripts/plot_wallplug_trials.py new file mode 100644 index 0000000..3a92a47 --- /dev/null +++ b/reference_designs/scripts/plot_wallplug_trials.py @@ -0,0 +1,21 @@ +import numpy as np +import pandas as pd +import matplotlib.pyplot as plt + +data = pd.read_csv('amplified.csv') + +plt.scatter(data['Salinity [ppt]'], data['Output Max Trial 1[Vpp]'], label = 'Trial 1', color = 'green') +plt.scatter(data['Salinity [ppt]'], data['Output Max Trial 2[Vpp]'], label = 'Trial 2', color = 'blue') +plt.scatter(data['Salinity [ppt]'], data['Output Max Trial 3[Vpp]'], label = 'Trial 3', color = 'red') +plt.scatter(data['Salinity [ppt]'], data['Output Max Trial 4[Vpp]'], label = 'Trial 4', color = 'pink') + +z = np.polyfit(data['Salinity [ppt]'], data['Output Max Trial 4[Vpp]'], 1) +p = np.poly1d(z) + +plt.legend(title='Trials') +plt.ylabel('Output Max [Vpp]', fontsize=14) +plt.xlabel('Salinity [ppt]', fontsize=14) + +plt.show() + +print(f"Trendline equation: y = {z[0]}x + {z[1]}") diff --git a/reference_designs/test.html b/reference_designs/test.html new file mode 100644 index 0000000..7122a08 --- /dev/null +++ b/reference_designs/test.html @@ -0,0 +1,66 @@ + + + + + test + + + + + + + + + + +
+ + + + + \ No newline at end of file diff --git a/reference_designs/wall_plug/amplified.csv b/reference_designs/wall_plug/amplified.csv new file mode 100644 index 0000000..daf42c8 --- /dev/null +++ b/reference_designs/wall_plug/amplified.csv @@ -0,0 +1,4 @@ +Frequency [Hz],Input Amplitude [Vpp],Rf [ohms],Salinity [ppt],Output Max Trial 1[Vpp],Output Max Trial 2[Vpp],Output Max Trial 3[Vpp],Output Max Trial 4[Vpp] +1000.00,5.00,100.00,30.00,2.40,2.33,2.31,2.31 +,,,25.00,2.25,2.23,2.25,2.25 +,,,20.00,2.17,2.13,2.17,2.17 diff --git a/reference_designs/wall_plug/changesal_1k_1k.csv b/reference_designs/wall_plug/changesal_1k_1k.csv new file mode 100644 index 0000000..35cf720 --- /dev/null +++ b/reference_designs/wall_plug/changesal_1k_1k.csv @@ -0,0 +1,16 @@ +Frequency [Hz],Series Resistor [ohms],Input Amplitude [Vpp],Salinity [ppt],U-Shape Amplitude [Vpp],U-Shape Max [Vpp] +10.00,1000.00,2.50,20.00,0.47,0.25 +,,,25.00,0.47,0.25 +,,,30.00,0.46,0.24 +Frequency [Hz],Series Resistor [ohms],Input Amplitude [Vpp],Salinity [ppt],U-Shape Amplitude [Vpp],U-Shape Max [Vpp] +100.00,1000.00,2.50,20.00,0.80,0.42 +,,,25.00,0.81,0.42 +,,,30.00,0.83,0.43 +Frequency [Hz],Series Resistor [ohms],Input Amplitude [Vpp],Salinity [ppt],U-Shape Amplitude [Vpp],U-Shape Max [Vpp] +1000.00,1000.00,2.50,20.00,1.42,0.73 +,,,25.00,1.44,0.74 +,,,30.00,1.47,0.75 +Frequency [Hz],Series Resistor [ohms],Input Amplitude [Vpp],Salinity [ppt],U-Shape Amplitude [Vpp],U-Shape Max [Vpp] +10000.00,1000.00,2.50,20.00,2.00,1.01 +,,,25.00,2.06,1.05 +,,,30.00,2.09,1.06 diff --git a/reference_designs/wall_plug/fixed_1k_1k_5vpp.csv b/reference_designs/wall_plug/fixed_1k_1k_5vpp.csv new file mode 100644 index 0000000..3ce5fe1 --- /dev/null +++ b/reference_designs/wall_plug/fixed_1k_1k_5vpp.csv @@ -0,0 +1,4 @@ +Frequency [Hz],Series Resistor [ohms],Input Amplitude [Vpp],Salinity [ppt],U-Shape Amplitude [Vpp],Differences [Vpp],Full Block Amplitude [Vpp],Differences [Vpp] +1000.00,1000.00,5.00,20.00,3.05,0.03,3.23,0.08 +,,,25.00,3.08,0.04,3.31,0.04 +,,,30.00,3.12,0.07,3.36,0.13 diff --git a/reference_designs/wall_plug/wallplug_trials.csv b/reference_designs/wall_plug/wallplug_trials.csv new file mode 100644 index 0000000..6a573a2 --- /dev/null +++ b/reference_designs/wall_plug/wallplug_trials.csv @@ -0,0 +1,16 @@ +Frequency [Hz],Input Amplitude [Vpp],Salinity [ppt],Series Resistor [Ohms],Output Amplitude [Vpp],,Series Resistor [Ohms],Differences [Vpp] +1000.00,5.00,30.00,10.00,0.40,,10.00,-0.06 +,,25.00,10.00,0.38,,100.00,-0.22 +,,20.00,10.00,0.34,,1000.00,-0.10 +,,30.00,100.00,2.19,,10000.00,-0.02 +,,25.00,100.00,2.09,,100000.00,0.00 +,,20.00,100.00,1.97 +,,30.00,1000.00,4.37 +,,25.00,1000.00,4.36 +,,20.00,1000.00,4.27 +,,30.00,10000.00,4.95 +,,25.00,10000.00,4.95 +,,20.00,10000.00,4.93 +,,30.00,100000.00,5.00 +,,25.00,100000.00,5.00 +,,20.00,100000.00,5.00 diff --git a/reference_designs/wall_plug/wallplug_trials.sc b/reference_designs/wall_plug/wallplug_trials.sc new file mode 100644 index 0000000..34e697f --- /dev/null +++ b/reference_designs/wall_plug/wallplug_trials.sc @@ -0,0 +1,126 @@ +# This data file was generated by the Spreadsheet Calculator Improvised (sc-im) +# You almost certainly shouldn't edit it. + +newsheet "New Design" +newsheet "Amplified" +movetosheet "New Design" +offscr_sc_cols 0 +offscr_sc_rows 0 +nb_frozen_rows 0 +nb_frozen_cols 0 +nb_frozen_screenrows 0 +nb_frozen_screencols 0 +format A 14 2 0 +format B 21 2 0 +format C 17 2 0 +format D 22 2 0 +format E 22 2 0 +format G 23 2 0 +format H 19 2 0 +label A0 = "Frequency [Hz]" +label B0 = "Input Amplitude [Vpp]" +label C0 = "Salinity [ppt]" +label D0 = "Series Resistor [Ohms]" +label E0 = "Output Amplitude [Vpp]" +label G0 = "Series Resistor [Ohms]" +label H0 = "Differences [Vpp]" +let A1 = 1000 +let B1 = 5 +let C1 = 30 +let D1 = 10 +let E1 = 0.399 +let G1 = 10 +let H1 = E3-E1 +let C2 = 25 +let D2 = 10 +let E2 = 0.37625 +let G2 = 100 +let H2 = E6-E4 +let C3 = 20 +let D3 = 10 +let E3 = 0.34125 +let G3 = 1000 +let H3 = E9-E7 +let C4 = 30 +let D4 = 100 +let E4 = 2.1895 +let G4 = 10000 +let H4 = E12-E10 +let C5 = 25 +let D5 = 100 +let E5 = 2.09175 +let G5 = 100000 +let H5 = E15-E13 +let C6 = 20 +let D6 = 100 +let E6 = 1.972 +let C7 = 30 +let D7 = 1000 +let E7 = 4.37175 +let C8 = 25 +let D8 = 1000 +let E8 = 4.35725 +let C9 = 20 +let D9 = 1000 +let E9 = 4.27025 +let C10 = 30 +let D10 = 10000 +let E10 = 4.95 +let C11 = 25 +let D11 = 10000 +let E11 = 4.95 +let C12 = 20 +let D12 = 10000 +let E12 = 4.92525 +let C13 = 30 +let D13 = 100000 +let E13 = 4.995 +let C14 = 25 +let D14 = 100000 +let E14 = 4.995 +let C15 = 20 +let D15 = 100000 +let E15 = 4.995 +goto A0 +movetosheet "Amplified" +offscr_sc_cols 0 +offscr_sc_rows 0 +nb_frozen_rows 0 +nb_frozen_cols 0 +nb_frozen_screenrows 0 +nb_frozen_screencols 0 +format A 14 2 0 +format B 21 2 0 +format C 14 2 0 +format D 21 2 0 +format E 23 2 0 +format F 23 2 0 +format G 23 2 0 +format H 23 2 0 +label A0 = "Frequency [Hz]" +label B0 = "Input Amplitude [Vpp]" +label C0 = "Rf [ohms]" +label D0 = "Salinity [ppt]" +label E0 = "Output Max Trial 1[Vpp]" +label F0 = "Output Max Trial 2[Vpp]" +label G0 = "Output Max Trial 3[Vpp]" +label H0 = "Output Max Trial 4[Vpp]" +let A1 = 1000 +let B1 = 5 +let C1 = 100 +let D1 = 30 +let E1 = 2.4 +let F1 = 2.33 +let G1 = 2.31 +let H1 = 2.31 +let D2 = 25 +let E2 = 2.25 +let F2 = 2.23 +let G2 = 2.25 +let H2 = 2.25 +let D3 = 20 +let E3 = 2.17 +let F3 = 2.13 +let G3 = 2.17 +let H3 = 2.17 +goto A3