Index: sources/drydemo/StateControllerTreatmentBroadcasts.cpp =================================================================== diff -u -rb13dd2b30889640ebf03f54414f536ca5c8d2dc7 -rbf271a558491a83b39eb30748784f1b744736dd2 --- sources/drydemo/StateControllerTreatmentBroadcasts.cpp (.../StateControllerTreatmentBroadcasts.cpp) (revision b13dd2b30889640ebf03f54414f536ca5c8d2dc7) +++ sources/drydemo/StateControllerTreatmentBroadcasts.cpp (.../StateControllerTreatmentBroadcasts.cpp) (revision bf271a558491a83b39eb30748784f1b744736dd2) @@ -189,11 +189,8 @@ QVariantList msg; msg.append(static_cast(ID_DD_CONDUCTIVITY_DATA)); msg.append(Can_Id::eChlid_DD_Sync); - msg.append(0.0); - msg.append(d27Cond); - msg.append(0.0); - msg.append(0.0); - msg.append(0.0); + msg.append(0.0); msg.append(d27Cond); msg.append(0.0); + msg.append(0.0); msg.append(0.0); _isBroadcastListReady = false; _broadcastMessages.append(msg); _isBroadcastListReady = true; @@ -263,9 +260,9 @@ 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); + quint32 systolic = _randNumGenerator.global()->bounded(DEF_TX_SYSTOLIC_PRES_MMHG - 20, DEF_TX_SYSTOLIC_PRES_MMHG ); + quint32 diastolic = _randNumGenerator.global()->bounded(DEF_TX_DIASTOLIC_PRES_MMHG - 20, DEF_TX_DIASTOLIC_PRES_MMHG); + 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)); @@ -278,4 +275,38 @@ _isBroadcastListReady = true; } +// TREATMENT PAUSE +void StateController::handleDryBicartBroadcastData(const Broadcast_Type BCType) +{ + static quint32 broadcastCounter = 53; + if ((_treatmentStatus.bicartDrainInProgress == DRY_BICART_DRIN_IN_PROGRESS) || (_treatmentStatus.bicartDepresInProgress == DRY_BICART_DEPRES_IN_PROGRESS)) { + float progress = static_cast(QOBJECT_TIMER_TIMEOUT_MS) / static_cast(DRY_BICART_PCT_PROG_TIME_MS); + _treatmentStatus.bicartProgress += progress * ONE_HUNDRED_PCT; + if (_treatmentStatus.bicartProgress >= ONE_HUNDRED_PCT) { _treatmentStatus.bicartProgress = ONE_HUNDRED_PCT; } + } + + if (_treatmentStatus.bicartProgress >= ONE_HUNDRED_PCT) { + // The bicart progress is 100% make both options not available until a new request comes in + _treatmentStatus.bicartDrainInProgress = DRY_BICART_DRIN_NOT_IN_PROGRESS; + _treatmentStatus.bicartDepresInProgress = DRY_BICART_DEPRES_NOT_IN_PROGRESS; + } + + if ((++broadcastCounter % NUM_OF_COUNTS_TIMER_BC_EMIT != 0) && (BCType == BC_DELAYED)) { return; } + + quint32 bicarbShowDialog = (_treatmentStatus.bicartAction == DRY_BICART_ACTION_DONE ? DRY_BICART_CLOSE_SCREEN : DRY_BICART_OPEN_SCREEN); + + QVariantList msg; + msg.append(static_cast(ID_TD_DRY_BICART_DISCONNECT_DATA)); + msg.append(Can_Id::eChlid_TD_Sync); + msg.append(bicarbShowDialog); + msg.append(_treatmentStatus.bicartTotal); + msg.append(static_cast(_treatmentStatus.bicartProgress)); + msg.append(_treatmentStatus.bicartDrainInProgress); + msg.append(_treatmentStatus.bicartDepresInProgress); + _isBroadcastListReady = false; + _broadcastMessages.append(msg); + _isBroadcastListReady = true; +} + +