Index: denali.pro =================================================================== diff -u -r719d1f34d076dba98ec80e7d9b3994a58d54d720 -r5540e3a8ced92802b9c1576791185bc57b5edb48 --- denali.pro (.../denali.pro) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) +++ denali.pro (.../denali.pro) (revision 5540e3a8ced92802b9c1576791185bc57b5edb48) @@ -194,7 +194,6 @@ \ # ---------- Models - HD - Adjustment - Disinfeection sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h \ sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h \ - sources/model/hd/adjustment/disinfect/MDisinfectAdjustChemicalConfirmResponse.h \ \ # ---------- Models - HD - Data - Pre-Treatment - Progress sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h \ @@ -450,7 +449,6 @@ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp \ \ # ---------- Models - HD - Adjustment - Disinfection sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp \ - sources/model/hd/adjustment/disinfect/MDisinfectAdjustChemicalConfirmResponse.cpp \ \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.cpp \ sources/model/hd/data/MHDGeneralEvent.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r719d1f34d076dba98ec80e7d9b3994a58d54d720 -r5540e3a8ced92802b9c1576791185bc57b5edb48 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 5540e3a8ced92802b9c1576791185bc57b5edb48) @@ -242,7 +242,6 @@ // ---- Disinfect {Gui::GuiActionType::ID_AdjustDisinfectReq , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_AdjustDisinfectRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustChemicalConfirmRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_CANBusFaultCount , 1 }, {Gui::GuiActionType::ID_RawData , 255 }, Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r719d1f34d076dba98ec80e7d9b3994a58d54d720 -r5540e3a8ced92802b9c1576791185bc57b5edb48 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 5540e3a8ced92802b9c1576791185bc57b5edb48) @@ -513,8 +513,6 @@ case Gui::GuiActionType::ID_DisinfectStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectStates ); break; // ----- Disinfection - Adjust case Gui::GuiActionType::ID_AdjustDisinfectRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectRsp ); break; - case Gui::GuiActionType::ID_AdjustChemicalConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustChemicalConfirmRsp ); break; - // these need to be standard and use notify as well case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = adjustUltrafiltrationEdit (vMessage, vData); /* TODO : implement notify<>() */ break; case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); /* TODO : implement notify<>() */ break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r719d1f34d076dba98ec80e7d9b3994a58d54d720 -r5540e3a8ced92802b9c1576791185bc57b5edb48 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5540e3a8ced92802b9c1576791185bc57b5edb48) @@ -265,7 +265,6 @@ // Disinfect ID_AdjustDisinfectReq = 0x7F00, // 127 ID_AdjustDisinfectRsp = 0x8000, // 128 - ID_AdjustChemicalConfirmRsp = 0x8200, // 130 }; enum class GuiActionsData_Enum /*: quint8 QML does not support*/ { Index: sources/model/MModel.h =================================================================== diff -u -r719d1f34d076dba98ec80e7d9b3994a58d54d720 -r5540e3a8ced92802b9c1576791185bc57b5edb48 --- sources/model/MModel.h (.../MModel.h) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) +++ sources/model/MModel.h (.../MModel.h) (revision 5540e3a8ced92802b9c1576791185bc57b5edb48) @@ -138,7 +138,6 @@ // Disinfection #include "MDisinfectAdjustRequests.h" #include "MDisinfectAdjustResponse.h" -#include "MDisinfectAdjustChemicalConfirmResponse.h" /*! * \page MessageFlow Message interpretation Flow @@ -398,7 +397,6 @@ REGISTER_METATYPE( AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ REGISTER_METATYPE( AdjustDisinfectResponseData ) \ - REGISTER_METATYPE( AdjustChemicalConfirmResponseData ) \ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ @@ -522,7 +520,6 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustChemicalConfirmResponseData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ @@ -698,7 +695,6 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisinfectResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustChemicalConfirmResponseData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ @@ -957,7 +953,6 @@ ACTION_RECEIVE_SIGNAL( AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ ACTION_RECEIVE_SIGNAL( AdjustDisinfectResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustChemicalConfirmResponseData ) \ \ ACTION_RECEIVE_SIGNAL( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) \ Fisheye: Tag 5540e3a8ced92802b9c1576791185bc57b5edb48 refers to a dead (removed) revision in file `sources/model/hd/adjustment/disinfect/MDisinfectAdjustChemicalConfirmResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5540e3a8ced92802b9c1576791185bc57b5edb48 refers to a dead (removed) revision in file `sources/model/hd/adjustment/disinfect/MDisinfectAdjustChemicalConfirmResponse.h'. Fisheye: No comparison available. Pass `N' to diff?