simplifying a lot of shit

2019-03-26 19:05:42 +01:00
parent 9677273f55
commit 548337258f
4 changed files with 53 additions and 1 deletions
@@ -73,7 +73,7 @@ class Spectrometer:
        self.baudrate = baudrate
        self.timeout = 1
        try:
-            self.serialObject = ser.Serial(path, baudrate, timeout=tout)
+            self.serialObject =
        except:
            raise Exception('An exception occured when opening the serial port at {}'.format(path))
            ex(1)
@@ -0,0 +1,6 @@
+from flask import Flask
+app = Flask(__name__)
+
+@app.route('/<txt>')
+def root(txt):
+  return 'txt={}'.format(txt)
@@ -0,0 +1,46 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+    <!-- Bootstrap CSS -->
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+
+    <title>Spektrometer
+    </title>
+  </head>
+  <body>
+    <h1><div class="p-3 mb-2 bg-primary text-white">Spektrometer</div></h1>
+    
+    <div>
+            <button type="button" class="btn btn-dark btn-lg btn-block">Pridobi rezultate
+    </div>
+
+	
+	<div id={{ chartID|safe }} class="chart" style="height: 100px; width: 500px"></div>
+    <script>
+	    var chart_id = {{ chartID|safe }}
+	    var series = {{ series|safe }}
+	    var title = {{ title|safe }}
+	    var xAxis = {{ xAxis|safe }}
+	    var yAxis = {{ yAxis|safe }}
+	    var chart = {{ chart|safe }}
+    </script>
+	
+    <!-- Optional JavaScript -->
+    <!-- jQuery first, then Popper.js, then Bootstrap JS -->
+	<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+	<script src="http://code.highcharts.com/highcharts.js"></script>
+	<script src="../static/graph.js"></script>
+
+  </body>
+  
+
+
+<script type = "text/javascript" src = "/static/bootstrap.min.js"></script>
+
+</html>