Commit 5a54cb60 authored by Your Name's avatar Your Name

corrected calculation of pressure sensor

parent a9fa956e
......@@ -9,4 +9,5 @@ __pycache__
*.hex
*.code-workspace
*.sqlite
*.csv
raspberry-dataserver/foo
......@@ -959,43 +959,17 @@ float BreathingLoop::calculateFlow(const uint32_t &current_time, const float &pr
float BreathingLoop::getFlow(){
const float temperature = 298.0;
const float pressure = 1030.0;
float mbarToPa = 100.0;
float dp_raw = mbarToPa*_readings_avgs.pressure_diff_patient;
//float dp_raw = adcToMillibarDPFloat((_readings_sums.pressure_diff_patient / _readings_N),_calib_avgs.pressure_diff_patient) ;
float l2nl = (temperature *1013.25)/(pressure * 273.15 ) ;
float dp_raw = _readings_avgs.pressure_diff_patient;
float flowtmp;
/*
if (dp_raw > 0) {
dp = 43.046 * dp_raw;
} else {
dp = 39.047 * dp_raw;
}
*/
// dp_raw in mbar
//
float fudge_factor1 = 1.15; // we scale to test chest
//if(fabs(dp_raw) < 1.0){ //kh - if dp is close to zero - draw a line to zero
//if (dp_raw > 0) {
//flowtmp = (43.046+71.576) * dp_raw;
//} else {
//flowtmp = (fudge_factor1*39.047+60.471) * dp_raw;
//}
//} else if (dp_raw > 0) {
//if (dp_raw > 0) {
// flowtmp = 43.046 * dp_raw + 71.576;
//} else {
// flowtmp = 39.047 * dp_raw - 60.471; // these are in L/h
// //flowtmp = fudge_factor1 * 39.047 * dp_raw - 60.471; // these are in L/h
//}
flowtmp = 40 * dp_raw; // these are in L/h
//_flow = flowtmp * temperature *1013.25 * 1000 / (pressure * 273.15 * 3600); // ml/s
//
float fudge_factor2 = 1.0; //0.75; // global factor
_flow = fudge_factor2 * flowtmp * temperature *1013.25 / (pressure * 273.15 * 60); // now expressed in l/min
//_flow = dp_raw ;//* temperature *1013.25 / (pressure * 273.15 * 60); // now expressed in l/min
//return flow; // NL/h
flowtmp = pow(dp_raw,3)*0.1512-3.3422*pow(dp_raw,2)+dp_raw*41.657; // this is in slm (standard liter per minute)
_flow = flowtmp * l2nl; // now expressed in l/min
if (_calibrated == true){
return _flow;
}
......
......@@ -222,20 +222,23 @@ float adcToMillibarDPFloat(float adc, float offset)
// https://docs.rs-online.com/7d77/0900766b81568899.pdf
float PCB_Gain = 2. ; // real voltage is two times higher thant the measured in the PCB (there is a voltage divider)
float ADC_to_Voltage_Gain = 3300./4096.0 ; // maximum Voltage of 3.3V for 4096 ADC counts - (It might need recalibration?)
float ADC_to_mVoltage_Gain = 3300./4096.0 ; // maximum Voltage of 3.3V for 4096 ADC counts - (It might need recalibration?)
float zeroDPvoltageInADC = (2500./PCB_Gain)*(1./ADC_to_Voltage_Gain);
float zeroDPmvoltageInADC = (2500./PCB_Gain)*(1./ADC_to_mVoltage_Gain);
float _voltage = PCB_Gain * ADC_to_Voltage_Gain * (adc - offset + zeroDPvoltageInADC);
float _voltage = PCB_Gain * ADC_to_mVoltage_Gain * (adc);// - offset + zeroDPmvoltageInADC);
float PaTombar = 0.01;
float AoutVdd = _voltage/5000.; // The board provides 5000 mV to the input of the DP sensor
//float AoutVdd = _voltage/5000.; // The board provides 5000 mV to the input of the DP sensor
float AoutVdd = _voltage/(2*PCB_Gain*ADC_to_mVoltage_Gain*offset); // The board provides 5000 mV to the input of the DP sensor
float sign = 2*((AoutVdd-0.5 > 0.)-0.5);
float dp_mbar = PaTombar * sign * pow(((AoutVdd/0.4)-1.25), 2)*525; // same calculation as in the Labview Code
//String s = " dp "+String(dp_mbar)+ " off "+String(offset)+" zero "+String(zeroDPmvoltageInADC) +" adc " + String(adc);
//logMsg(s);
return static_cast<float>(dp_mbar);
}
......
#!/usr/bin/env python3
# © Copyright CERN, Riga Technical University and University of Liverpool 2020.
# All rights not expressly granted are reserved.
#
# This file is part of hev-sw.
#
# hev-sw is free software: you can redistribute it and/or modify it under
# the terms of the GNU General Public Licence as published by the Free
# Software Foundation, either version 3 of the Licence, or (at your option)
# any later version.
#
# hev-sw is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public Licence
# for more details.
#
# You should have received a copy of the GNU General Public License along
# with hev-sw. If not, see <http://www.gnu.org/licenses/>.
#
# The authors would like to acknowledge the much appreciated support
# of all those involved with the High Energy Ventilator project
# (https://hev.web.cern.ch/).
# Python monitoring code
# USAGE: python3 app.py
#
# Last update: May 5, 2020
import time
import sqlite3
import argparse
from hevclient import HEVClient
from CommsCommon import DataFormat, CycleFormat, ReadbackFormat, AlarmFormat, TargetFormat, BatteryFormat, PersonalFormat, LogMsgFormat
from datetime import datetime
import logging
logging.basicConfig(level=logging.WARNING, format='%(asctime)s - %(levelname)s - %(message)s')
import io
import csv
import sys
import argparse
import sqlite3
from datetime import datetime
import threading
#SQLITE_FILE = 'database/HEV_monitoringDB.sqlite' # name of the sqlite database file
#SQLITE_FILE = 'hev::memory:?cache=shared'
#SQLITE_FILE = 'file:hev?mode=memory&cache=shared'
SQLITE_FILE = '/dev/shm/HEV_monitoringDB.sqlite' # use the linux shared memory pool as a file system
MASTER_TABLE_NAME = 'hev_monitor' # this table keeps track of the data we get through keys to other tables
DATA_TABLE_NAME = 'hev_monitor_data' # name of the table to be created for payload type data
CYCLE_TABLE_NAME = 'hev_monitor_cycle' # name of the table to be created for payload type cycle
TARGET_TABLE_NAME = 'hev_monitor_target' # name of the table to be created for payload type target
READBACK_TABLE_NAME = 'hev_monitor_readback' # name of the table to be created for payload type readback
ALARM_TABLE_NAME = 'hev_monitor_alarm' # name of the table to be created for payload type readback
PERSONAL_TABLE_NAME = 'hev_personal_target' # name of the table to be created for payload type personal
LOGMSG_TABLE_NAME = 'hev_monitor_logmsg' # name of the table to be created for payload type personal
def getList(dict):
return [*dict]
payload_types = {
#'DATA' : {'table_name' : DATA_TABLE_NAME, 'format' : DataFormat().getDict(), 'id' : 'DataID'},
'LOGMSG' : { 'table_name' : LOGMSG_TABLE_NAME, 'format' : LogMsgFormat().getDict(), 'id' : 'LogMsgID' },
#'PERSONAL' : { 'table_name' : PERSONAL_TABLE_NAME, 'format' : PersonalFormat().getDict(), 'id' : 'PersonalID' },
}
class LogClient(HEVClient):
def __init__(self):
self.timestr = time.strftime("%Y%m%d-%H%M%S")
super().__init__(polling=True)
def start_client(self):
"""runs in other thread - works as long as super goes last and nothing
else is blocking. If something more than a one-shot process is needed
then use async"""
# call for all the targets and personal details
# when starting the web app so we always have some in the db
super().start_client()
def get_updates(self, payload):
"""callback from the polling function, payload is data from socket"""
self.monitoring(payload)
def monitoring(self, payload):
epoch = datetime(1970, 1, 1)
current_time = datetime.now()
# Computing the time in seconds since the epoch because easier to manipulate.
timestamp = (current_time -epoch).total_seconds() * 1000
try:
if payload != None and payload['type'] == "LOGMSG" :
add_to_existing = False
payload_type = payload['type']
data_packet = { el : payload[payload_type][el] for el in payload_types[payload_type]['format']}
row = [payload_type]+[val for val in payload[payload_type].values()]
print(row[4])
except KeyboardInterrupt:
sys.exit(0)
# Instantiating the client
client = LogClient()
if __name__ == '__main__':
try:
client.start_client()
except KeyboardInterrupt:
sys.exit(0)
......@@ -63,10 +63,10 @@ class Dependant(object):
#if payload.getType() == PAYLOAD_TYPE.ALARM.value:
# logging.info(f"Alarm: {payload.alarm_code} of priority: {payload.alarm_type}")
if payload.getType() == PAYLOAD_TYPE.DATA.value:
#if payload.getType() == PAYLOAD_TYPE.DATA.value:
#logging.info(f"payload received: {payload}")
#logging.info(f"payload received: {payload.pressure_o2_regulated}")
logging.info(f"payload received: {payload.timestamp} p {payload.pressure_patient:3.2f} dp {payload.pressure_diff_patient:3.3f} f {payload.flow:3.3f} base {payload.volume:3.3f} d {payload.flow - payload.volume:3.3f} {payload.fsm_state}")
#logging.info(f"payload received: {payload.timestamp} p {payload.pressure_patient:3.2f} dp {payload.pressure_diff_patient:3.3f} f {payload.flow:3.3f} base {payload.volume:3.3f} d {payload.flow - payload.volume:3.3f} {payload.fsm_state}")
#logging.info(f"Fsm state: {payload.fsm_state}")
#fsm = payload.fsm_state
#if payload.getType() == PAYLOAD_TYPE.IVT.value:
......@@ -84,8 +84,8 @@ class Dependant(object):
# logging.info(f" PID {payload.kp:3.6f} {payload.ki:3.6f} {payload.kd:3.6f} {payload.proportional:3.6f} {payload.integral:3.6f} {payload.derivative:3.6f} {payload.valve_duty_cycle:3.6f} {payload.target_pressure:3.6f} {payload.process_pressure:3.6f} fsm {fsm}")
#if payload.getType() == PAYLOAD_TYPE.PERSONAL.value:
# logging.info(f"payload received: {payload} ")
#if payload.getType() == PAYLOAD_TYPE.LOGMSG.value:
# logging.info(f"LOGMSG {payload.timestamp}:{payload.message} {fsm}")
if payload.getType() == PAYLOAD_TYPE.LOGMSG.value:
logging.info(f"LOGMSG {payload.timestamp}:{payload.message} {fsm}")
#if payload.getType() == PAYLOAD_TYPE.TARGET.value:
# logging.info(f"TARGET {payload} {fsm}")
#if payload.getType() == PAYLOAD_TYPE.CMD.value:
......
......@@ -54,6 +54,7 @@ class HEVClient(object):
self._readback = None # db for sensor values
self._cycle = None # db for sensor values
self._target = None # db for sensor values
self._logmsg = None # db for sensor values
self._thresholds = None # db for sensor values
self._thresholds = [] # db for threshold settings
self._polling = polling # keep reading data into db
......@@ -119,6 +120,9 @@ class HEVClient(object):
elif payload["type"] == "PERSONAL":
with self._lock:
self._personal = payload["PERSONAL"]
elif payload["type"] == "LOGMSG":
with self._lock:
self._logmsg = payload["LOGMSG"]
elif payload["type"] == "THRESHOLDS":
with self._lock:
self._thresholds = payload["THRESHOLDS"]
......@@ -238,6 +242,10 @@ class HEVClient(object):
# get personal data from db
return self._personal
def get_logmsg(self) -> Dict:
# get logmsg data from db
return self._logmsg
def get_target(self) -> Dict:
# get target data from db
return self._target
......
......@@ -89,6 +89,7 @@ class HEVServer(object):
PAYLOAD_TYPE.ALARM,
PAYLOAD_TYPE.DEBUG,
PAYLOAD_TYPE.IVT,
#PAYLOAD_TYPE.LOGMSG,
PAYLOAD_TYPE.PERSONAL,
PAYLOAD_TYPE.CMD
]
......@@ -163,6 +164,9 @@ class HEVServer(object):
elif reqtype == "CYCLE":
# ignore for the minute
pass
#elif reqtype == "LOGSMG":
# # ignore for the minute
# pass
elif reqtype == "TARGET":
# ignore for the minute
pass
......
......@@ -175,5 +175,3 @@
{'version': 0, 'timestamp': 0, 'payload_type': 'BATTERY', 'bat': 0, 'ok': 1, 'alarm': 0, 'rdy2buf': 1, 'bat85': 1, 'prob_elec': 0, 'dummy': False}
{'version': 0, 'timestamp': 0, 'payload_type': 'BATTERY', 'bat': 0, 'ok': 1, 'alarm': 0, 'rdy2buf': 1, 'bat85': 1, 'prob_elec': 0, 'dummy': False}
{'version': 0, 'timestamp': 0, 'payload_type': 'BATTERY', 'bat': 0, 'ok': 1, 'alarm': 0, 'rdy2buf': 1, 'bat85': 1, 'prob_elec': 0, 'dummy': False}
{'version': 0, 'timestamp': 0, 'payload_type': 'BATTERY', 'bat': 0, 'ok': 1, 'alarm': 0, 'rdy2buf': 1, 'bat85': 1, 'prob_elec': 0, 'dummy': False}
{'version': 0, 'timestamp': 0, 'payload_type': 'BATTERY', 'bat': 0, 'ok': 1, 'alarm': 0, 'rdy2buf': 1, 'bat85': 1, 'prob_elec': 0, 'dummy': False}
Markdown is supported
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