Index: leahi.pro =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- leahi.pro (.../leahi.pro) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ leahi.pro (.../leahi.pro) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -125,6 +125,7 @@ \ # Controllers sources/ApplicationController.h \ sources/device/DeviceController.h \ + sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h \ sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.h \ sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.h \ sources/storage/Settings.h \ @@ -151,7 +152,6 @@ sources/model/ui/data/MUIBloodPressureData.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h \ - sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h \ @@ -415,6 +415,7 @@ \ # Controllers sources/ApplicationController.cpp \ sources/device/DeviceController.cpp \ + sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.cpp \ sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.cpp \ sources/model/ui/data/MUIBloodPressureData.cpp \ @@ -446,7 +447,6 @@ sources/model/settings/MBluetooth.cpp \ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp \ - sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -110,7 +110,7 @@ {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes {Gui::GuiActionType::ID_TDVoltageData , 11 * 4 }, //11 parameters each 4bytes {Gui::GuiActionType::ID_TDBloodPumpData , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_TDValvesData , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 2*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes {Gui::GuiActionType::ID_TDEjectorData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TDSwitchesData , 1 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes //// LEAHIZED @@ -235,7 +235,7 @@ {Gui::GuiActionType::ID_AdjustVersionsUIReq ,1+1+1+2+4 }, // variable length parameters {Gui::GuiActionType::ID_AdjustVersionsTDRsp ,1+1+1+2+1+1+1+1}, // variable length parameters {Gui::GuiActionType::ID_AdjustVersionsDDRsp ,1+1+1+2+1+1+1+1}, // variable length parameters - {Gui::GuiActionType::ID_AdjustSerialHDRsp , 1 * 1 }, // minimum 1 parameter 1 byte + {Gui::GuiActionType::ID_AdjustSerialTDRsp , 1 * 1 }, // minimum 1 parameter 1 byte {Gui::GuiActionType::ID_AdjustSerialDGRsp , 1 * 1 }, // minimum 1 parameter 1 byte // ---- {Gui::GuiActionType::ID_AdjustVersionsTDReq , 0 * 4 }, // 0 parameter Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -463,7 +463,7 @@ case Gui::GuiActionType::ID_AdjustServiceModeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceModeRsp ); break; case Gui::GuiActionType::ID_AdjustVersionsTDReq : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsTDReq ); break; case Gui::GuiActionType::ID_AdjustVersionsTDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsTDRsp ); break; - case Gui::GuiActionType::ID_AdjustSerialHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialHDRsp ); break; + case Gui::GuiActionType::ID_AdjustSerialTDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialTDRsp ); break; case Gui::GuiActionType::ID_AdjustServiceDatesHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesHDRsp ); break; case Gui::GuiActionType::ID_AdjustHDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp ); break; case Gui::GuiActionType::ID_HDUsageInfoRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDUsageInfoRsp ); break; Index: sources/cloudsync/CloudSyncController.cpp =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -782,7 +782,7 @@ } break; - case GuiActionType::ID_AdjustSerialHDRsp : + case GuiActionType::ID_AdjustSerialTDRsp : case GuiActionType::ID_AdjustSerialDGRsp : // this message is not complete in one step and saves only the received info and waits for the other if complete will send. saveDeviceInfo(vAction, vData); @@ -1237,7 +1237,7 @@ // if both values received initDeviceInfoWait(); - if ( vAction == GuiActionType::ID_AdjustSerialHDRsp ) { + if ( vAction == GuiActionType::ID_AdjustSerialTDRsp ) { if ( vData.count() ) { _deviceInfoHD = vData[eDeviceInfo_Ix].toString(); } else { Index: sources/gui/GuiGlobals.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -100,7 +100,7 @@ ID_AdjustVersionsTDReq = 0x1500, // 21 // ID_HDVersionsRxq - HD Version request received //// ----- @LEAHIZED ID_AdjustVersionsTDRsp = 0x0E00, // 14 //// ----- @LEAHIZED ID_AdjustVersionsDDRsp = 0x0F00, // 15 - ID_AdjustSerialHDRsp = 0x9900, // 153 + ID_AdjustSerialTDRsp = 0x9900, // 153 ID_AdjustSerialDGRsp = 0x8800, // 136 // Service Information Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -69,21 +69,23 @@ vTDBloodPump.measFlow .toFixed(2) , vTDBloodPump.rotorSpeed .toFixed(2) , vTDBloodPump.motorSpeed .toFixed(2) , + vTDBloodPump.currMotor .toFixed(2) , vTDBloodPump.setRPM .toFixed(2) , vTDBloodPump.pressureFlow , vTDBloodPump.rotationCount , vTDBloodPump.rotorHallState , ] label: [ - "setFlow ", - "measFlow ", - "rotorSpeed ", - "motorSpeed ", - "setRPM ", - "pressureFlow ", - "rotationCount ", - "rotorHallState", + "sFLow ", + "mFlow ", + "rSpd ", + "mSpd ", + "cMot ", + "RPM ", + "pFlow ", + "rCnt ", + "state ", ] } @@ -101,10 +103,10 @@ vTDAirTrap.controlling , ] label: [ - "lower", - "upper", - "lowerR", - "upperR", + "ATL", + "ATU", + "rATL", + "rATU", "state", "ctrl", ] @@ -116,19 +118,19 @@ x: col(3) y: row(0) model: [ - vTDValves.nextPos , - vTDValves.posCount , - vTDValves.posName , - vTDValves.state , vTDValves.valveId , + vTDValves.state , + vTDValves.posName , + vTDValves.posCount , + vTDValves.nextPos , ] label: [ - "nextPos ", - "posCount ", - "posName ", - "state ", - "valveId ", + "ID ", + "state ", + "Name ", + "Cnt ", + "nPos ", ] } @@ -138,13 +140,13 @@ x: col(4.5) y: row(0) model: [ - vTDEjector.setSpeed , - vTDEjector.state , + vTDEjector.state , + vTDEjector.setSpeed .toFixed(2) , ] label: [ - "setSpeed ", - "state ", + "state ", + "Spd " , ] } @@ -173,8 +175,8 @@ vTDBattery.capacity , ] label: [ - "aCPower ", - "capacity ", + "AC ", + "cap ", ] } @@ -220,421 +222,10 @@ vTDTemperature.boardTemp .toFixed(2) ] label: [ - "boardTemp", + "board", ] } -// DebugDataColumn { id: _DGReservoirColumn -// textObjectName :"_DGReservoirData" -// title : qsTr(" Rsrvr ") -// x: col(3) -// y: row(0) -// model: [ -// vDGReservoir.activeReservoir , -// vDGReservoir.fillToVol , -// vDGReservoir.drainToVol , -// ] -// label: [ -// "Act", -// "Fil", -// "Drn", -// ] -// } - -// DebugDataColumn { id: _DGHeatersColumn -// textObjectName :"_DGHeatersData" -// title : qsTr(" Heatrs ") -// x: col(4) -// y: row(0) -// model: [ -// vDGHeaters.mainPrimayHeaterDC .toFixed(2), -// vDGHeaters.smallPrimaryHeaterDC .toFixed(2), -// vDGHeaters.trimmerHeaterDC .toFixed(2), -// ] -// label: [ -// "HP1", -// "HP2", -// "HR" , -// ] -// } - -// Text { id : _mouseEventCountText -// text: String("Touch: %1,%2").arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ ) -// .arg(GuiEventSpy.touchPoints /*.toString().padStart(4,'0')*/ ) -// x: col(3.5) -// y: row(1.5) -// visible: true -// horizontalAlignment: Text.AlignLeft -// color: Colors.textMain -// font.pixelSize: Fonts.fontPixelDebugText -// MouseArea { -// anchors.fill: _mouseEventCountText -// onClicked: GuiEventSpy.doTouchReset() -// } -// } - -// Text { id : _canbusFaultCountText -// property int count: 0 -// text: qsTr("CANerr: %1").arg(count) -// x: col(5.0) -// y: row(1.5) -// visible: true -// horizontalAlignment: Text.AlignLeft -// color: Colors.textMain -// font.pixelSize: Fonts.fontPixelDebugText -// } - -// DebugDataColumn { id: _DGLoadCellReadingsColumn -// textObjectName :"_DGLoadCellReadingsData" -// title : qsTr(" LoadCl ") -// x: col(5) -// y: row(0) -// model: [ -// vDGLoadCellReadings.reservoir1Prim .toFixed(2) , -// vDGLoadCellReadings.reservoir1Bkup .toFixed(2) , -// vDGLoadCellReadings.reservoir2Prim .toFixed(2) , -// vDGLoadCellReadings.reservoir2Bkup .toFixed(2) , -// ] -// label: [ -// "A1", -// "A2", -// "B1", -// "B2", -// ] -// } - -// DebugDataColumn { id: _DGTemperaturesColumn -// textObjectName :"_DGTemperaturesData" -// title : qsTr(" Tmprtr ") -// x: col(6) -// y: row(0) -// model: [ -// vDGTemperatures.inletPrimaryHeater .toFixed(2) , -// vDGTemperatures.heatDisinfect .toFixed(2) , -// vDGTemperatures.outletPrimaryHeater .toFixed(2) , -// vDGTemperatures.conductivitySensor1 .toFixed(2) , -// vDGTemperatures.conductivitySensor2 .toFixed(2) , -// vDGTemperatures.outletRedundancy .toFixed(2) , -// vDGTemperatures.inletDialysate .toFixed(2) , -// vDGTemperatures.primaryHeaterThermoCouple .toFixed(2) , -// vDGTemperatures.trimmerHeaterThermoCouple .toFixed(2) , -// vDGTemperatures.primaryHeaterColdJunction .toFixed(2) , -// vDGTemperatures.trimmerHeaterColdJunction .toFixed(2) , -// vDGTemperatures.primaryHeaterInternal .toFixed(2) , -// vDGTemperatures.trimmerHeaterInternal .toFixed(2) , -// vDGTemperatures.fpgaBoard .toFixed(2) , -// vDGTemperatures.loadCellA1B1 .toFixed(2) , -// vDGTemperatures.loadCellA2B2 .toFixed(2) , -// vDGTemperatures.internalTHDORTD .toFixed(2) , -// vDGTemperatures.internalTDIRTD .toFixed(2) , -// vDGTemperatures.interalTHDRTD .toFixed(2) , -// vDGTemperatures.internalCondSnsrTemp .toFixed(2) , -// vDGTemperatures.baroTempSensor .toFixed(2) , -// // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen -// //vDGTemperatures.dialysateInletMvngAvg .toFixed(2) , -// //vDGTemperatures.redundantOutletMvngAvg .toFixed(2) , -// ] -// label: [ -// "TPi" , -// "THd" , -// "TPo" , -// "TD1" , -// "TD2" , -// "TRo" , -// "TDi" , -// "HP.Trm", -// "HR.Trm", -// "HP.Cld", -// "HR.Cld", -// "HP.Int", -// "HR.Int", -// "fpga" , -// "cell11", -// "cell22", -// "iTHDO" , -// "iTDI" , -// "iTHD" , -// "iCond" , -// "baro" , -// // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen -// // TDiAvg, -// // TROAvg, -// ] -// } - -// DebugDataColumn { id: _DGConductivityColumn -// textObjectName :"_DGConductivityData" -// title : qsTr(" Conduct ") -// x: col(3.7) -// y: row(3.2) -// model: [ -// vDGConductivity.RORejectionRatio .toFixed(3), -// vDGConductivity.CPi .toFixed(1), -// vDGConductivity.CPo .toFixed(1), -// vDGConductivity.CD1 .toFixed(1), -// vDGConductivity.CD2 .toFixed(1), -// vDGConductivity.CPiRaw .toFixed(1), -// vDGConductivity.CPoRaw .toFixed(1), -// vDGConductivity.CD1Raw .toFixed(1), -// vDGConductivity.CD2Raw .toFixed(1), -// vDGConductivity.CPiSensorStatus .toFixed(1), -// vDGConductivity.CPoSensorStatus .toFixed(1), -// vDGConductivity.CD1SensorStatus .toFixed(1), -// vDGConductivity.CD2SensorStatus .toFixed(1), -// ] -// label: [ -// "ROrr" , -// "CPi" , -// "CPo" , -// "CD1" , -// "CD2" , -// "CPir" , -// "CPor" , -// "CD1r" , -// "CD2r" , -// "CPis" , -// "CPos" , -// "CD1s" , -// "CD2s" , -// ] -// } - -// DebugDataColumn { id: _DGOperationModeColumn -// textObjectName :"_DGOperationModeData" -// title : qsTr(" DG Mode ") -// x: col(2.5) -// y: row(1.9) -// model: [ -// vDGOperationMode.text , -// ] -// fontPixelSizeText: Fonts.fontPixelDebugTitle -// } - - // --- HD --- -// DebugDataColumn { id: _HDBloodFlowColumn -// textObjectName :"_HDBloodFlowData" -// title : qsTr(" BP ") -// x: col(0) -// y: row(6.5) -// model: [ -// vTreatmentBloodFlow.bloodFlow_FlowSetPoint , -// vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , -// vTreatmentBloodFlow.bloodFlow_RotorSpeed .toFixed(2) , -// vTreatmentBloodFlow.bloodFlow_MotorSpeed .toFixed(2) , -// vTreatmentBloodFlow.bloodFlow_MotorCtlSpeed .toFixed(2) , -// vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent .toFixed(2) , -// "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) , -// vTreatmentBloodFlow.bloodFlow_RotorCount .toFixed(2) , -// vTreatmentBloodFlow.bloodFlow_PresFlow .toFixed(2) , -// ] -// label: [ -// "Tgt.Flow" , -// "Msr.Flow" , -// "Rot.Spd" , -// "Mot.Spd" , -// "MC.Spd" , -// "MC.Cur" , -// "PWM" , -// "Rtr.Cnt" , -// "Prs.Flow" , -// ] -// } - -// DebugDataColumn { id: _HDDialysateInletFlowColumn -// textObjectName :"_HDDialysateInletFlowData" -// title : qsTr(" DPi ") -// x: col(1.2) -// y: row(2.5) -// model: [ -// vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , -// vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , -// vTreatmentDialysateFlow.dialysateFlow_RotorSpeed .toFixed(2) , -// vTreatmentDialysateFlow.dialysateFlow_MotorSpeed .toFixed(2) , -// vTreatmentDialysateFlow.dialysateFlow_MotorCtlSpeed .toFixed(2) , -// vTreatmentDialysateFlow.dialysateFlow_MotorCtlCurrent.toFixed(2) , -// "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) , -// vTreatmentDialysateFlow.dialysateFlow_RotorCount .toFixed(2) , -// vTreatmentDialysateFlow.dialysateFlow_PresFlow .toFixed(2) , -// ] -// label: [ -// "Tgt.Flow" , -// "Msr.Flow" , -// "Rot.Spd" , -// "Mot.Spd" , -// "MC.Spd" , -// "MC.Cur" , -// "PWM" , -// "Rtr.Cnt" , -// "Prs.Flow" , -// ] -// } - -// DebugDataColumn { id: _HDDialysateOutletFlowColumn -// textObjectName :"_HDDialysateOutletFlowData" -// title : qsTr(" UF/DPo ") -// x: col(2.4) -// y: row(2.5) -// model: [ -// vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , -// vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , -// vTreatmentUltrafiltration.ultrafiltration_RotorSpeed .toFixed(2) , -// vTreatmentUltrafiltration.ultrafiltration_MotorSpeed .toFixed(2) , -// vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed .toFixed(2) , -// vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) , -// "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) , -// vTreatmentUltrafiltration.ultrafiltration_DopCorrOffset .toFixed(2) , -// vTreatmentUltrafiltration.ultrafiltration_DopCalcRate .toFixed(2) , -// vTreatmentUltrafiltration.ultrafiltration_UfCalcRate .toFixed(2) , -// // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen -// //vTreatmentUltrafiltration.ultrafiltration_RotorHall .toFixed(2) , -// //vTreatmentUltrafiltration.ultrafiltration_UfCurrentRate .toFixed(2) , -// //vTreatmentUltrafiltration.ultrafiltration_dialOutPumpState.toFixed(2) , -// ] -// label: [ -// "UFRef" , -// "UFMeas" , -// "Rot.Spd" , -// "Mot.Spd" , -// "MC.Spd" , -// "MC.Cur" , -// "PWM" , -// "DopOfst" , -// "DopRate" , -// "UFcRate" , -// // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen -// //"RotorHall" , -// //"CUFRate" , -// //"DOPumpSt" , -// ] -// } - -// DebugDataColumn { id: _HDPressureOcclusionColumn -// textObjectName :"_HDPressureOcclusionData" -// title : qsTr(" Prsr Oc ") -// x: col(3.7) -// y: row(1.9) -// model: [ -// vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , -// vTreatmentPressureOcclusion.venousPressure .toFixed(2) , -// vTreatmentPressureOcclusion.bloodPumpOcclusion , -// ] -// label: [ -// "PBA" , -// "PBo" , -// "OB" , -// ] -// } - -// DebugDataColumn { id: _HDSyringePumpColumn -// textObjectName :"_HDSyringePumpData" -// title : qsTr(" Syringe ") -// x: col(4.6) -// y: row(1.9) -// model: [ -// vHDSyringePump.syringePumpState , -// vHDSyringePump.heparinState , -// vHDSyringePump.setRate .toFixed(2) , -// vHDSyringePump.measuredRate .toFixed(2) , -// vHDSyringePump.syringePumpPosition , -// vHDSyringePump.volumeDelivered .toFixed(2) , -// vHDSyringePump.measuredHome .toFixed(2) , -// vHDSyringePump.measuredSwitch .toFixed(2) , -// vHDSyringePump.measuredForce .toFixed(2) , -// vHDSyringePump.safetyVol .toFixed(2) , -// vHDSyringePump.status , -// ] -// label: [ -// "srng.St", -// "hprn.St", -// "setRate", -// "msrRate", -// "srngPos", -// "VolumeD", -// "Msr.Hom", -// "Msr.Swt", -// "Msr.Frc", -// "safe.Vl", -// "status" , -// ] -// } - -// DebugDataColumn { id: _HDOperationModeColumn -// textObjectName :"_HDOperationModeData" -// title : qsTr(" HD Mode ") -// x: col(0.5) -// y: row(4.0) -// model: [ -// vHDOperationMode.text , -// ] -// fontPixelSizeText: Fonts.fontPixelDebugTitle -// } - -// DebugDataColumn { id: _DGValvesStatesColumn -// textObjectName :"_DGValvesStatesData" -// title : qsTr("Vlv") -// x: col(7.65) // pleae don't use 2 digits, this one is an exception -// y: row(0.0) -// width: 50 -// model: [ -// "%1,%2".arg(vDGValvesStates.valveStatus_VRF).arg(vDGValvesStates.valveStates_VRF), -// "%1,%2".arg(vDGValvesStates.valveStatus_VRI).arg(vDGValvesStates.valveStates_VRI), -// "%1,%2".arg(vDGValvesStates.valveStatus_RES).arg(vDGValvesStates.valveStates_RES), -// "%1,%2".arg(vDGValvesStates.valveStatus_VRO).arg(vDGValvesStates.valveStates_VRO), -// "%1,%2".arg(vDGValvesStates.valveStatus_VPO).arg(vDGValvesStates.valveStates_VPO), -// "%1,%2".arg(vDGValvesStates.valveStatus_VBF).arg(vDGValvesStates.valveStates_VBF), -// "%1,%2".arg(vDGValvesStates.valveStatus_VRC).arg(vDGValvesStates.valveStates_VRC), -// "%1,%2".arg(vDGValvesStates.valveStatus_VDR).arg(vDGValvesStates.valveStates_VDR), -// "%1,%2".arg(vDGValvesStates.valveStatus_VPI).arg(vDGValvesStates.valveStates_VPI), -// "%1,%2".arg(vDGValvesStates.valveStatus_VSP).arg(vDGValvesStates.valveStates_VSP), -// "%1,%2".arg(vDGValvesStates.valveStatus_VR1).arg(vDGValvesStates.valveStates_VR1), -// "%1,%2".arg(vDGValvesStates.valveStatus_VR2).arg(vDGValvesStates.valveStates_VR2), -// "%1,%2".arg(vDGValvesStates.valveStatus_VPD).arg(vDGValvesStates.valveStates_VPD), -// ] -// label: [ -// "VRF", -// "VRI", -// "RES", -// "VRO", -// "VPO", -// "VBF", -// "VRC", -// "VDR", -// "VPI", -// "VSP", -// "VR1", -// "VR2", -// "VPD", -// ] -// } - -// DebugDataColumn { id: _HDBloodLeakColumn -// textObjectName :"_HDBloodLeakData" -// title : qsTr(" BLD ") -// x: col(7) -// y: row(4.5) -// model: [ -// vHDBloodLeak.bloodLeakStatus , -// vHDBloodLeak.bloodLeakState , -// ] -// label: [ -// "Stats" , -// "State" , -// ] -// } - -// DebugDataColumn { id: _HDAlarmTopColumn -// textObjectName :"_HDAlarmTopData" -// title : qsTr(" Alarms ") -// x: col(5) -// y: row(5.5) -// model: [ -// _alarmItem.hasAlarm ? _alarmItem.alarm_AlarmID : 0, -// ] -// label: [ -// "Top" , -// ] -// } - // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version. TouchRect { x : col(7.0) @@ -655,7 +246,7 @@ title : "" horizontalAlignmentText: Text.AlignLeft fontPixelSizeText: Fonts.fontPixelDebugTitle - model: [ "HD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" + model: [ "TD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9\nSerial#: %10" .arg(vAdjustmentVersions.tdVerMajor ) .arg(vAdjustmentVersions.tdVerMinor ) .arg(vAdjustmentVersions.tdVerMicro ) @@ -665,69 +256,12 @@ .arg(vAdjustmentVersions.tdVerFPGALab ) .arg(vAdjustmentVersions.tdVerFPGAId ) .arg(vAdjustmentVersions.tdVerCompatibilityRev ) + .arg(vAdjustmentVersions.tdSerial ) ] } - - DebugDataColumn { id: _DGVersionsColumn - textObjectName :"_DGVersionsData" - title : "" - horizontalAlignmentText: Text.AlignLeft - fontPixelSizeText: Fonts.fontPixelDebugTitle - model: [ "DG: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" - .arg(vAdjustmentVersions.dgVerMajor ) - .arg(vAdjustmentVersions.dgVerMinor ) - .arg(vAdjustmentVersions.dgVerMicro ) - .arg(vAdjustmentVersions.dgVerBuild ) - .arg(vAdjustmentVersions.dgVerFPGAMajor ) - .arg(vAdjustmentVersions.dgVerFPGAMinor ) - .arg(vAdjustmentVersions.dgVerFPGALab ) - .arg(vAdjustmentVersions.dgVerFPGAId ) - .arg(vAdjustmentVersions.dgVerCompatibilityRev ) - ] - } - } } -// DebugDataColumn { id: _PreTreatmentStatesColumn -// textObjectName :"_PreTreatmentStatesData" -// title : qsTr(" PreTx States ") -// x: col(1.5) -// y: row(5.5) -// model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9,%10,%11" -// .arg(vPreTreatmentStates.subMode ) -// .arg(vPreTreatmentStates.waterSampleState ) -// .arg(vPreTreatmentStates.selfTestConsumablesState) -// .arg(vPreTreatmentStates.selfTestNoCartridgeState) -// .arg(vPreTreatmentStates.installationState ) -// .arg(vPreTreatmentStates.selfTestDryState ) -// .arg(vPreTreatmentStates.primeState ) -// .arg(vPreTreatmentStates.recirculateState ) -// .arg(vPreTreatmentStates.patientConnectionState ) -// .arg(vPreTreatmentStates.wetSelfTestsState ) -// .arg(vPreTreatmentStates.preTreatmentRsrvrState ) -// ] -// } -// Text { id : _tdResetInformation -// x: col(0.2) -// y: row(6.4) -// visible: true -// text: "HDrst:" + vGeneralEvent.hdReset -// horizontalAlignment: Text.AlignLeft -// color: Colors.textMain -// font.pixelSize: Fonts.fontPixelDebugText -// } - -// Text { id : _ddResetInformation -// x: col(0.2) -// y: row(6.8) -// visible: true -// text: "DGrst:" + vGeneralEvent.dgReset -// horizontalAlignment: Text.AlignLeft -// color: Colors.textMain -// font.pixelSize: Fonts.fontPixelDebugText -// } - Connections { target: _GuiView function onDidActionReceive( vAction, vData ) { // DEBUG: console.debug("onDidActionReceive", vAction, vData) @@ -738,3 +272,4 @@ } } +} Index: sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -73,7 +73,7 @@ TextEntry { id : _serial_HD textInput.clip : true hasCursor : false - textInput.text : vAdjustmentVersions .hdSerial + textInput.text : vAdjustmentVersions .tdSerial textInput.horizontalAlignment: Text.AlignLeft label.text : qsTr("HD Serial") separator.text : _root.separatorText Index: sources/gui/qml/pages/settings/SettingsInformation.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -69,7 +69,7 @@ Qt .application.version, vAdjustmentVersions .hdVerDevice , vAdjustmentVersions .hdVerFPGA , - vAdjustmentVersions .hdSerial , + vAdjustmentVersions .tdSerial , vAdjustmentVersions .dgVerDevice , vAdjustmentVersions .dgVerFPGA , vAdjustmentVersions .dgSerial , Index: sources/model/MModel.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/model/MModel.h (.../MModel.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/MModel.h (.../MModel.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -85,7 +85,7 @@ #include "MAdjustTDVersionsRequest.h" #include "MAdjustTDVersionsResponse.h" #include "MAdjustDGVersionsResponse.h" -#include "MAdjustHDSerialNumberResponse.h" +#include "MAdjustTDSerialNumberResponse.h" #include "MAdjustDGSerialNumberResponse.h" #include "MAdjustHDServiceModeResponse.h" #include "MAdjustHDServiceDatesResponse.h" @@ -456,7 +456,7 @@ REGISTER_METATYPE( AdjustVersionsTDRequestData ) \ REGISTER_METATYPE( AdjustVersionsTDResponseData ) \ REGISTER_METATYPE( AdjustVersionsDGResponseData ) \ - REGISTER_METATYPE( AdjustSerialNumberHDResponseData ) \ + REGISTER_METATYPE( AdjustSerialNumberTDResponseData ) \ REGISTER_METATYPE( AdjustSerialNumberDGResponseData ) \ REGISTER_METATYPE( AdjustServiceModeResponseData ) \ REGISTER_METATYPE( AdjustServiceDatesHDResponseData ) \ @@ -594,7 +594,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDGResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberTDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberDGResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceModeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesHDResponseData ) \ @@ -794,7 +794,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDGResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberTDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberDGResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceModeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesHDResponseData ) \ @@ -1099,7 +1099,7 @@ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsDGResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustSerialNumberHDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustSerialNumberTDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSerialNumberDGResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceModeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceDatesHDResponseData ) \ Fisheye: Tag af9b5ee3e759ca45c4e55488f46601f30143edae refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag af9b5ee3e759ca45c4e55488f46601f30143edae refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp =================================================================== diff -u --- sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp (revision 0) +++ sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -0,0 +1,60 @@ +/*! + * + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustTDSerialNumberResponse.cpp + * \author (last) Behrouz NematiPour + * \date (last) 19-Dec-2022 + * \author (original) Behrouz NematiPour + * \date (original) 13-Jun-2021 + * + */ +#include "MAdjustTDSerialNumberResponse.h" + +using namespace Model; + +QVariantList MAdjustSerialNumberTDResponse::parameters() const { + return { + _data.mSerialNumber + }; +} + +/** + * \brief MAdjustSerialNumberTDResponse::isValid + * \details Checks if character meets HD serial constraints. (alphanumeric or '-') + * \param vChar - the character. + * \return bool - whether character is valid. + */ +bool MAdjustSerialNumberTDResponse::isValid(const QChar &vChar) +{ + return vChar.isLetterOrNumber() || vChar == '-'; +} + +/** + * \brief MAdjustSerialNumberTDResponse::fromByteArray + * \details Removes any invalid characters from HD serial string. + * \param vByteArray - HD serial string represented as a byte array. + * \return bool - whether serial contains any valid characters. + */ +bool MAdjustSerialNumberTDResponse::fromByteArray(const QByteArray &vByteArray, int *) { + QString serial; + for ( char c: vByteArray ) { + // stop if end of file found while iterating through serial + if ( !c ) break; + QChar ch(c); + if ( isValid(ch) ) { + serial += ch; + } + } + + // whitespace cannot be in serial and empty serial is invalid + _data.mSerialNumber = serial.trimmed(); + return ! _data.mSerialNumber.isEmpty(); +} + +MAdjustSerialNumberTDResponse::Data MAdjustSerialNumberTDResponse::data() const { + return _data; +} Index: sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h =================================================================== diff -u --- sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h (revision 0) +++ sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -0,0 +1,77 @@ +/*! + * + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustTDSerialNumberResponse.h + * \author (last) Behrouz NematiPour + * \date (last) 19-Dec-2022 + * \author (original) Behrouz NematiPour + * \date (original) 13-Jun-2021 + * + */ +#pragma once + +// Qt + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustSerialNumberTDResponse class + * \details The HD serial number response data model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| + * |0x9900| 0x020 | Rsp | Y | HD | UI | HD Serial Number | + * + * | Payload || + * | || + * | #1:(bytes) | \ref Data::mSerialNumber + null term | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | Serial | + * + */ +class MAdjustSerialNumberTDResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + bool isValid(const QChar &vChar); + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } + QString infoText () const override { return QString("Serial"); } + + struct Data { + QString mSerialNumber; + }; + + MAdjustSerialNumberTDResponse() {} + + bool fromByteArray (const QByteArray &vByteArray, int *vIndex = nullptr) override; + Data data ( ) const ; +private: + Data _data; +}; +} + +typedef Model::MAdjustSerialNumberTDResponse::Data AdjustSerialNumberTDResponseData; Index: sources/model/hd/data/MTDBloodPumpData.cpp =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/model/hd/data/MTDBloodPumpData.cpp (.../MTDBloodPumpData.cpp) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/data/MTDBloodPumpData.cpp (.../MTDBloodPumpData.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -22,6 +22,7 @@ _data.mMeasFlow .value, _data.mRotorSpeed .value, _data.mMotorSpeed .value, + _data.mCurrMotor .value, _data.mSetRPM .value, _data.mPressureFlow .value, _data.mRotationCount .value, @@ -35,6 +36,7 @@ if ( ! GetValue(vByteArray, index, _data.mMeasFlow )) goto lError; if ( ! GetValue(vByteArray, index, _data.mRotorSpeed )) goto lError; if ( ! GetValue(vByteArray, index, _data.mMotorSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCurrMotor )) goto lError; if ( ! GetValue(vByteArray, index, _data.mSetRPM )) goto lError; if ( ! GetValue(vByteArray, index, _data.mPressureFlow )) goto lError; if ( ! GetValue(vByteArray, index, _data.mRotationCount )) goto lError; @@ -59,6 +61,7 @@ data.mMeasFlow = _data.mMeasFlow.value; data.mRotorSpeed = _data.mRotorSpeed.value; data.mMotorSpeed = _data.mMotorSpeed.value; + data.mCurrMotor = _data.mCurrMotor.value; data.mSetRPM = _data.mSetRPM.value; data.mPressureFlow = _data.mPressureFlow.value; data.mRotationCount = _data.mRotationCount.value; Index: sources/model/hd/data/MTDBloodPumpData.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/model/hd/data/MTDBloodPumpData.h (.../MTDBloodPumpData.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/data/MTDBloodPumpData.h (.../MTDBloodPumpData.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -39,10 +39,11 @@ * | #2:(F32) | \ref Data::mMeasFlow | * | #3:(F32) | \ref Data::mRotorSpeed | * | #4:(F32) | \ref Data::mMotorSpeed | - * | #5:(F32) | \ref Data::mSetRPM | - * | #8:(U32) | \ref Data::mPressureFlow | - * | #6:(U32) | \ref Data::mRotationCount | - * | #7:(U32) | \ref Data::mRotorHallState | + * | #5:(F32) | \ref Data::mCurrMotor | + * | #6:(F32) | \ref Data::mSetRPM | + * | #7:(U32) | \ref Data::mPressureFlow | + * | #8:(U32) | \ref Data::mRotationCount | + * | #9:(U32) | \ref Data::mRotorHallState | * * \sa Data * @@ -66,6 +67,7 @@ Types::F32 mMeasFlow ; Types::F32 mRotorSpeed ; Types::F32 mMotorSpeed ; + Types::F32 mCurrMotor ; Types::F32 mSetRPM ; Types::U32 mPressureFlow ; Types::U32 mRotationCount ; @@ -84,6 +86,7 @@ float mMeasFlow = 0; ///< meaured speed float mRotorSpeed = 0; ///< measured rotor speed float mMotorSpeed = 0; ///< measured blood pump speed) + float mCurrMotor = 0; ///< curr motor float mSetRPM = 0; ///< set rpm quint32 mPressureFlow = 0; ///< pressure flow quint32 mRotationCount = 0; ///< rotation count Index: sources/model/hd/data/MTDValvesData.cpp =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/model/hd/data/MTDValvesData.cpp (.../MTDValvesData.cpp) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/data/MTDValvesData.cpp (.../MTDValvesData.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -18,11 +18,11 @@ QVariantList MTDValvesData::parameters() const { return { - _data.mNextPos .value, - _data.mPosCount .value, - _data.mPosName .value, - _data.mState .value, - _data.mValveId .value, + _data.mValveId .value, + _data.mState .value, + _data.mPosName .value, + _data.mPosCount .value, + _data.mNextPos .value, }; } @@ -49,10 +49,10 @@ */ MTDValvesData::Data MTDValvesData::data() const{ Data data; - data.mNextPos = _data.mValveId .value; - data.mPosCount = _data.mState .value; - data.mPosName = _data.mPosName .value; - data.mState = _data.mPosCount .value; - data.mValveId = _data.mNextPos .value; + data.mValveId = _data.mValveId .value; + data.mState = _data.mState .value; + data.mPosName = _data.mPosName .value; + data.mPosCount = _data.mPosCount .value; + data.mNextPos = _data.mNextPos .value; return data; } Index: sources/model/hd/data/MTDValvesData.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/model/hd/data/MTDValvesData.h (.../MTDValvesData.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/data/MTDValvesData.h (.../MTDValvesData.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -77,8 +77,8 @@ quint32 mValveId = 0; ///< Valve ID quint32 mState = 0; ///< Valve State quint32 mPosName = 0; ///< Position Name - quint32 mPosCount = 0; ///< Position Count - quint32 mNextPos = 0; ///< Next Position + qint16 mPosCount = 0; ///< Position Count + qint16 mNextPos = 0; ///< Next Position }; MTDValvesData () { } Index: sources/storage/Logger.cpp =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/storage/Logger.cpp (.../Logger.cpp) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -577,11 +577,11 @@ } break; - case GuiActionType::ID_AdjustSerialHDRsp : { + case GuiActionType::ID_AdjustSerialTDRsp : { if ( vData.length() >= 1 ) { - QString hdSerial= vData[0].toString(); - if ( hdSerial.trimmed().isEmpty() ) hdSerial = "Unknown"; - _logFileNameHDSN = hdSerial; + QString tdSerial= vData[0].toString(); + if ( tdSerial.trimmed().isEmpty() ) tdSerial = "Unknown"; + _logFileNameHDSN = tdSerial; } } break; Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -62,8 +62,8 @@ }); connect(&_ApplicationController , - QOverload< const AdjustSerialNumberHDResponseData & >::of( &ApplicationController::didActionReceive ), - [ this ] ( const AdjustSerialNumberHDResponseData &vData ) + QOverload< const AdjustSerialNumberTDResponseData & >::of( &ApplicationController::didActionReceive ), + [ this ] ( const AdjustSerialNumberTDResponseData &vData ) { // The serial number is going to be received from HD // on POST or on request Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -31,7 +31,7 @@ ADJUST_VIEW_CONNECTION(AdjustParametersValidationRequestData ) ACTION_VIEW_CONNECTION(AdjustParametersValidationResponseData ) ADJUST_VIEW_CONNECTION(AdjustParametersConfirmRequestData ) - ACTION_VIEW_CONNECTION(AdjustSerialNumberHDResponseData ) + ACTION_VIEW_CONNECTION(AdjustSerialNumberTDResponseData ) } @@ -142,8 +142,8 @@ * This class keeps the serial for any treatment Code (txCode) generation * \param data - the message model data */ -void VTreatmentCreate::onActionReceive(const AdjustSerialNumberHDResponseData &data) { - _HDSerialNumber = data.mSerialNumber; +void VTreatmentCreate::onActionReceive(const AdjustSerialNumberTDResponseData &data) { + _tdSerialNumber = data.mSerialNumber; } /*! @@ -154,7 +154,7 @@ void VTreatmentCreate::generateTxCode() { QDateTime datetime = QDateTime::currentDateTime(); QString today = datetime.toString("yyyyMMddHHmmss"); - txCode(_HDSerialNumber + today); + txCode(_tdSerialNumber + today); _TreatmentLog.gTxCode(_txCode); LOG_APPED_UI(QString("Generated Treatment Code is %1").arg(_txCode)); } Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -24,7 +24,7 @@ // Project #include "MPreTreatmentAdjustParametersValidationResponse.h" -#include "MAdjustHDSerialNumberResponse.h" +#include "MAdjustTDSerialNumberResponse.h" #include "GuiController.h" #include "StorageGlobals.h" @@ -74,7 +74,7 @@ // friends friend class::tst_views; - QString _HDSerialNumber = ""; + QString _tdSerialNumber = ""; PROPERTY(bool , heparinDispensingRateOff , true) PROPERTY(bool , heparinBolusVolumeOff , true) @@ -127,7 +127,7 @@ VIEW_DEC_CLASS(VTreatmentCreate) VIEW_DEC_SLOT(AdjustParametersValidationResponseData) - VIEW_DEC_SLOT(AdjustSerialNumberHDResponseData) + VIEW_DEC_SLOT(AdjustSerialNumberTDResponseData) private: QString enumToString(GuiRequestReasons vEnum); Index: sources/view/hd/data/VTDBloodPumpData.cpp =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/view/hd/data/VTDBloodPumpData.cpp (.../VTDBloodPumpData.cpp) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/view/hd/data/VTDBloodPumpData.cpp (.../VTDBloodPumpData.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -24,6 +24,7 @@ measFlow (vData.mMeasFlow ); rotorSpeed (vData.mRotorSpeed ); motorSpeed (vData.mMotorSpeed ); + currMotor (vData.mCurrMotor ); setRPM (vData.mSetRPM ); pressureFlow (vData.mPressureFlow ); rotationCount (vData.mRotationCount ); Index: sources/view/hd/data/VTDBloodPumpData.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/view/hd/data/VTDBloodPumpData.h (.../VTDBloodPumpData.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/view/hd/data/VTDBloodPumpData.h (.../VTDBloodPumpData.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -35,14 +35,15 @@ class VTDBloodPump : public QObject { Q_OBJECT - PROPERTY( qint32 , rotorHallState , 0) - PROPERTY( float , rotationCount , 0) - PROPERTY( float , pressureFlow , 0) - PROPERTY( float , setRPM , 0) - PROPERTY( float , motorSpeed , 0) - PROPERTY( quint32 , rotorSpeed , 0) - PROPERTY( quint32 , measFlow , 0) - PROPERTY( quint32 , setFlow , 0) + PROPERTY( qint32 , setFlow , 0) + PROPERTY( float , measFlow , 0) + PROPERTY( float , rotorSpeed , 0) + PROPERTY( float , motorSpeed , 0) + PROPERTY( float , currMotor , 0) + PROPERTY( float , setRPM , 0) + PROPERTY( quint32 , pressureFlow , 0) + PROPERTY( quint32 , rotationCount , 0) + PROPERTY( quint32 , rotorHallState , 0) VIEW_DEC(VTDBloodPump, TDBloodPumpData) }; Index: sources/view/hd/data/VTDEjectorData.cpp =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/view/hd/data/VTDEjectorData.cpp (.../VTDEjectorData.cpp) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/view/hd/data/VTDEjectorData.cpp (.../VTDEjectorData.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -20,6 +20,6 @@ VIEW_DEF(VTDEjector, TDEjectorData) void VTDEjector::onActionReceive(const TDEjectorData &vData) { - setSpeed (vData.mState ); - state (vData.mSetSpeed ); + state (vData.mState ); + setSpeed (vData.mSetSpeed ); } Index: sources/view/hd/data/VTDEjectorData.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/view/hd/data/VTDEjectorData.h (.../VTDEjectorData.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/view/hd/data/VTDEjectorData.h (.../VTDEjectorData.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -35,8 +35,8 @@ class VTDEjector : public QObject { Q_OBJECT - PROPERTY( quint32 , setSpeed , 0) - PROPERTY( float , state , 0) + PROPERTY( quint32 , state , 0) + PROPERTY( float , setSpeed , 0) VIEW_DEC(VTDEjector, TDEjectorData) }; Index: sources/view/hd/data/VTDValvesData.cpp =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/view/hd/data/VTDValvesData.cpp (.../VTDValvesData.cpp) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/view/hd/data/VTDValvesData.cpp (.../VTDValvesData.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -20,9 +20,9 @@ VIEW_DEF(VTDValves, TDValvesData) void VTDValves::onActionReceive(const TDValvesData &vData) { - nextPos (vData.mValveId ); - posCount (vData.mState ); - posName (vData.mPosName ); - state (vData.mPosCount ); - valveId (vData.mNextPos ); + valveId (vData.mValveId ); + state (vData.mState ); + posName (vData.mPosName ); + posCount (vData.mPosCount ); + nextPos (vData.mNextPos ); } Index: sources/view/hd/data/VTDValvesData.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/view/hd/data/VTDValvesData.h (.../VTDValvesData.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/view/hd/data/VTDValvesData.h (.../VTDValvesData.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -35,11 +35,11 @@ class VTDValves : public QObject { Q_OBJECT - PROPERTY( quint32 , nextPos , 0) - PROPERTY( quint32 , posCount , 0) - PROPERTY( quint32 , posName , 0) - PROPERTY( quint32 , state , 0) - PROPERTY( quint32 , valveId , 0) + PROPERTY( quint32 , valveId , 0) + PROPERTY( quint32 , state , 0) + PROPERTY( quint32 , posName , 0) + PROPERTY( qint16 , posCount , 0) + PROPERTY( qint16 , nextPos , 0) VIEW_DEC(VTDValves, TDValvesData) }; Index: sources/view/settings/VAdjustmentVersions.cpp =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -27,7 +27,7 @@ ACTION_VIEW_CONNECTION( AdjustVersionsTDRequestData); ACTION_VIEW_CONNECTION(AdjustVersionsTDResponseData); ACTION_VIEW_CONNECTION(AdjustVersionsDGResponseData); - ACTION_VIEW_CONNECTION(AdjustSerialNumberHDResponseData); + ACTION_VIEW_CONNECTION(AdjustSerialNumberTDResponseData); ACTION_VIEW_CONNECTION(AdjustSerialNumberDGResponseData); } @@ -101,9 +101,9 @@ adjustmentDG(true); // set here only because adjustment parent needs it, but HD Versions does not } -void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberHDResponseData &vData) +void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberTDResponseData &vData) { - hdSerial( vData.mSerialNumber ); + tdSerial( vData.mSerialNumber ); } void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberDGResponseData &vData) Index: sources/view/settings/VAdjustmentVersions.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -22,7 +22,7 @@ #include "MAdjustTDVersionsRequest.h" #include "MAdjustTDVersionsResponse.h" #include "MAdjustDGVersionsResponse.h" -#include "MAdjustHDSerialNumberResponse.h" +#include "MAdjustTDSerialNumberResponse.h" #include "MAdjustDGSerialNumberResponse.h" namespace View { @@ -76,7 +76,7 @@ PROPERTY( QString , tdVerDevice ,"") PROPERTY( QString , tdVerFPGA ,"") - PROPERTY( QString , hdSerial ,"") + PROPERTY( QString , tdSerial ,"") PROPERTY( QString , dgVerDevice ,"") PROPERTY( QString , dgVerFPGA ,"") PROPERTY( QString , dgSerial ,"") @@ -85,7 +85,7 @@ VIEW_DEC_SLOT ( AdjustVersionsTDRequestData) VIEW_DEC_SLOT (AdjustVersionsTDResponseData) VIEW_DEC_SLOT (AdjustVersionsDGResponseData) - VIEW_DEC_SLOT (AdjustSerialNumberHDResponseData) + VIEW_DEC_SLOT (AdjustSerialNumberTDResponseData) VIEW_DEC_SLOT (AdjustSerialNumberDGResponseData) // ---------- Version Index: sources/view/settings/VBluetooth.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/view/settings/VBluetooth.h (.../VBluetooth.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/settings/VBluetooth.h (.../VBluetooth.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -20,7 +20,7 @@ // Project #include "main.h" // Doxygen : do not remove #include "VView.h" -#include "MAdjustHDSerialNumberResponse.h" +#include "MAdjustTDSerialNumberResponse.h" #include "MBluetooth.h" #include "MUIBloodPressureData.h"