fix conflicts

.gitignore

@@ -1,2 +1,3 @@
 *.pyc
 *.avi
+*.dll

DataRecorder/get-garbage.py

@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+
+import ms5837py3 as ms5837
+import time
+import os
+
+sensor = ms5837.MS5837_30BA() # Default I2C bus is 1 (Raspberry Pi 3)
+
+f = open("/home/pi/Measurements/"+time.ctime()+".txt", 'w') 
+# We must initialize the sensor before reading it
+if not sensor.init():
+        f.write("Sensor could not be initialized")
+        exit(1)
+
+sensor.setFluidDensity(ms5837.DENSITY_SALTWATER)
+current = int(time.time())
+# Print readings
+while True:
+    next = int(time.time())
+    if next > current+5*60:         #use the decimal to indicate how many minutes you want
+        f = open("/home/pi/Measurements/"+time.ctime()+".txt", 'w')
+        current = next
+    if sensor.read():
+        f.write("%.1f,%.3f, %.2f, %.2f \n" % (                  # mbar, psi, C, F
+        sensor.depth(), # Default is mbar (no arguments)
+        sensor.pressure(ms5837.UNITS_psi), # Request psi
+        sensor.temperature(), # Default is degrees C (no arguments)
+        sensor.temperature(ms5837.UNITS_Farenheit))) # Request Farenheit
+        f.flush()
+        os.fsync(f)
+    else:
+        f.write("Sensor read failed!")
+        f.close()
+        exit(1)
+    time.sleep(5)
+
+

PCB/Pi Hat/Pi Hat-cache.lib

@@ -0,0 +1,256 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# Connector_Conn_01x04_Male
+#
+DEF Connector_Conn_01x04_Male J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "Connector_Conn_01x04_Male" 0 -300 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 34 -195 0 -205 1 1 6 F
+S 34 -95 0 -105 1 1 6 F
+S 34 5 0 -5 1 1 6 F
+S 34 105 0 95 1 1 6 F
+P 2 1 1 6 50 -200 34 -200 N
+P 2 1 1 6 50 -100 34 -100 N
+P 2 1 1 6 50 0 34 0 N
+P 2 1 1 6 50 100 34 100 N
+X Pin_1 1 200 100 150 L 50 50 1 1 P
+X Pin_2 2 200 0 150 L 50 50 1 1 P
+X Pin_3 3 200 -100 150 L 50 50 1 1 P
+X Pin_4 4 200 -200 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# 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_Generic_Conn_02x02_Odd_Even
+#
+DEF Connector_Generic_Conn_02x02_Odd_Even J 0 40 Y N 1 F N
+F0 "J" 50 100 50 H V C CNN
+F1 "Connector_Generic_Conn_02x02_Odd_Even" 50 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_2x??_*
+$ENDFPLIST
+DRAW
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 50 150 -150 1 1 10 f
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
+X Pin_2 2 300 0 150 L 50 50 1 1 P
+X Pin_3 3 -200 -100 150 R 50 50 1 1 P
+X Pin_4 4 300 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_R
+#
+DEF Device_R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "Device_R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ R_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Pi-Hat-rescue_CAT24C32-raspberrypi_hat
+#
+DEF Pi-Hat-rescue_CAT24C32-raspberrypi_hat U 0 30 Y Y 1 F N
+F0 "U" -350 350 50 H V C CNN
+F1 "Pi-Hat-rescue_CAT24C32-raspberrypi_hat" 250 350 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ SOIC-8
+$ENDFPLIST
+DRAW
+S -400 -300 400 300 1 1 10 f
+X GND 4 0 -400 100 U 50 50 0 0 W
+X VCC 8 0 400 100 D 50 50 0 0 W
+X A0 1 -500 200 100 R 50 50 1 1 I
+X A1 2 -500 100 100 R 50 50 1 1 I
+X A2 3 -500 0 100 R 50 50 1 1 I
+X SDA 5 500 -200 100 L 50 50 1 1 B
+X SCL 6 500 -100 100 L 50 50 1 1 I
+X WP 7 -500 -200 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Pi-Hat-rescue_DMG2305UX-raspberrypi_hat
+#
+DEF Pi-Hat-rescue_DMG2305UX-raspberrypi_hat Q 0 0 N Y 1 F N
+F0 "Q" -100 150 50 H V R CNN
+F1 "Pi-Hat-rescue_DMG2305UX-raspberrypi_hat" 500 150 50 H V R CNN
+F2 "" 200 195 50 H V C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ SOT-23
+$ENDFPLIST
+DRAW
+C 0 0 128 0 1 10 f
+C 1 -80 6 0 1 0 F
+C 1 100 7 0 1 0 F
+P 2 0 1 10 -100 0 -90 0 N
+P 2 0 1 0 -70 -60 0 -60 N
+P 2 0 1 0 -70 -40 -70 -80 N
+P 2 0 1 0 -70 0 0 0 N
+P 2 0 1 0 -70 20 -70 -20 N
+P 2 0 1 0 -70 55 0 55 N
+P 2 0 1 0 -70 75 -70 35 N
+P 2 0 1 0 0 -80 0 -115 N
+P 2 0 1 0 0 -70 0 0 N
+P 2 0 1 0 0 -50 0 -80 N
+P 2 0 1 0 0 60 0 110 N
+P 2 0 1 0 0 85 0 55 N
+P 2 0 1 0 35 -21 66 -20 N
+P 4 0 1 10 -90 70 -90 -75 -90 -55 -90 -65 N
+P 4 0 1 0 -15 0 -55 15 -55 -15 -15 0 F
+P 4 0 1 0 50 -18 39 6 60 6 49 -18 F
+P 5 0 1 0 0 100 50 100 50 20 50 -80 0 -80 N
+X G 1 -250 0 150 R 50 50 1 1 I
+X S 2 0 -250 150 U 50 50 1 1 P
+X D 3 0 250 150 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Pi-Hat-rescue_DMMT5401-raspberrypi_hat
+#
+DEF Pi-Hat-rescue_DMMT5401-raspberrypi_hat Q 0 0 Y Y 2 F N
+F0 "Q" 200 75 50 H V L CNN
+F1 "Pi-Hat-rescue_DMMT5401-raspberrypi_hat" 200 0 50 H V L CNN
+F2 "SOT-26" 200 -75 50 H V L CIN
+F3 "" 0 0 50 H V L CNN
+$FPLIST
+ SOT-26
+$ENDFPLIST
+DRAW
+C 50 0 111 0 1 10 f
+P 2 0 1 0 0 0 25 0 N
+P 2 0 1 0 100 -100 25 -25 N
+P 2 0 1 0 100 100 25 25 N
+P 3 0 1 20 25 75 25 -75 25 -75 F
+P 5 0 1 0 55 -75 75 -55 35 -35 55 -75 55 -75 F
+X C 1 100 200 100 D 50 50 1 1 P
+X B 2 -200 0 200 R 50 50 1 1 I
+X E 6 100 -200 100 U 50 50 1 1 P
+X B 3 -200 0 200 R 50 50 2 1 I
+X C 4 100 200 100 D 50 50 2 1 P
+X E 5 100 -200 100 U 50 50 2 1 P
+ENDDRAW
+ENDDEF
+#
+# Pi-Hat-rescue_Mounting_Hole-Mechanical
+#
+DEF Pi-Hat-rescue_Mounting_Hole-Mechanical MK 0 40 Y Y 1 F N
+F0 "MK" 0 200 50 H V C CNN
+F1 "Pi-Hat-rescue_Mounting_Hole-Mechanical" 0 125 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Mounting?Hole*
+ Hole*
+$ENDFPLIST
+DRAW
+C 0 0 50 0 1 50 N
+ENDDRAW
+ENDDEF
+#
+# Pi-Hat-rescue_OX40HAT-raspberrypi_hat
+#
+DEF Pi-Hat-rescue_OX40HAT-raspberrypi_hat J 0 40 Y Y 1 F N
+F0 "J" 350 100 50 H V C CNN
+F1 "Pi-Hat-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 N
+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
+#
+# 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

PCB/Pi Hat/Pi Hat-rescue.dcm

@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library