diff --git a/raspberry-backend/app.py b/raspberry-backend/app.py
index 32a5fbf60f26154471049ece79e29ece4b09ee8a..40fb1a40354057b0bc7826ab83e285352418f5b5 100755
--- a/raspberry-backend/app.py
+++ b/raspberry-backend/app.py
@@ -44,6 +44,16 @@ def fan():
def multiple_appends(listname, *element):
listname.extend(element)
+@WEBAPP.route('/')
+def send_cmd():
+ """
+ Send command to the data server
+ """
+ if form.validate_on_submit():
+ if 'download' in request.form:
+ print("benzina") # do something
+ elif 'watch' in request.form:
+ pass # do something else
@WEBAPP.route('/data_handler', methods=['POST'])
def data_handler():
diff --git a/raspberry-backend/arduino_recorder.py b/raspberry-backend/arduino_recorder.py
index a06092e113a5d6b407803fcf3d6be16ed30788e9..93882a35bb5253d8c6f906f32058e5f659a5e650 100755
--- a/raspberry-backend/arduino_recorder.py
+++ b/raspberry-backend/arduino_recorder.py
@@ -79,7 +79,7 @@ def monitoring(source_address):
# Instantiating the client
hevclient = HEVClient()
- hevclient.set_thresholds([12.3, 45.6, 78.9])
+ #print(hevclient.send_cmd("CMD_START"))
epoch = datetime(1970, 1, 1)
diff --git a/raspberry-backend/database/HEC_monitoringDB.sqlite b/raspberry-backend/database/HEC_monitoringDB.sqlite
deleted file mode 100644
index 77fe83b7c103ea5338c202b9d364384c03714356..0000000000000000000000000000000000000000
Binary files a/raspberry-backend/database/HEC_monitoringDB.sqlite and /dev/null differ
diff --git a/raspberry-backend/database/HEC_monitoringDB_backup.sqlite b/raspberry-backend/database/HEC_monitoringDB_backup.sqlite
deleted file mode 100644
index e3b3082cf34efb95dd34434e8d544c26a5142b77..0000000000000000000000000000000000000000
Binary files a/raspberry-backend/database/HEC_monitoringDB_backup.sqlite and /dev/null differ
diff --git a/raspberry-backend/templates/base.html b/raspberry-backend/templates/base.html
index 6041f7c77eb7049feb612e1808c90c6161a8fca5..a9ecfdd4d07dc0431801448f5c2fb4f4e29bb0d4 100644
--- a/raspberry-backend/templates/base.html
+++ b/raspberry-backend/templates/base.html
@@ -53,7 +53,7 @@
</div>
<div class = "controls py-1 ml-auto mr-auto">
<a> <button class="sb-nav-button py-3 mb-1">STOP</button></a>
- <a> <button class="sb-nav-button py-1 mb-1">START</button></a>
+ <a> <input type="submit" name="download" value="START" class="sb-nav-button py-1 mb-1"></input></a>
<a> <button class="sb-nav-button py-1 mb-1">RESET</button></a>
</div>
</div>
@@ -97,12 +97,13 @@
function update_variables() {
$.getJSON("live-data",
function (data) {
- document.getElementById("pressure").innerHTML = data.pressure;
+ //document.getElementById("pressure").innerHTML = data.pressure;
document.getElementById("temperature").innerHTML = data.temperature;
document.getElementById("pressure_buffer").innerHTML = data.pressure_buffer;
document.getElementById("pressure_inhale").innerHTML = data.pressure_inhale;
document.getElementById("temperature_buffer").innerHTML = data.temperature_buffer;
document.getElementById("pressure_o2_regulated").innerHTML = data.pressure_o2_regulated;
+ document.getElementById("fsm_state").innerHTML = data.fsm_state;
}
);
}
diff --git a/raspberry-backend/templates/index.html b/raspberry-backend/templates/index.html
index bd514600806ff0f67fa2fc61ef2aca721f35682d..f1e57d38fec53c7bb9b77277e010b271410e2e85 100644
--- a/raspberry-backend/templates/index.html
+++ b/raspberry-backend/templates/index.html
@@ -16,7 +16,8 @@
<option value='pressure' selected>pressure</option>
<option value='pressure_buffer' selected>pressure_buffer</option>
<option value='pressure_inhale' selected>pressure_inhale</option>
- <option value='variable5' selected>variable5</option>
+ <option value='temperature_buffer' selected>temperature_buffer</option>
+ <option value='pressure_o2_regulated' selected>pressure_o2_regulated</option>
<input class="form-button py-0" type="button" value="Submit" onclick="updateChartType()" style="background-color: #1f4793 ; color: white">
</select>
@@ -45,9 +46,9 @@
<div class="col-xl-4 px-1 py-0 mr-0">
<div class="card bg-primary text-dark mb-2">
<div class="card-header d-flex align-items-center justify-content-between py-1">
- <a class="small text-dark stretched-link" href="#">Pressure</a>
+ <a class="small text-dark stretched-link" href="#">fsm_state</a>
</div>
- <div class="card-body px-1 py-3"><span class = "reading-main" id = "pressure">000.00</span> Pa</div>
+ <div class="card-body px-1 py-3"><span class = "reading-main" id = "fsm_state">000.00</span> </div>
</div>
</div>
@@ -73,7 +74,7 @@
<div class="col-xl-4 col-md-8 px-1 py-0">
<div class="card bg-primary text-dark mb-2">
<div class="card-header d-flex align-items-center justify-content-between py-1">
- <a class="small text-dark stretched-link" href="#">variable5</a>
+ <a class="small text-dark stretched-link" href="#">temperature_buffer</a>
</div>
<div class="card-body px-1 py-3"><span class = "reading-main" id = "temperature_buffer">000.00</span> ℃</div>
</div>
@@ -81,7 +82,7 @@
<div class="col-xl-4 px-1 py-0 col-md-8">
<div class="card bg-primary text-dark mb-2">
<div class="card-header d-flex align-items-center justify-content-between py-1">
- <a class="small text-dark stretched-link" href="#">variable6</a>
+ <a class="small text-dark stretched-link" href="#">pressure_o2_regulated</a>
</div>
<div class="card-body px-1 py-3"><span class = "reading-main" id = "pressure_o2_regulated">000.00</span> Pa</div>
</div>