chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Calcs.cpp - calculation of TV and MV now uses a rolling average

Browse Source 
Only a few loaders are affected by this, notably SleepStyle but not ResMed
A rolling average calculation makes calculated values resemble CPAP values more closely
This commit is contained in:
Guy Scharf 2021-07-08 10:28:53 -07:00
parent 492254b580
commit 2ab4e7bbe2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
oscar/SleepLib/calcs.cpp
View File

@ -480,6 +480,7 @@ void FlowParser::calc(bool calcResp, bool calcTv, bool calcTi, bool calcTe, bool
quint32 *tv_tptr = nullptr;
EventStoreType *tv_dptr = nullptr;
int tv_count = 0;
double tvlast, tvlast2, tvlast3;
if (calcTv) {
TV = m_session->AddEventList(CPAP_TidalVolume, EVL_Event);
@ -598,8 +599,15 @@ void FlowParser::calc(bool calcResp, bool calcTv, bool calcTi, bool calcTe, bool
//double x=sqrt(q)*2;
//val2=x;
if (tv < mintv) { mintv = tv; }
// Average TV over last three data points
if (tv_count == 0)
tvlast = tvlast2 = tvlast3 = tv;
tv = (tvlast + tvlast2 + tvlast3 + tv*2)/5;
tvlast3 = tvlast2;
tvlast2 = tvlast;
tvlast = tv;
if (tv < mintv) { mintv = tv; }
if (tv > maxtv) { maxtv = tv; }
*tv_tptr++ = timeval;
@ -889,8 +897,9 @@ void calcRespRate(Session *session, FlowParser *flowparser)
bool calcTe = !session->eventlist.contains(CPAP_Te);
bool calcMv = !session->eventlist.contains(CPAP_MinuteVent);
int z = (calcResp ? 1 : 0) + (calcTv ? 1 : 0) + (calcMv ? 1 : 0);
// Force calculation for testing calculation vs CPAP data
// z = 1;
// If any of these three missing, remove all, and switch all on
if (z > 0 && z < 3) {