Index: sources/drydemo/StateControllerTreatmentBroadcasts.cpp =================================================================== diff -u -r38521851fd3271aa9a8965067d15daaba0db4b2e -rb13dd2b30889640ebf03f54414f536ca5c8d2dc7 --- sources/drydemo/StateControllerTreatmentBroadcasts.cpp (.../StateControllerTreatmentBroadcasts.cpp) (revision 38521851fd3271aa9a8965067d15daaba0db4b2e) +++ sources/drydemo/StateControllerTreatmentBroadcasts.cpp (.../StateControllerTreatmentBroadcasts.cpp) (revision b13dd2b30889640ebf03f54414f536ca5c8d2dc7) @@ -80,26 +80,26 @@ { static quint32 broadcastCounter = 10; // Arterial calculations - float arterialRandomMMHG = _randNumGenerator.generateDouble() * (_pressureVars.arterialMinLimitMMHG - _pressureVars.arterialMaxLimitMMHG) + - _pressureVars.arterialMaxLimitMMHG; + float arterialRandomMMHG = _randNumGenerator.generateDouble() * (_pressureVars.arterialMaxLimitMMHG - _pressureVars.arterialMinLimitMMHG) + + _pressureVars.arterialMinLimitMMHG; float arterialPevMMHG = _pressureVars.arterialRawMMHG[_pressureVars.arterialIndex]; - + // Moving average _pressureVars.arterialRawMMHG[_pressureVars.arterialIndex] = arterialRandomMMHG; _pressureVars.arterialRunningSumMMHG = _pressureVars.arterialRunningSumMMHG - arterialPevMMHG + arterialRandomMMHG; _pressureVars.arterialIndex = (_pressureVars.arterialIndex < SHORT_MOVING_AVG_SIZE - 1 ? _pressureVars.arterialIndex + 1 : 0); // Venous calculations - float venousRandomMMHG = _randNumGenerator.generateDouble() * (_pressureVars.venousMinLimitMMHG - _pressureVars.venousMaxLimitMMHG) + - _pressureVars.venousMaxLimitMMHG; + float venousRandomMMHG = _randNumGenerator.generateDouble() * (_pressureVars.venousMaxLimitMMHG - _pressureVars.venousMinLimitMMHG) + + _pressureVars.venousMinLimitMMHG; float venousPevMMHG = _pressureVars.venousRawMMHG[_pressureVars.venousIndex]; - + // Moving average _pressureVars.venousRawMMHG[_pressureVars.venousIndex] = venousRandomMMHG; _pressureVars.venousRunningSumMMHG = _pressureVars.venousRunningSumMMHG - venousPevMMHG + venousRandomMMHG; _pressureVars.venousIndex = (_pressureVars.venousIndex < SHORT_MOVING_AVG_SIZE - 1 ? _pressureVars.venousIndex + 1 : 0); // TMP calculations - float tmpRandomMMHG = _randNumGenerator.generateDouble() * (_pressureVars.tmpMinLimitMMHG - _pressureVars.tmpMaxLimitMMHG) + - _pressureVars.tmpMaxLimitMMHG; + float tmpRandomMMHG = _randNumGenerator.generateDouble() * (_pressureVars.tmpMaxLimitMMHG - _pressureVars.tmpMinLimitMMHG) + + _pressureVars.tmpMinLimitMMHG; float tmpPevMMHG = _pressureVars.tmpRawMMHG[_pressureVars.tmpIndex]; - + // Moving average _pressureVars.tmpRawMMHG[_pressureVars.tmpIndex] = tmpRandomMMHG; _pressureVars.tmpRunningSumMMHG = _pressureVars.tmpRunningSumMMHG - tmpPevMMHG + tmpRandomMMHG; _pressureVars.tmpIndex = (_pressureVars.tmpIndex < SHORT_MOVING_AVG_SIZE - 1 ? _pressureVars.tmpIndex + 1 : 0); @@ -199,13 +199,6 @@ _isBroadcastListReady = true; } -void StateController::handleTDBloodPressureBroadcastData(const Broadcast_Type BCType) -{ - static quint32 broadcastCounter = 22; - if ((++broadcastCounter % NUM_OF_COUNTS_TIMER_BC_EMIT != 0) && (BCType == BC_DELAYED)) { return; } - // TODO copmlete -} - void StateController::handleUltrafiltrationBroadcastData(const Broadcast_Type BCType) { static quint32 broadcastCounter = 31; @@ -268,3 +261,21 @@ _isBroadcastListReady = true; } +void StateController::handleVitalsBroadcastData() +{ + quint32 systolic = _randNumGenerator.global()->bounded(DEF_TX_SYSTOLIC_PRES - 20, DEF_TX_SYSTOLIC_PRES ); + quint32 diastolic = _randNumGenerator.global()->bounded(DEF_TX_DIASTOLIC_PRES - 20, DEF_TX_DIASTOLIC_PRES); + quint32 heartBeat = _randNumGenerator.global()->bounded(DEF_TX_HEART_BEAT - 20, DEF_TX_HEART_BEAT); + + QVariantList msg; + msg.append(static_cast(ID_TD_BLOOD_PRESSURE_DATA)); + msg.append(Can_Id::eChlid_TD_Sync); + msg.append(systolic); + msg.append(diastolic); + msg.append(heartBeat); + _isBroadcastListReady = false; + _broadcastMessages.append(msg); + _isBroadcastListReady = true; +} + +