Index: leahi.pro =================================================================== diff -u -r16aaf5ab7e1c58199754a132d624a470295d3440 -rc63c041f361045518ede1c8df212517159a662a5 --- leahi.pro (.../leahi.pro) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) +++ leahi.pro (.../leahi.pro) (revision c63c041f361045518ede1c8df212517159a662a5) @@ -60,6 +60,7 @@ sources/model/td \ sources/model/td/data \ sources/model/td/data/treatment \ + sources/model/td/data/pretreatment \ sources/model/td/data/treatmentlog \ sources/model/td/alarm \ sources/model/td/adjustment \ @@ -79,6 +80,7 @@ sources/view/td \ sources/view/td/data \ sources/view/td/data/treatment \ + sources/view/td/data/pretreatment \ sources/view/td/adjustment/treatment \ sources/view/td/adjustment/pretreatment \ sources/view/td/adjustment/posttreatment \ @@ -232,6 +234,9 @@ sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \ sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.h \ + \ # ---------- Models - TD - Data - Pre-Treatment + sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \ + sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \ \ # ---------- Models - TD - Adjustment - In-Treatment //// ----- @LEAHIZED sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \ @@ -293,6 +298,9 @@ sources/view/td/data/VTreatmentRanges.h \ sources/view/td/data/VWaterSampleData.h \ sources/view/td/data/VTDSyringePumpData.h \ + \ # ---------- Views - TD - Data - Pre-Treatment + sources/view/td/data/pretreatment/VPreTreatmentStatesData.h \ + sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.h \ sources/view/td/data/treatment/VTreatmentBloodFlow.h \ @@ -332,7 +340,7 @@ \ # ---------- Views - TD - Adjustment - Pre-Treatment sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ - sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ \ # ---------- Views - TD - Adjustment - Post-Treatment sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h \ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h \ @@ -379,7 +387,6 @@ sources/model/hd/alarm/MAlarmCleared.h \ sources/model/hd/alarm/MAlarmActiveList.h \ \ # ---------- Models - States Data - sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustRequestsBase.h \ @@ -404,7 +411,6 @@ \ # ---------- Models - HD - Data - Pre-Treatment - Progress sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h \ - sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.h \ sources/model/hd/data/MHDGeneralEvent.h \ @@ -492,12 +498,10 @@ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \ \ # ---------- Views - HD - Data - States - sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \ \ # ---------- Views - HD - Data - Pre-Treatment - Progress sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h \ - sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \ \ # ---------- Views - HD - Data sources/view/hd/data/post/VHDPOSTData.h \ sources/view/hd/data/VHDAccelerometerData.h \ @@ -640,6 +644,9 @@ sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.cpp \ sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp \ + \ # ---------- Models - Data - States + sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \ + sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Models - TD - Adjustment - In-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \ @@ -681,7 +688,6 @@ sources/model/hd/alarm/MAlarmCleared.cpp \ sources/model/hd/alarm/MAlarmActiveList.cpp \ \ # ---------- Models - Data - States - sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ \ # ---------- Models - TD - Adjustment - Settings sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ @@ -727,7 +733,6 @@ sources/model/hd/data/post/MHDRTCEpochData.cpp \ sources/model/hd/data/MHDUsageInfoResponse.cpp \ \ # ---------- Models - HD - Data - Pre-Treatment - sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \ \ # ---------- Models - DG - Adjustment - Settings @@ -782,6 +787,9 @@ sources/view/td/data/VTreatmentRanges.cpp \ sources/view/td/data/VWaterSampleData.cpp \ sources/view/td/data/VTDSyringePumpData.cpp \ + \ # ---------- Views - TD - Data - Pre-Treatment + sources/view/td/data/pretreatment/VPreTreatmentStatesData.cpp \ + sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \ sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \ @@ -821,7 +829,7 @@ \ # ---------- Views - TD - Adjustment - Pre-Treatment sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ - sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ \ # ---------- Views - TD - Adjustment - Post-Treatment sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp \ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp \ @@ -867,15 +875,13 @@ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \ \ # ---------- Views - HD - States Data - sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ sources/view/hd/data/VHDBloodLeakData.cpp \ \ # ---------- Views - HD - Data - Pre-Treatment sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \ - sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Views - HD - Data - In-Treatment sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \ sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 -rc63c041f361045518ede1c8df212517159a662a5 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c63c041f361045518ede1c8df212517159a662a5) @@ -90,7 +90,7 @@ {Gui::GuiActionType::ID_HDBloodLeakData , 4 * 4 }, // 4 parameters each 4bytes // ---- {Gui::GuiActionType::ID_TDOpModeData , 2 * 4 }, // 2 parameter each 4bytes - {Gui::GuiActionType::ID_PreTreatmentStates , 11 * 4 }, //11 parameters each 4bytes + {Gui::GuiActionType::ID_PreTreatmentStates , 8 * 4 }, //11 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStates , 10 * 4 }, //10 parameters each 4bytes {Gui::GuiActionType::ID_PostTreatmentStates , 2 * 4 }, // 2 parameter each 4bytes @@ -129,7 +129,7 @@ {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes //TD Data Messages {Gui::GuiActionType::ID_TDVoltageData , 8 * 4 }, // 8 parameters each 4bytes - {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 7*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes + {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 5*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes {Gui::GuiActionType::ID_TDEjectorData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_TDSwitchesData , 1 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes @@ -248,7 +248,7 @@ // Pre-Treatment Disposable Priming {Gui::GuiActionType::ID_AdjustDisposablesPrimeReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_DisposablesPrimeData , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_DisposablesPrimeData , 4 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Patient Connection Begin {Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp , 2 * 4 }, // 2 parameters each 4bytes Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rbc97db7aaffa2e2115d2049bbcda2da34fb8f9a8 -rc63c041f361045518ede1c8df212517159a662a5 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c63c041f361045518ede1c8df212517159a662a5) @@ -130,7 +130,7 @@ ID_TreatmentTime = 0x3B00, // 59 //// ----- @LEAHIZED ID_BloodFlow = 0x1100, // 17 //// ----- @LEAHIZED ID_DialysateInletFlow = 0x0800, - ID_DialysateOutletFlow = 0x0B00, + ID_DialysateOutletFlow = 0x0B0F, //// ----- @CRAPIZED ID_PressureOcclusion = 0x2400, // 36 //// ----- @LEAHIZED ID_Saline = 0x3D00, // 61 //// ----- @LEAHIZED ID_Ultrafiltration = 0x3E00, // 62 //// ----- @LEAHIZED @@ -198,7 +198,7 @@ ID_DGDrainPumpData = 0x240F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication ID_DDOperationModeData = 0x1300, ID_DGReservoirData = 0x280F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication - ID_DGLoadCellReadingsData = 0x0C00, // 12 + ID_DGLoadCellReadingsData = 0x0C0F, // 12 ID_DGAccelerometerData = 0x340F, // 52 //// ----- @CRAPIZED: had to change to avoid duplication ID_DDValvesStatesData = 0x1B00, // 27 //// ----- @LEAHIZED ID_DDPressuresData = 0x1C00, // 28 //// ----- @LEAHIZED @@ -363,9 +363,10 @@ ID_AdjustDGCleaningUsageRsp = 0x8D0F, // 141 //// ----- @CRAPIZED: had to change to avoid duplication // RO Water Input Mode - ID_DuetRoWaterStatDGq = 0xC300, // 195 DG -> UI // DG initiates Status query - ID_DuetRoWaterModeUIi = 0xBC0F, // 188 UI -> DG // UI initiates Mode Set || responses to status query - ID_DuetRoWaterModeDGr = 0xC40F, // 196 //// ----- @CRAPIZED: had to change to avoid duplication + ID_RoWaterModeReq = 0xEB00, // 235 + ID_RoWaterModeRsp = 0xEC00, // 236 + ID_AdjustRoWaterModeReq = 0xED00, // 237 + ID_AdjustRoWaterModeRsp = 0xEE00, // 238 // Institutional record request and response Index: sources/model/MModel.h =================================================================== diff -u -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 -rc63c041f361045518ede1c8df212517159a662a5 --- sources/model/MModel.h (.../MModel.h) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) +++ sources/model/MModel.h (.../MModel.h) (revision c63c041f361045518ede1c8df212517159a662a5) @@ -785,6 +785,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsAlarmLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodFlowRateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateFlowRateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateTemperatureRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -r99e596082b87afd73b06dae039d51e4a67cc5913 -rc63c041f361045518ede1c8df212517159a662a5 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 99e596082b87afd73b06dae039d51e4a67cc5913) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision c63c041f361045518ede1c8df212517159a662a5) @@ -71,30 +71,30 @@ // Prime blood and dialysate circuits and run wet self-tests state bool mPrime = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_PRIME_STATE ; if ( mPrime ) { -// prime_waitUserStart ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WAIT_FOR_USER_START_STATE ); -// prime_salineSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_SETUP_STATE ); -// prime_salinePurgeAir ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_PURGE_AIR_STATE ); -// prime_salineCirculateBloodCircuit ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE ); -// prime_reservoirOneFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE ); -// prime_dialysateDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_DIALYZER_STATE ); -// prime_salineDialyzerSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_SETUP_STATE ); -// prime_salineDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_STATE ); -// prime_reservoirTwoFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE ); -// prime_dialysateBypass ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_BYPASS_STATE ); -// prime_wetSelfTests ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WET_SELF_TESTS_STATE ); -// prime_pause ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_PAUSE ); -// prime_complete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_COMPLETE ); + prime_waitUserStart ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WAIT_FOR_USER_START_STATE ); + prime_salineSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_SETUP_STATE ); + prime_salinePurgeAir ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_PURGE_AIR_STATE ); + prime_salineCirculateBloodCircuit ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE ); + prime_reservoirOneFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE ); + prime_dialysateDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_DIALYZER_STATE ); + prime_salineDialyzerSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_SETUP_STATE ); + prime_salineDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_STATE ); + prime_reservoirTwoFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE ); + prime_dialysateBypass ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_BYPASS_STATE ); + prime_wetSelfTests ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WET_SELF_TESTS_STATE ); + prime_pause ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_PAUSE ); + prime_complete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_COMPLETE ); -// prime__BloodCircuit ( _prime_salineSetup || -// _prime_salinePurgeAir || -// _prime_salineCirculateBloodCircuit); -// prime__DialysateCircuit ( _prime_reservoirOneFillComplete || -// _prime_dialysateDialyzer || -// _prime_salineDialyzerSetup || -// _prime_salineDialyzer || -// _prime_reservoirTwoFillComplete || -// _prime_dialysateBypass ); -// prime__WetSelfTests ( _prime_wetSelfTests ); + prime__BloodCircuit ( _prime_salineSetup || + _prime_salinePurgeAir || + _prime_salineCirculateBloodCircuit); + prime__DialysateCircuit ( _prime_reservoirOneFillComplete || + _prime_dialysateDialyzer || + _prime_salineDialyzerSetup || + _prime_salineDialyzer || + _prime_reservoirTwoFillComplete || + _prime_dialysateBypass ); + prime__WetSelfTests ( _prime_wetSelfTests ); }