Skip to content
Snippets Groups Projects
Commit 707e36dd authored by Ben Coombs's avatar Ben Coombs
Browse files

vent control panel is added using jQuery. Succesfully sends request/response... 

vent control panel is added using jQuery. Succesfully sends request/response to Arduino via Flask server
parent a522b4c9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app.py 0 → 100644
+ 43
− 0
View file @ 707e36dd
from flask import Flask, render_template, request, send_from_directory, jsonify
import serial;
import time;
app = Flask(__name__)
def serial_conn():
ser = serial.Serial('COM4', 112500, timeout=1)
print(ser.name)
ser.flushInput()
ser.write(b'A')
time.sleep(0.1)
#need to wait and read the bytes back properly
ser_bytes = ser.readline()
print(ser_bytes)
#s = ser_bytes.decode('utf-8')
s = "".join(map(chr, ser_bytes))
print(s)
return s
@app.route('/')
def render():
if 'rr' in request.args:
a = request.args.get('rr')
print("rr: " + a)
b = serial_conn()
resp = jsonify(success=b)
resp.status_code = 200
return resp
else:
return "Invalid args", 400
@app.after_request
def add_header(response):
response.headers['Access-Control-Allow-Origin'] = '*'
return response
if __name__=='__main__':
app.run(debug=True)
breath_plot.html
+ 62
− 117
View file @ 707e36dd
......@@ -30,7 +30,7 @@ Breath Plot: COVID-19 Respiration Analysis Software
<script src='./js/respiration_math.js'></script>
<title>Public Invention Respiration Analysis</title>
<title>Public Invention Respiration Analysis</title>
</head>
<style>
......@@ -77,9 +77,9 @@ justify-content: space-between;
background: red;
}
#control_area {
#control-area {
background:aliceblue;
padding:3em;
padding:1em;
margin-bottom: 1em;
}
......@@ -182,64 +182,16 @@ an interactive or static analysis of a respiration. It&#39;s primary purpose is
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" for="samples_to_plot">Number of Samples (~10s per 15000 samples):</span>
<span class="input-group-text" for="samples_to_plot">Number of Samples (~10s per 15000 samples):</span>
</div>
<input type="text" class="form-control" id="samples_to_plot" aria-describedby="samples_to_plot">
</div>
<!-- CONTROL PANEL START -->
<div class="container-fluid" id="control_area">
<div class="row" id="control-panel-hidden">
<button type="button" class="btn btn-primary">SHOW CONTROLS</button>
</div>
<div class="row" id="control-panel-expanded">
<div class="col-6">
<div class="control-wrapper row">
<label class="col-2" for="control-mode">Mode:</label>
<input class="col-9" type="range" id="control-mode" name="control-mode" min="0" max="2" value="0"/>
<label class="col-1" id="control-mode-val">PCV</label>
</div>
<div class="control-wrapper row">
<label class="col-2" for="control-rr">RR:</label>
<input class="col-9" type="range" id="control-rr" name="control-rr" min="1" max="10" value="8"/>
<label class="col-1" id="control-rr-val">8</label>
</div>
<div class="control-wrapper row">
<label class="col-2" for="control-ie">EI:</label>
<input class="col-9" type="range" id="control-ie" name="control-ie" min="1" max="4" step="0.1" value="3"/>
<label class="col-1" id="control-ie-val">3</label>
</div>
<div class="control-wrapper row">
<label class="col-2" for="control-pinsp">Pinsp:</label>
<input class="col-9" type="range" id="control-pinsp" name="control-pinsp" min="10" max="50" value="35"/>
<label class="col-1" id="control-pinsp-val">35</label>
</div>
<div class="control-wrapper row">
<label class="col-2" for="control-vinsp">Vinsp:</label>
<input class="col-9" type="range" id="control-vinsp" name="control-vinsp" min="200" max="800" step="50" value="500"/>
<label class="col-1" id="control-vinsp-val">500</label>
</div>
<div class="control-wrapper row">
<label class="col-2" for="control-peep">PEEP:</label>
<input class="col-9" type="range" id="control-peep" name="control-peep" min="0" max="15" value="5"/>
<label class="col-1" id="control-peep-val">5</label>
</div>
<button id="control_area_button" type="button" class="btn btn-primary">START</button>
</div>
<div class="col-6">
<div>
<b>Status:</b> no device connected
</div>
<div>
<b>Log:</b> some log info
</div>
</div>
<div class="container-fluid" id="control-area">
<div id="control-slot"><button type="button" class="btn btn-primary">SHOW CONTROLS</button></div>
</div>
</div>
<!-- CONTROL PANEL END -->
<!-- CONTROL PANEL END -->
<div>
<label for="livetoggle">Plot Live:</label>
<label class="switch">
......@@ -580,13 +532,6 @@ var RESPIRATION_RATE_WINDOW_SECONDS = 60;
var intervalID = null;
// CONTROL PANEL VARIABLES START
var controlsVisible = false;
// CONTROL PANEL VARIABLES END
// This sould be better as time, but is easier
// to do as number of samples.
var MAX_SAMPLES_TO_STORE_S = 16000;
......@@ -1472,66 +1417,66 @@ $( document ).ready(function() {
// CONTROL PANEL INIT START
$("#control_area_button").click(function(event) {
//alert('Starting ventilator (not really)');
// Send a command to a connected device via serial port
var rr = $("#control-rr").val();
console.log("rr: " + rr);
/*var lh = "http://localhost:8080";
alert('making ajax call');
$.ajax({url: lh+"/README.md",
success: function(verification) {
alert("verifcation"+verification);
$("#control-slot button").click(function() {
var lh = $("#dserverurl").val();
$.ajax({url: lh+"/vent.html",
success: function(result) {
//console.log("result "+ result);
$("#control-slot").html(result);
$("#control-start").click(function(event) {
// Send a command to a connected device via serial port
var rr = $("#control-rr").val();
console.log("rr: " + rr);
var lh = "http://localhost:5000";
$.ajax({url: lh+"?rr="+rr,
success: function(result) {
console.log("result: " + JSON.stringify(result));
},
error: function(xhr, ajaxOptions, thrownError) {
console.log("Error! " + xhr.status);
console.log(thrownError);
}
});
});
$("#control-mode").on("input", () => {
var m = $("#control-mode").val();
if (m === "0"){
$("#control-mode-val").html("PCV");
} else if (m === "1"){
$("#control-mode-val").html("VCV");
} else {
$("#control-mode-val").html("PSV");
}
});
$("#control-rr").on("input", () => {
$("#control-rr-val").html($("#control-rr").val());
});
$("#control-ie").on("input", () => {
$("#control-ie-val").html($("#control-ie").val());
});
$("#control-pinsp").on("input", () => {
$("#control-pinsp-val").html($("#control-pinsp").val());
});
$("#control-vinsp").on("input", () => {
$("#control-vinsp-val").html($("#control-vinsp").val());
});
$("#control-peep").on("input", () => {
$("#control-peep-val").html($("#control-peep").val());
});
},
error: function(xhr, ajaxOptions, thrownError) {
console.log("Error!" + xhr.status);
console.log("Error! " + xhr.status);
console.log(thrownError);
}
});*/
});
});
$("#control-panel-hidden button").click(()=> {
console.log("show panel");
if (controlsVisible){
$("#control-panel-expanded").hide();
controlsVisible = false;
} else {
$("#control-panel-expanded").show();
controlsVisible = true;
}
});
$("#control-panel-expanded").hide();
$("#control-mode").on("input", () => {
var m = $("#control-mode").val();
if (m === "0"){
$("#control-mode-val").html("PCV");
} else if (m === "1"){
$("#control-mode-val").html("VCV");
} else {
$("#control-mode-val").html("PSV");
}
});
$("#control-rr").on("input", () => {
$("#control-rr-val").html($("#control-rr").val());
});
$("#control-ie").on("input", () => {
$("#control-ie-val").html($("#control-ie").val());
});
$("#control-pinsp").on("input", () => {
$("#control-pinsp-val").html($("#control-pinsp").val());
});
$("#control-vinsp").on("input", () => {
$("#control-vinsp-val").html($("#control-vinsp").val());
});
$("#control-peep").on("input", () => {
$("#control-peep-val").html($("#control-peep").val());
});
// CONTROL PANEL INIT END
......
simple_serial.ino 0 → 100644
+ 16
− 0
View file @ 707e36dd
int incomingByte = 0; // for incoming serial data
void setup() {
Serial.begin(112500);
}
void loop() {
// put your main code here, to run repeatedly:
// reply only when you receive data:
if (Serial.available() > 0) {
// read the incoming byte:
incomingByte = Serial.read();
Serial.println(incomingByte, DEC);
}
}
vent.html 0 → 100644
+ 46
− 0
View file @ 707e36dd
<div class="row">
<div class="col-6">
<div class="control-wrapper row">
<label class="col-2" for="control-mode">Mode:</label>
<input class="col-9" type="range" id="control-mode" name="control-mode" min="0" max="2" value="0"/>
<label class="col-1" id="control-mode-val">PCV</label>
</div>
<div class="control-wrapper row">
<label class="col-2" for="control-rr">RR:</label>
<input class="col-9" type="range" id="control-rr" name="control-rr" min="1" max="10" value="8"/>
<label class="col-1" id="control-rr-val">8</label>
</div>
<div class="control-wrapper row">
<label class="col-2" for="control-ie">EI:</label>
<input class="col-9" type="range" id="control-ie" name="control-ie" min="1" max="4" step="0.1" value="3"/>
<label class="col-1" id="control-ie-val">3</label>
</div>
<div class="control-wrapper row">
<label class="col-2" for="control-pinsp">Pinsp:</label>
<input class="col-9" type="range" id="control-pinsp" name="control-pinsp" min="10" max="50" value="35"/>
<label class="col-1" id="control-pinsp-val">35</label>
</div>
<div class="control-wrapper row">
<label class="col-2" for="control-vinsp">Vinsp:</label>
<input class="col-9" type="range" id="control-vinsp" name="control-vinsp" min="200" max="800" step="50" value="500"/>
<label class="col-1" id="control-vinsp-val">500</label>
</div>
<div class="control-wrapper row">
<label class="col-2" for="control-peep">PEEP:</label>
<input class="col-9" type="range" id="control-peep" name="control-peep" min="0" max="15" value="5"/>
<label class="col-1" id="control-peep-val">5</label>
</div>
<button id="control-start" type="button" class="btn btn-primary">START</button>
</div>
<div class="col-6">
<div>
<b>Status:</b> no device connected
</div>
<div>
<b>Log:</b> some log info
</div>
</div>
</div>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment