Index: denali.pro =================================================================== diff -u -rc2db8058488d3c1242c1e6837721b6f0c4b7e48c -ra925df649b7f9cbf031e127aebd45f6f94e29284 --- denali.pro (.../denali.pro) (revision c2db8058488d3c1242c1e6837721b6f0c4b7e48c) +++ denali.pro (.../denali.pro) (revision a925df649b7f9cbf031e127aebd45f6f94e29284) @@ -231,7 +231,6 @@ \ # ---------- Models - DG - Data - Pre-Treatment - Progress sources/model/dg/data/pretreatment/MDGFilterFlushData.h \ \ # ---------- Models - DG - Data - Disinfect - Progress - sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDebugText.h \ sources/model/dg/data/MDGGeneralEvent.h \ @@ -488,7 +487,6 @@ \ # ---------- Models - DG - Data - Pre-Treatment - Progress sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp \ \ # ---------- Models - DG - Data - Disinfection - Progress - sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.cpp \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDebugText.cpp \ sources/model/dg/data/MDGGeneralEvent.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rc2db8058488d3c1242c1e6837721b6f0c4b7e48c -ra925df649b7f9cbf031e127aebd45f6f94e29284 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c2db8058488d3c1242c1e6837721b6f0c4b7e48c) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision a925df649b7f9cbf031e127aebd45f6f94e29284) @@ -244,7 +244,6 @@ {Gui::GuiActionType::ID_AdjustDisinfectRsp , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_AdjustChemicalConfirmReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustChemicalConfirmRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_DisinfectDGChemicalTimeData , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_CANBusFaultCount , 1 }, {Gui::GuiActionType::ID_RawData , 255 }, Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rc2db8058488d3c1242c1e6837721b6f0c4b7e48c -ra925df649b7f9cbf031e127aebd45f6f94e29284 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision c2db8058488d3c1242c1e6837721b6f0c4b7e48c) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision a925df649b7f9cbf031e127aebd45f6f94e29284) @@ -579,9 +579,6 @@ case Gui::GuiActionType::ID_DGConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGConductivityData ); break; // ----- Datum - Pre-Treatment progress case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; - // ----- Datum - Disinfection - case Gui::GuiActionType::ID_DisinfectDGChemicalTimeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGChemicalTimeData ); break; - // DG Response Messages case Gui::GuiActionType::ID_AdjustVersionsDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDGRsp ); break; case Gui::GuiActionType::ID_AdjustSerialDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDGRsp ); break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rc2db8058488d3c1242c1e6837721b6f0c4b7e48c -ra925df649b7f9cbf031e127aebd45f6f94e29284 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c2db8058488d3c1242c1e6837721b6f0c4b7e48c) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision a925df649b7f9cbf031e127aebd45f6f94e29284) @@ -267,7 +267,6 @@ ID_AdjustDisinfectRsp = 0x8000, // 128 ID_AdjustChemicalConfirmReq = 0x8100, // 129 ID_AdjustChemicalConfirmRsp = 0x8200, // 130 - ID_DisinfectDGChemicalTimeData = 0x8500, // 133 }; enum class GuiActionsData_Enum /*: quint8 QML does not support*/ { Index: sources/model/MModel.h =================================================================== diff -u -rc2db8058488d3c1242c1e6837721b6f0c4b7e48c -ra925df649b7f9cbf031e127aebd45f6f94e29284 --- sources/model/MModel.h (.../MModel.h) (revision c2db8058488d3c1242c1e6837721b6f0c4b7e48c) +++ sources/model/MModel.h (.../MModel.h) (revision a925df649b7f9cbf031e127aebd45f6f94e29284) @@ -139,7 +139,6 @@ #include "MDisinfectAdjustRequests.h" #include "MDisinfectAdjustResponse.h" #include "MDisinfectAdjustChemicalConfirmResponse.h" -#include "MDisinfectDGChemicalTimeData.h" /*! * \page MessageFlow Message interpretation Flow @@ -336,9 +335,6 @@ REGISTER_METATYPE( PreTreatmentSelfTestNoCartridgeData ) \ REGISTER_METATYPE( PreTreatmentSelfTestDryData ) \ REGISTER_METATYPE( PreTreatmentDisposablesPrimeData ) \ - /* Disinfection */ \ - REGISTER_METATYPE( DisinfectDGChemicalTimeData ) \ - \ /* Request */ \ /* Post-Treatment */ \ REGISTER_METATYPE( AdjustPatientDisconnectionConfirmRequestData ) \ @@ -511,8 +507,6 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentSelfTestNoCartridgeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentSelfTestDryData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentDisposablesPrimeData ) \ - /* Disinfection */ \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DisinfectDGChemicalTimeData ) \ /* Response */ \ /* Post-Treatment */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesRemovalConfirmResponseData ) \ @@ -690,8 +684,6 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentSelfTestNoCartridgeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentSelfTestDryData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentDisposablesPrimeData ) \ - /* Disinfection */ \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DisinfectDGChemicalTimeData ) \ /* Response */ \ /* Post-Treatment */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablesRemovalConfirmResponseData ) \ @@ -954,8 +946,6 @@ ACTION_RECEIVE_SIGNAL( PreTreatmentSelfTestNoCartridgeData ) \ ACTION_RECEIVE_SIGNAL( PreTreatmentSelfTestDryData ) \ ACTION_RECEIVE_SIGNAL( PreTreatmentDisposablesPrimeData ) \ - /* Disinfection */ \ - ACTION_RECEIVE_SIGNAL( DisinfectDGChemicalTimeData ) \ /* Response */ \ /* Post-Treatment */ \ ACTION_RECEIVE_SIGNAL( AdjustDisposablesRemovalConfirmResponseData ) \ Fisheye: Tag a925df649b7f9cbf031e127aebd45f6f94e29284 refers to a dead (removed) revision in file `sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag a925df649b7f9cbf031e127aebd45f6f94e29284 refers to a dead (removed) revision in file `sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h'. Fisheye: No comparison available. Pass `N' to diff?