Merge remote-tracking branch 'origin/master' into master

# Conflicts: # README.md
CohenLabPrinceton · Aug 14, 2020 · 3acefda · 3acefda
2 parents fb079fa + f34d87a
commit 3acefda
Show file tree

Hide file tree

Showing 33 changed files with 13,345 additions and 1,392 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,12 @@
+[run]
+omit =
+    pvp/gui/constraints.py
+    pvp/gui/styles.py
+    pvp/gui/widgets/dialog.py
+
+[report]
+exclude_lines =
+    pragma: no cover
+    self.logger.
+    if __name__ == __main__
+    NotImplementedError
diff --git a/cad-files/pcbs/actuators-rev2/actuators-rev2-cache.lib b/cad-files/pcbs/actuators-rev2/actuators-rev2-cache.lib
@@ -0,0 +1,246 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# Connector_Generic_Conn_01x02
+#
+DEF Connector_Generic_Conn_01x02 J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Connector_Generic_Conn_01x02" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_1x??_*
+$ENDFPLIST
+DRAW
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 50 50 -150 1 1 10 f
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
+X Pin_2 2 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Connector_Screw_Terminal_01x02
+#
+DEF Connector_Screw_Terminal_01x02 J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Connector_Screw_Terminal_01x02" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TerminalBlock*:*
+$ENDFPLIST
+DRAW
+C 0 -100 25 1 1 6 N
+C 0 0 25 1 1 6 N
+S -50 50 50 -150 1 1 10 f
+P 2 1 1 6 -21 -87 13 -120 N
+P 2 1 1 6 -21 13 13 -20 N
+P 2 1 1 6 -14 -80 20 -113 N
+P 2 1 1 6 -14 20 20 -13 N
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
+X Pin_2 2 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_CP1
+#
+DEF Device_CP1 C 0 10 N N 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "Device_CP1" 25 -100 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ CP_*
+$ENDFPLIST
+DRAW
+A 0 -150 128 1287 513 0 1 20 N -80 -50 80 -50
+P 2 0 1 20 -80 30 80 30 N
+P 2 0 1 0 -70 90 -30 90 N
+P 2 0 1 0 -50 70 -50 110 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 130 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Mechanical_MountingHole
+#
+DEF Mechanical_MountingHole H 0 40 Y Y 1 F N
+F0 "H" 0 200 50 H V C CNN
+F1 "Mechanical_MountingHole" 0 125 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ MountingHole*
+$ENDFPLIST
+DRAW
+C 0 0 50 0 1 50 N
+ENDDRAW
+ENDDEF
+#
+# Transistor_Array_ULN2003A
+#
+DEF Transistor_Array_ULN2003A U 0 20 Y Y 1 F N
+F0 "U" 0 625 50 H V C CNN
+F1 "Transistor_Array_ULN2003A" 0 550 50 H V C CNN
+F2 "" 50 -550 50 H I L CNN
+F3 "" 100 -200 50 H I C CNN
+ALIAS ULN2003A ULN2002 ULN2002A ULN2004 ULN2004A
+$FPLIST
+ DIP*W7.62mm*
+ SOIC*3.9x9.9mm*P1.27mm*
+ SSOP*4.4x5.2mm*P0.65mm*
+ TSSOP*4.4x5mm*P0.65mm*
+ SOIC*W*5.3x10.2mm*P1.27mm*
+$ENDFPLIST
+DRAW
+C -70 200 10 0 1 0 N
+C -50 -90 10 0 1 0 F
+C -50 0 10 0 1 0 F
+C -50 100 10 0 1 0 F
+C -20 200 10 0 1 0 F
+S -300 -500 300 500 0 1 10 f
+P 2 0 1 0 -180 200 -140 200 N
+P 2 0 1 0 -60 200 160 200 N
+P 2 0 1 0 0 265 -40 265 N
+P 3 0 1 0 -20 200 -20 400 115 400 N
+P 4 0 1 0 -140 240 -140 160 -80 200 -140 240 N
+P 4 0 1 0 0 235 -40 235 -20 265 0 235 N
+X I1 1 -400 200 100 R 50 50 1 1 I
+X O7 10 400 -400 100 L 50 50 1 1 C
+X O6 11 400 -300 100 L 50 50 1 1 C
+X O5 12 400 -200 100 L 50 50 1 1 C
+X O4 13 400 -100 100 L 50 50 1 1 C
+X O3 14 400 0 100 L 50 50 1 1 C
+X O2 15 400 100 100 L 50 50 1 1 C
+X O1 16 400 200 100 L 50 50 1 1 C
+X I2 2 -400 100 100 R 50 50 1 1 I
+X I3 3 -400 0 100 R 50 50 1 1 I
+X I4 4 -400 -100 100 R 50 50 1 1 I
+X I5 5 -400 -200 100 R 50 50 1 1 I
+X I6 6 -400 -300 100 R 50 50 1 1 I
+X I7 7 -400 -400 100 R 50 50 1 1 I
+X GND 8 0 -600 100 U 50 50 1 1 W
+X COM 9 400 400 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# actuators-rev2-rescue_OX40HAT-raspberrypi_hat
+#
+DEF actuators-rev2-rescue_OX40HAT-raspberrypi_hat J 0 40 Y Y 1 F N
+F0 "J" 350 100 50 H V C CNN
+F1 "actuators-rev2-rescue_OX40HAT-raspberrypi_hat" -300 100 50 H V C CNN
+F2 "Connector_PinSocket_2.54mm:PinSocket_2x20_P2.54mm_Vertical" 0 200 50 H I C CNN
+F3 "" -700 0 50 H V C CNN
+DRAW
+S -400 50 400 -1950 0 1 0 f
+X P3V3 1 -600 0 200 R 50 50 1 1 B
+X BCM15 10 600 -400 200 L 50 50 1 1 B
+X BCM17 11 -600 -500 200 R 50 50 1 1 B
+X BCM18 12 600 -500 200 L 50 50 1 1 B
+X BCM27 13 -600 -600 200 R 50 50 1 1 B
+X GND 14 600 -600 200 L 50 50 1 1 B
+X BCM22 15 -600 -700 200 R 50 50 1 1 B
+X BCM23 16 600 -700 200 L 50 50 1 1 B
+X P3V3 17 -600 -800 200 R 50 50 1 1 B
+X BCM24 18 600 -800 200 L 50 50 1 1 B
+X BCM10 19 -600 -900 200 R 50 50 1 1 B
+X P5V 2 600 0 200 L 50 50 1 1 B
+X GND 20 600 -900 200 L 50 50 1 1 B
+X BCM9 21 -600 -1000 200 R 50 50 1 1 B
+X BCM25 22 600 -1000 200 L 50 50 1 1 B
+X BCM11 23 -600 -1100 200 R 50 50 1 1 B
+X BCM8 24 600 -1100 200 L 50 50 1 1 B
+X GND 25 -600 -1200 200 R 50 50 1 1 B
+X BCM7 26 600 -1200 200 L 50 50 1 1 B
+X BCM0 27 -600 -1300 200 R 50 50 1 1 B
+X BCM1 28 600 -1300 200 L 50 50 1 1 B
+X BCM5 29 -600 -1400 200 R 50 50 1 1 B
+X BCM2 3 -600 -100 200 R 50 50 1 1 B
+X GND 30 600 -1400 200 L 50 50 1 1 B
+X BCM6 31 -600 -1500 200 R 50 50 1 1 B
+X BCM12 32 600 -1500 200 L 50 50 1 1 B
+X BCM13 33 -600 -1600 200 R 50 50 1 1 B
+X GND 34 600 -1600 200 L 50 50 1 1 B
+X BCM19 35 -600 -1700 200 R 50 50 1 1 B
+X BCM16 36 600 -1700 200 L 50 50 1 1 B
+X BCM26 37 -600 -1800 200 R 50 50 1 1 B
+X BCM20 38 600 -1800 200 L 50 50 1 1 B
+X GND 39 -600 -1900 200 R 50 50 1 1 B
+X P5V 4 600 -100 200 L 50 50 1 1 B
+X BCM21 40 600 -1900 200 L 50 50 1 1 B
+X BCM3 5 -600 -200 200 R 50 50 1 1 B
+X GND 6 600 -200 200 L 50 50 1 1 B
+X BCM4 7 -600 -300 200 R 50 50 1 1 B
+X BCM14 8 600 -300 200 L 50 50 1 1 B
+X GND 9 -600 -400 200 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# actuators-rev2-rescue_PDQ15-Q24-S5-D-PDQ15-Q24-S5-D
+#
+DEF actuators-rev2-rescue_PDQ15-Q24-S5-D-PDQ15-Q24-S5-D U 0 40 Y Y 1 L N
+F0 "U" -501 401 50 H V L BNN
+F1 "actuators-rev2-rescue_PDQ15-Q24-S5-D-PDQ15-Q24-S5-D" -501 -601 50 H V L BNN
+F2 "CONV_PDQ15-Q24-S5-D" 0 0 50 H I L BNN
+F3 "Manufacturer Recommendations" 0 0 50 H I L BNN
+F4 "1.0" 0 0 50 H I L BNN
+F5 "CUI Inc" 0 0 50 H I L BNN
+DRAW
+P 2 0 0 10 -500 -500 -500 400 N
+P 2 0 0 10 -500 400 500 400 N
+P 2 0 0 10 500 -500 -500 -500 N
+P 2 0 0 10 500 400 500 -500 N
+X +VIN 1 -700 200 200 R 40 40 0 0 I
+X -VIN 2 -700 100 200 R 40 40 0 0 I
+X +VOUT 3 700 200 200 L 40 40 0 0 O
+X TRIM 4 700 -300 200 L 40 40 0 0 P
+X -VOUT 5 700 100 200 L 40 40 0 0 O
+X REMOTE 6 -700 -100 200 R 40 40 0 0 I
+ENDDRAW
+ENDDEF
+#
+# power_+24V
+#
+DEF power_+24V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "power_+24V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +24V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# power_+5V
+#
+DEF power_+5V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "power_+5V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# power_GND
+#
+DEF power_GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "power_GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/cad-files/pcbs/actuators-rev2/actuators-rev2-rescue.dcm b/cad-files/pcbs/actuators-rev2/actuators-rev2-rescue.dcm
@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library
diff --git a/cad-files/pcbs/actuators-rev2/actuators-rev2-rescue.lib b/cad-files/pcbs/actuators-rev2/actuators-rev2-rescue.lib
@@ -0,0 +1,79 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# OX40HAT-raspberrypi_hat
+#
+DEF OX40HAT-raspberrypi_hat J 0 40 Y Y 1 F N
+F0 "J" 350 100 50 H V C CNN
+F1 "OX40HAT-raspberrypi_hat" -300 100 50 H V C CNN
+F2 "Connector_PinSocket_2.54mm:PinSocket_2x20_P2.54mm_Vertical" 0 200 50 H I C CNN
+F3 "" -700 0 50 H V C CNN
+DRAW
+S -400 50 400 -1950 0 1 0 f
+X P3V3 1 -600 0 200 R 50 50 1 1 B
+X BCM15 10 600 -400 200 L 50 50 1 1 B
+X BCM17 11 -600 -500 200 R 50 50 1 1 B
+X BCM18 12 600 -500 200 L 50 50 1 1 B
+X BCM27 13 -600 -600 200 R 50 50 1 1 B
+X GND 14 600 -600 200 L 50 50 1 1 B
+X BCM22 15 -600 -700 200 R 50 50 1 1 B
+X BCM23 16 600 -700 200 L 50 50 1 1 B
+X P3V3 17 -600 -800 200 R 50 50 1 1 B
+X BCM24 18 600 -800 200 L 50 50 1 1 B
+X BCM10 19 -600 -900 200 R 50 50 1 1 B
+X P5V 2 600 0 200 L 50 50 1 1 B
+X GND 20 600 -900 200 L 50 50 1 1 B
+X BCM9 21 -600 -1000 200 R 50 50 1 1 B
+X BCM25 22 600 -1000 200 L 50 50 1 1 B
+X BCM11 23 -600 -1100 200 R 50 50 1 1 B
+X BCM8 24 600 -1100 200 L 50 50 1 1 B
+X GND 25 -600 -1200 200 R 50 50 1 1 B
+X BCM7 26 600 -1200 200 L 50 50 1 1 B
+X BCM0 27 -600 -1300 200 R 50 50 1 1 B
+X BCM1 28 600 -1300 200 L 50 50 1 1 B
+X BCM5 29 -600 -1400 200 R 50 50 1 1 B
+X BCM2 3 -600 -100 200 R 50 50 1 1 B
+X GND 30 600 -1400 200 L 50 50 1 1 B
+X BCM6 31 -600 -1500 200 R 50 50 1 1 B
+X BCM12 32 600 -1500 200 L 50 50 1 1 B
+X BCM13 33 -600 -1600 200 R 50 50 1 1 B
+X GND 34 600 -1600 200 L 50 50 1 1 B
+X BCM19 35 -600 -1700 200 R 50 50 1 1 B
+X BCM16 36 600 -1700 200 L 50 50 1 1 B
+X BCM26 37 -600 -1800 200 R 50 50 1 1 B
+X BCM20 38 600 -1800 200 L 50 50 1 1 B
+X GND 39 -600 -1900 200 R 50 50 1 1 B
+X P5V 4 600 -100 200 L 50 50 1 1 B
+X BCM21 40 600 -1900 200 L 50 50 1 1 B
+X BCM3 5 -600 -200 200 R 50 50 1 1 B
+X GND 6 600 -200 200 L 50 50 1 1 B
+X BCM4 7 -600 -300 200 R 50 50 1 1 B
+X BCM14 8 600 -300 200 L 50 50 1 1 B
+X GND 9 -600 -400 200 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# PDQ15-Q24-S5-D-PDQ15-Q24-S5-D
+#
+DEF PDQ15-Q24-S5-D-PDQ15-Q24-S5-D U 0 40 Y Y 1 L N
+F0 "U" -501 401 50 H V L BNN
+F1 "PDQ15-Q24-S5-D-PDQ15-Q24-S5-D" -501 -601 50 H V L BNN
+F2 "CONV_PDQ15-Q24-S5-D" 0 0 50 H I L BNN
+F3 "Manufacturer Recommendations" 0 0 50 H I L BNN
+F4 "1.0" 0 0 50 H I L BNN
+F5 "CUI Inc" 0 0 50 H I L BNN
+DRAW
+P 2 0 0 10 -500 -500 -500 400 N
+P 2 0 0 10 -500 400 500 400 N
+P 2 0 0 10 500 -500 -500 -500 N
+P 2 0 0 10 500 400 500 -500 N
+X +VIN 1 -700 200 200 R 40 40 0 0 I
+X -VIN 2 -700 100 200 R 40 40 0 0 I
+X +VOUT 3 700 200 200 L 40 40 0 0 O
+X TRIM 4 700 -300 200 L 40 40 0 0 P
+X -VOUT 5 700 100 200 L 40 40 0 0 O
+X REMOTE 6 -700 -100 200 R 40 40 0 0 I
+ENDDRAW
+ENDDEF
+#
+#End Library