Index: denali.pro.user
===================================================================
diff -u -r0b8e00869ef81ef0a834c03c13049f4c281870d2 -r179783b8085cac87e0fe9f247b475f2c64886174
--- denali.pro.user (.../denali.pro.user) (revision 0b8e00869ef81ef0a834c03c13049f4c281870d2)
+++ denali.pro.user (.../denali.pro.user) (revision 179783b8085cac87e0fe9f247b475f2c64886174)
@@ -8,7 +8,7 @@
ProjectExplorer.Project.ActiveTarget
- 1
+ 0
ProjectExplorer.Project.EditorSettings
@@ -86,315 +86,10 @@
ProjectExplorer.Project.Target.0
- Qt 5.12.5 (iMX8)
- Qt 5.12.5 (iMX8)
- {5d6458ef-f917-4aef-a092-c77bbe106149}
- 1
- 0
- 0
-
- /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Debug
-
-
- true
- qmake
-
- QtProjectManager.QMakeBuildStep
- false
-
- false
- false
- false
-
-
- true
- Make
-
- Qt4ProjectManager.MakeStep
-
- false
-
-
- false
-
- 2
- Build
- Build
- ProjectExplorer.BuildSteps.Build
-
-
-
- true
- Make
-
- Qt4ProjectManager.MakeStep
-
- true
- clean
-
- false
-
- 1
- Clean
- Clean
- ProjectExplorer.BuildSteps.Clean
-
- 2
- false
-
- Debug
- Debug
- Qt4ProjectManager.Qt4BuildConfiguration
- 2
- true
-
-
- /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Release
-
-
- true
- qmake
-
- QtProjectManager.QMakeBuildStep
- false
-
- false
- false
- false
-
-
- true
- Make
-
- Qt4ProjectManager.MakeStep
-
- false
-
-
- false
-
- 2
- Build
- Build
- ProjectExplorer.BuildSteps.Build
-
-
-
- true
- Make
-
- Qt4ProjectManager.MakeStep
-
- true
- clean
-
- false
-
- 1
- Clean
- Clean
- ProjectExplorer.BuildSteps.Clean
-
- 2
- false
-
- Release
- Release
- Qt4ProjectManager.Qt4BuildConfiguration
- 0
- true
-
-
- /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Profile
-
-
- true
- qmake
-
- QtProjectManager.QMakeBuildStep
- false
-
- false
- false
- false
-
-
- true
- Make
-
- Qt4ProjectManager.MakeStep
-
- false
-
-
- false
-
- 2
- Build
- Build
- ProjectExplorer.BuildSteps.Build
-
-
-
- true
- Make
-
- Qt4ProjectManager.MakeStep
-
- true
- clean
-
- false
-
- 1
- Clean
- Clean
- ProjectExplorer.BuildSteps.Clean
-
- 2
- false
-
- Profile
- Profile
- Qt4ProjectManager.Qt4BuildConfiguration
- 0
- true
-
- 3
-
-
-
- true
- Check for free disk space
-
- RemoteLinux.CheckForFreeDiskSpaceStep
-
-
-
-
- /
- 5242880
-
-
-
-
- true
- Kill current application instance
-
- RemoteLinux.KillAppStep
-
-
-
-
-
-
-
-
- true
- Deploy files via rsync
-
- RemoteLinux.RsyncDeployStep
-
-
-
-
-
-
- -av
- false
-
- 3
- Deploy
- Deploy
- ProjectExplorer.BuildSteps.Deploy
-
- 1
- Deploy to Remote Linux Host
-
- DeployToGenericLinux
-
- 1
-
-
- dwarf
-
- cpu-cycles
-
-
- 250
- -F
- true
- 4096
- false
- false
- 1000
-
- true
-
- false
- false
- false
- false
- true
- 0.01
- 10
- true
- kcachegrind
- 1
- 25
-
- 1
- true
- false
- true
- valgrind
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
- 11
- 12
- 13
- 14
-
- 1
-
-
- denali (on Generic Linux Device (iMX8))2
- RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro
- 1
-
- false
- -u
- 3768
- false
- true
- false
- false
- true
- false
-
-
- :0
-
- 1
-
-
-
- ProjectExplorer.Project.Target.1
-
Desktop Qt 5.12.5 GCC 64bit
Desktop Qt 5.12.5 GCC 64bit
qt.qt5.5125.gcc_64_kit
- 0
+ 1
0
0
@@ -405,11 +100,11 @@
qmake
QtProjectManager.QMakeBuildStep
- false
+ true
false
false
- true
+ false
true
@@ -1481,21 +1176,326 @@
denali
Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro
- --disable-timeout --disable-unhandled-report --logOut
+ -l
3768
false
true
true
false
- true
- false
+ false
+ true
- /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug
+ /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Release
1
+ ProjectExplorer.Project.Target.1
+
+ Qt 5.12.5 (iMX8)
+ Qt 5.12.5 (iMX8)
+ {5d6458ef-f917-4aef-a092-c77bbe106149}
+ 1
+ 0
+ 0
+
+ /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Debug
+
+
+ true
+ qmake
+
+ QtProjectManager.QMakeBuildStep
+ true
+
+ false
+ false
+ false
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ false
+
+
+ false
+
+ 2
+ Build
+ Build
+ ProjectExplorer.BuildSteps.Build
+
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ true
+ clean
+
+ false
+
+ 1
+ Clean
+ Clean
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Debug
+ Debug
+ Qt4ProjectManager.Qt4BuildConfiguration
+ 2
+ true
+
+
+ /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Release
+
+
+ true
+ qmake
+
+ QtProjectManager.QMakeBuildStep
+ false
+
+ false
+ false
+ false
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ false
+
+
+ false
+
+ 2
+ Build
+ Build
+ ProjectExplorer.BuildSteps.Build
+
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ true
+ clean
+
+ false
+
+ 1
+ Clean
+ Clean
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Release
+ Release
+ Qt4ProjectManager.Qt4BuildConfiguration
+ 0
+ true
+
+
+ /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Profile
+
+
+ true
+ qmake
+
+ QtProjectManager.QMakeBuildStep
+ false
+
+ false
+ false
+ false
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ false
+
+
+ false
+
+ 2
+ Build
+ Build
+ ProjectExplorer.BuildSteps.Build
+
+
+
+ true
+ Make
+
+ Qt4ProjectManager.MakeStep
+
+ true
+ clean
+
+ false
+
+ 1
+ Clean
+ Clean
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Profile
+ Profile
+ Qt4ProjectManager.Qt4BuildConfiguration
+ 0
+ true
+
+ 3
+
+
+
+ true
+ Check for free disk space
+
+ RemoteLinux.CheckForFreeDiskSpaceStep
+
+
+
+
+ /
+ 5242880
+
+
+
+
+ true
+ Kill current application instance
+
+ RemoteLinux.KillAppStep
+
+
+
+
+
+
+
+
+ true
+ Deploy files via rsync
+
+ RemoteLinux.RsyncDeployStep
+
+
+
+
+
+
+ -av
+ false
+
+ 3
+ Deploy
+ Deploy
+ ProjectExplorer.BuildSteps.Deploy
+
+ 1
+ Deploy to Remote Linux Host
+
+ DeployToGenericLinux
+
+ 1
+
+
+ dwarf
+
+ cpu-cycles
+
+
+ 250
+ -F
+ true
+ 4096
+ false
+ false
+ 1000
+
+ true
+
+ false
+ false
+ false
+ false
+ true
+ 0.01
+ 10
+ true
+ kcachegrind
+ 1
+ 25
+
+ 1
+ true
+ false
+ true
+ valgrind
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+ 11
+ 12
+ 13
+ 14
+
+ 1
+
+
+ denali (on UI Test Board)
+ RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro
+ 1
+
+ false
+
+ 3768
+ false
+ true
+ false
+ false
+ true
+ false
+
+
+ :0
+
+ 1
+
+
+
ProjectExplorer.Project.TargetCount
2
Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -r0b8e00869ef81ef0a834c03c13049f4c281870d2 -r179783b8085cac87e0fe9f247b475f2c64886174
--- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 0b8e00869ef81ef0a834c03c13049f4c281870d2)
+++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 179783b8085cac87e0fe9f247b475f2c64886174)
@@ -305,11 +305,11 @@
* \param vData - Data model contains the start treatment request information.
* \return void
*/
-void MessageDispatcher::onAdjustment(const StartTreatmentRequestData &vData)
+void MessageDispatcher::onAdjustment(const TreatmentStartRequestData &vData)
{
QVariantList mData;
mData += vData.request;
- onActionTransmit(GuiActionType::ID_StartTreatmentReq, mData);
+ onActionTransmit(GuiActionType::ID_TreatmentStartReq, mData);
}
/*!
@@ -358,11 +358,11 @@
* \param vData - Data model contains the confirm treatment request
* \return void
*/
-void MessageDispatcher::onAdjustment(const ConfirmTreatmentRequestData &vData)
+void MessageDispatcher::onAdjustment(const TreatmentConfirmRequestData &vData)
{
QVariantList mData;
mData += vData.request;
- onActionTransmit(GuiActionType::ID_ConfirmTreatmentReq, mData);
+ onActionTransmit(GuiActionType::ID_TreatmentConfirmReq, mData);
}
/**
@@ -480,10 +480,9 @@
mData += vData.heparinBolusVolume ;
mData += vData.dialysateTemp ;
- onActionTransmit(GuiActionType::ID_CreateTreatmentReq, mData);
+ onActionTransmit(GuiActionType::ID_TreatmentCreateReq, mData);
}
-
/*!
* \brief MessageDispatcher::actionTransmit
* \details This method is called by slot MessageDispatcher::onActionTransmit
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r0b8e00869ef81ef0a834c03c13049f4c281870d2 -r179783b8085cac87e0fe9f247b475f2c64886174
--- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 0b8e00869ef81ef0a834c03c13049f4c281870d2)
+++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 179783b8085cac87e0fe9f247b475f2c64886174)
@@ -249,9 +249,9 @@
case Gui::GuiActionType::ID_AdjustRecirculateReq : INTERPRET_RECEIVED_MESSAGE(AdjustRecirculateRequestData ); break;
case Gui::GuiActionType::ID_AdjustTreatmentEndReq : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentEndRequestData ); break;
// pre-Treatment
- case Gui::GuiActionType::ID_StartTreatmentReq : INTERPRET_RECEIVED_MESSAGE(StartTreatmentRequestData ); break;
- case Gui::GuiActionType::ID_ConfirmTreatmentReq : INTERPRET_RECEIVED_MESSAGE(ConfirmTreatmentRequestData ); break;
- case Gui::GuiActionType::ID_CreateTreatmentReq : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData ); break;
+ case Gui::GuiActionType::ID_TreatmentStartReq : INTERPRET_RECEIVED_MESSAGE(TreatmentStartRequestData ); break;
+ case Gui::GuiActionType::ID_TreatmentConfirmReq : INTERPRET_RECEIVED_MESSAGE(TreatmentConfirmRequestData ); break;
+ case Gui::GuiActionType::ID_TreatmentCreateReq : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData ); break;
// alarms
case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData ); break;
case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_RECEIVED_MESSAGE(AlarmUserActionRequestData ); break;
@@ -343,7 +343,7 @@
case Gui::GuiActionType::ID_Acknow : ok = true; break; // TODO : implement notify<>()
case Gui::GuiActionType::ID_PowerOff : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PowerOff ); break;
case Gui::GuiActionType::ID_ShuttingDown : ok = true; LOG_EVENT("HD,ShuttingDown"); break; // TODO : implement notify<>()
- case Gui::GuiActionType::ID_CreateTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_CreateTreatmentRsp ); break;
+ case Gui::GuiActionType::ID_TreatmentCreateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentCreateRsp ); break;
// Adjustment Response Messages
case Gui::GuiActionType::ID_AdjustDurationRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp ); break;
@@ -362,7 +362,7 @@
case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = adjustUltrafiltrationEdit (vMessage, vData); break; // TODO : implement notify<>()
case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // TODO : implement notify<>()
- case Gui::GuiActionType::ID_StartTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_StartTreatmentRsp ); break;
+ case Gui::GuiActionType::ID_TreatmentStartRsp : ok = notify (vMessage, vData, Gui::GuiActionType::ID_TreatmentStartRsp ); break;
// Alarms
case Gui::GuiActionType::ID_AlarmStatus : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus ); break;
Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h
===================================================================
diff -u -r0b8e00869ef81ef0a834c03c13049f4c281870d2 -r179783b8085cac87e0fe9f247b475f2c64886174
--- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 0b8e00869ef81ef0a834c03c13049f4c281870d2)
+++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 179783b8085cac87e0fe9f247b475f2c64886174)
@@ -582,7 +582,7 @@
};
/*!
- * \brief The MStartTreatmentReq class
+ * \brief The MTreatmentStartReq class
* \details The model to request starting a treatment
*
* | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description |
@@ -594,7 +594,7 @@
* | #1:(U32) | \ref request |
*
*/
-class MStartTreatmentReq : public MModel {
+class MTreatmentStartReq : public MModel {
public:
enum Options {
eSelectParams = 0,
@@ -614,19 +614,19 @@
};
/*!
- * \brief The MConfirmTreatmentReq class
+ * \brief The MTreatmentConfirmReq class
* \details The model to tell HD treatment parameters have been confirmed
*
- * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description |
- * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:|
- * | 56 | 0x100 | 9 | Req | Y | UI | HD | Confirm Treatment Request |
+ * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description |
+ * |:-----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:|
+ * | 0x3B00| 0x100 | 9 | Req | Y | UI | HD | Confirm Treatment Request |
*
* | Payload ||
* | ||
* | #1:(U32) | \ref request |
*
*/
-class MConfirmTreatmentReq : public MModel {
+class MTreatmentConfirmReq : public MModel {
public:
enum Options {
eCancel = 0,
@@ -722,7 +722,6 @@
return MModel::toString("AdjustTreatmentParametersRequest", vParameters);
}
};
-
}
typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData;
@@ -738,8 +737,8 @@
typedef Model:: MAdjustRecirculateReq AdjustRecirculateRequestData;
typedef Model:: MAdjustTreatmentEndReq AdjustTreatmentEndRequestData;
typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData;
-typedef Model:: MStartTreatmentReq StartTreatmentRequestData;
-typedef Model:: MConfirmTreatmentReq ConfirmTreatmentRequestData;
+typedef Model:: MTreatmentStartReq TreatmentStartRequestData;
+typedef Model:: MTreatmentConfirmReq TreatmentConfirmRequestData;
typedef Model:: MAdjustTreatmentParametersReq AdjustTreatmentParametersRequestData;
typedef Model:: MAdjustVersionsReq AdjustVersionsRequestData;
// Alarms