remove all possibile hard links to 8080 port wip #79

previ · previ · commit 8e5beccf9613 · 2018-05-18T05:23:10.000Z
diff --git a/.gitignore b/.gitignore
@@ -63,3 +63,6 @@ static/blockly-tutorial
 .Trashes
 ehthumbs.db
 Thumbs.db
+
+# Swap files
+*.swp
diff --git a/.sudo.swp b/.sudo.swp
diff --git a/MPU6050.py b/MPU6050.py
@@ -6,7 +6,7 @@
 Copyright 2015
 """
 
-import smbus
+import smbus2 as smbus
 import time
 
 class MPU6050:
diff --git a/camera.py b/camera.py
@@ -47,7 +47,7 @@
 class Camera(object):
 
     _instance = None
-    _img_template = image.Image.load("coderdojo-logo.png")
+    _img_template = image.Image.load("static/media/coderdojo-logo.png")
 
     @classmethod
     def get_instance(cls):
diff --git a/main.py b/main.py
@@ -185,21 +185,6 @@ def video_stream(a_cam):
         yield frame
         yield "\r\n"
 
-@app.route("/video")
-def handle_video():
-    return """
-<html>
-<head>
-<style type=text/css>
-    body { background-image: url(/video/stream); background-repeat:no-repeat; background-position:center top; background-attachment:fixed; height:100% }
-</style>
-</head>
-<body>
-&nbsp;
-</body>
-</html>
-"""
-
 @app.route("/video/stream")
 def handle_video_stream():
     try:
@@ -211,25 +196,6 @@ def handle_video_stream():
     except:
         pass
 
-def video_stream_cv(a_cam):
-    while not app.shutdown_requested:
-        frame = a_cam.get_image_cv_jpeg()
-        yield ("--BOUNDARYSTRING\r\n" +
-               "Content-type: image/jpeg\r\n" +
-               "Content-Length: " + str(len(frame)) + "\r\n\r\n" +
-               frame + "\r\n")
-
-@app.route("/video/stream/cv")
-def handle_video_stream_cv():
-    try:
-        h = Headers()
-        h.add('Age', 0)
-        h.add('Cache-Control', 'no-cache, private')
-        h.add('Pragma', 'no-cache')
-        return Response(video_stream_cv(cam), headers=h, mimetype="multipart/x-mixed-replace; boundary=--BOUNDARYSTRING")
-    except:
-        pass
-
 @app.route("/photos", methods=["GET"])
 def handle_photos():
     logging.info("photos")
diff --git a/static/media/coderdojo-logo.png b/static/media/coderdojo-logo.png
