Index: sources/canbus/messagedispatcher.cpp =================================================================== diff -u -r2437559b2d4cd4c2ac6a926b4f55652e55e1f616 -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 --- sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 2437559b2d4cd4c2ac6a926b4f55652e55e1f616) +++ sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) @@ -226,7 +226,7 @@ QVariantList mData; mData += vData.bloodFlow; mData += vData.dialysateFlow; - onActionTransmit(GuiActionType::AdjustBloodDialysateReq, mData); + onActionTransmit(GuiActionType::idAdjustBloodDialysateReq, mData); } /*! @@ -239,7 +239,7 @@ { QVariantList mData; mData += vData.duration; - onActionTransmit(GuiActionType::AdjustDurationReq, mData); + onActionTransmit(GuiActionType::idAdjustDurationReq, mData); } /*! @@ -252,7 +252,7 @@ { QVariantList mData; mData += vData.requestedState; - actionTransmit(GuiActionType::AdjustUltrafiltrationStateReq, mData); + actionTransmit(GuiActionType::idAdjustUltrafiltrationStateReq, mData); } /*! @@ -265,7 +265,7 @@ { QVariantList mData; mData += vData.volume; - onActionTransmit(GuiActionType::AdjustUltrafiltrationEditReq, mData); + onActionTransmit(GuiActionType::idAdjustUltrafiltrationEditReq, mData); } /*! @@ -279,7 +279,7 @@ QVariantList mData; mData += vData.volume; mData += vData.option; - onActionTransmit(GuiActionType::AdjustUltrafiltrationConfirmReq, mData); + onActionTransmit(GuiActionType::idAdjustUltrafiltrationConfirmReq, mData); } @@ -385,7 +385,7 @@ ok = true; GuiActionType mActionId = vMessage.actionId; switch (mActionId) { - case GuiActionType::Acknow: + case GuiActionType::idAcknow: LOG_EVENT(tr("HD,Ack Bak, Sq:%1").arg(mSequence)); #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId); @@ -400,7 +400,7 @@ qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckReq : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId); #endif // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak is immediately handled at the same place. - actionTransmit(GuiActionType::Acknow, {}, -mSequence); + actionTransmit(GuiActionType::idAcknow, {}, -mSequence); LOG_EVENT(tr("UI,Ack Bak, Sq:%1").arg(-mSequence)); #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(-mSequence).arg(vMessage.actionId);