Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r65558208e4968de9a5470ff5fda1ee2a9d00c793 -re125bd5cf13750eaf241d518b9c846139afaa81c --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 65558208e4968de9a5470ff5fda1ee2a9d00c793) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) @@ -269,7 +269,7 @@ case Gui::GuiActionType::ID_AdjustTreatmentLogReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentLogRequestData ); break; // Disinfection case Gui::GuiActionType::ID_AdjustDisinfectReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDisinfectRequestData ); break; - case Gui::GuiActionType::ID_AdjustDisinfectChemicalConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisinfectChemicalConfirmRequestData ); break; + case Gui::GuiActionType::ID_AdjustChemicalConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustChemicalConfirmRequestData ); break; // alarms case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData ); break; case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData ); break; @@ -403,6 +403,7 @@ // ----- 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); break; // TODO : implement notify<>() @@ -461,11 +462,9 @@ // ----- Datum - Pre-Treatment progress case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; // ----- Datum - Disinfection - case Gui::GuiActionType::ID_DisinfectDGFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGFlushData ); break; + case Gui::GuiActionType::ID_DisinfectDGFlushTimeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGFlushTimeData ); break; case Gui::GuiActionType::ID_DisinfectDGHeatTimeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGHeatTimeData ); break; - case Gui::GuiActionType::ID_DisinfectDGHeatTempData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGHeatTempData ); break; case Gui::GuiActionType::ID_DisinfectDGChemicalTimeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGChemicalTimeData ); break; - case Gui::GuiActionType::ID_DisinfectDGChemicalTBDData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGChemicalTBDData ); break; // ----- Datum - Disinfect States case Gui::GuiActionType::ID_DisinfectStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectStates ); break;