Merge pull request #3 from PolygonalTree/master

Pull request to merge pySolo-VIdeo-RpiMod with PySolo-Video

Author: ggilestro

accessories/DesktopApp/receive_stream.py

@@ -36,7 +36,9 @@ def open_with_socket():
     # Connect a client socket to my_server:8000 (change my_server to the
     # hostname of your server)
     client_socket = socket.socket()
+
     client_socket.connect(('192.168.1.201', 8000))
+
     connection = client_socket.makefile('rb')
 
     try:

accessories/__init__.pyc

@@ -0,0 +1 @@
+{"referencePoints": "none", "pointsToTrack": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], "serial": "NO_SERIAL", "ROIS": [[[16, 52], [16, 452], [790, 452], [790, 52]], [[16, 52], [16, 78], [403, 78], [403, 52]], [[16, 78], [16, 104], [403, 104], [403, 78]], [[16, 102], [16, 128], [403, 128], [403, 102]], [[16, 128], [16, 153], [403, 153], [403, 128]], [[16, 153], [16, 179], [403, 179], [403, 153]], [[16, 177], [16, 203], [403, 203], [403, 177]], [[16, 203], [16, 228], [403, 228], [403, 203]], [[16, 227], [16, 252], [403, 252], [403, 227]], [[16, 252], [16, 278], [403, 278], [403, 252]], [[16, 278], [16, 304], [403, 304], [403, 278]], [[16, 302], [16, 328], [403, 328], [403, 302]], [[16, 328], [16, 353], [403, 353], [403, 328]], [[16, 353], [16, 379], [403, 379], [403, 353]], [[16, 377], [16, 403], [403, 403], [403, 377]], [[16, 403], [16, 428], [403, 428], [403, 403]], [[16, 427], [16, 452], [403, 452], [403, 427]], [[403, 52], [403, 78], [790, 78], [790, 52]], [[403, 78], [403, 104], [790, 104], [790, 78]], [[403, 102], [403, 128], [790, 128], [790, 102]], [[403, 128], [403, 153], [790, 153], [790, 128]], [[403, 153], [403, 179], [790, 179], [790, 153]], [[403, 177], [403, 203], [790, 203], [790, 177]], [[403, 203], [403, 228], [790, 228], [790, 203]], [[403, 227], [403, 252], [790, 252], [790, 227]], [[403, 252], [403, 278], [790, 278], [790, 252]], [[403, 278], [403, 304], [790, 304], [790, 278]], [[403, 302], [403, 328], [790, 328], [790, 302]], [[403, 328], [403, 353], [790, 353], [790, 328]], [[403, 353], [403, 379], [790, 379], [790, 353]], [[403, 377], [403, 403], [790, 403], [790, 377]], [[403, 403], [403, 428], [790, 428], [790, 403]], [[403, 427], [403, 452], [790, 452], [790, 427]]]}

accessories/sleepdeprivator/__init__.pyc

@@ -0,0 +1,22 @@
+[Folders]
+data_folder = .
+mask_folder = .
+
+[Recording]
+fps_recording = 15
+fps_preview = 5
+resolution = 1280, 720
+
+[General]
+webcams = 1
+monitors = 1
+
+[Monitor1]
+source = 1
+track = 0
+mask_file = 
+track_type = XY_COORDS
+serial_port = NO SD
+inactivity_threshold = 7
+outputfile = 
+

accessories/sleepdeprivator/damrealtime.pyc

@@ -21,7 +21,7 @@
 #       MA 02110-1301, USA.
 #       
 #     
-"""Version 1.3
+"""Version 1.4
 
 Each Monitor has a camera that can be: realCam || VirtualCamMovies || VirtualCamFrames
 The class Monitor is handling the motion detection and data processing while the class Cam only handles
@@ -191,13 +191,23 @@ def startNetworkStream(self, port=8000):
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         self.socket.bind(('', port))
+<<<<<<< HEAD
+        print ("Live stream socket listening on port {p}...".format(p=port))
+=======
         print "Live stream socket listening on port {p}...".format(p=port)
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
         self.pipe = None
 
         self.socket.listen(5)
 
         self.socket_thread_1 = threading.Thread(target=self.socket_listen)
+<<<<<<< HEAD
+        self.socket_thread_1.daemon=True
         self.socket_thread_2 = threading.Thread(target=self.socket_stream)
+        self.socket_thread_2.daemon=True
+=======
+        self.socket_thread_2 = threading.Thread(target=self.socket_stream)
+>>>>>>> 2c18142d99048230a47ad507b4237c753bbd75ed
         self.keepSocket = True
 
         self.socket_thread_1.start()

accessories/sleepdeprivator/sleepdeprivator.pyc

@@ -0,0 +1,5 @@
+from subprocess import call
+
+call(["ps axf | grep server.py | grep -v grep | awk '{print \"kill -2 \" $1}' | sh"],shell=True)
+
+call(["python2 server.py"],shell=True)