Index: alarmMapping.sh =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r0c983aea7de7480e86739469f5a64ad18b244634 --- alarmMapping.sh (.../alarmMapping.sh) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ alarmMapping.sh (.../alarmMapping.sh) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -14,10 +14,16 @@ # @date (original) 11-May-2021 # ############################################################################ + +BRANCH="develop" +if ( test -n "$1" ); then + BRANCH="$1" +fi + echo "update the common repo" cd common if ( test -d .git ); then - git checkout staging + git checkout $BRANCH git pull fi cd .. Index: denali.pro.user =================================================================== diff -u -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3 -r0c983aea7de7480e86739469f5a64ad18b244634 --- denali.pro.user (.../denali.pro.user) (revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3) +++ denali.pro.user (.../denali.pro.user) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -172,7 +172,7 @@ true - + develop /home/denali/Projects/application/alarmMapping.sh %{sourceDir} Custom Process Step @@ -1213,7 +1213,7 @@ denali Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro - -l -q -d + --logOut --disable-timeout --disable-alarm-no-minimize --disable-unhandled-report 3768 false true @@ -1536,7 +1536,7 @@ 1 false - --disable-timeout --disable-alarm-no-minimize --disable-unhandled-report + --logOut --disable-timeout --disable-alarm-no-minimize --disable-unhandled-report 3768 false true Index: sources/canbus/CanInterface.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -250,7 +250,6 @@ .arg(_canInterface) .arg(mError) ; - qDebug() << _canStatus; } /*! Index: sources/canbus/FrameInterface.cpp =================================================================== diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision 301c0a2101eb9374145ae274c8d91460fc9a6a62) +++ sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -183,8 +183,8 @@ } else { channelGroup = ChannelGroup::eChannel_Ignores; } - debugChannel = true; - ok = gEnableDialinUnhandled; + debugChannel = ! gEnableDialinUnhandled; // if debug channel is true, the raw can message in logged in the service log. + ok = gEnableDialinUnhandled; // if ok is true then it will be interpreted as unhandled messages. break; case eChlid_HD_DG : @@ -278,7 +278,7 @@ void FrameInterface::onFrameTransmit(Can_Id vCan_Id, const QByteArray &vData) { appendHead(vCan_Id, vData); - // Test : qDebug() << _timestamp << "apnd #" << _txFrameList.count(); + // DEBUG: qDebug() << _timestamp << "apnd #" << _txFrameList.count(); } /*! @@ -289,7 +289,7 @@ { _transmitted = true; removeHead(); - // Test : qDebug() << _timestamp << "Sent #" << _txFrameList.count() << vCount; + // DEBUG: qDebug() << _timestamp << "Sent #" << _txFrameList.count() << vCount; } /*! @@ -299,10 +299,10 @@ void FrameInterface::timerEvent(QTimerEvent *) { static quint8 count = 0; - // Test : _timestamp = QTime::currentTime().toString("HH:mm:ss.zzz"); + // TEST : _timestamp = QTime::currentTime().toString("HH:mm:ss.zzz"); if (++count != _interval) return; - // Test : qDebug() << _timestamp; + // DEBUG: qDebug() << _timestamp; count = 0; _transmitted = false; trnsmtHead(); @@ -329,7 +329,7 @@ else { Frame frame = _txFrameList.first(); transmitFrame(frame.can_Id, frame.data); - // Test : qDebug() << _timestamp << "Tsmt #" << _txFrameList.count(); + // DEBUG: qDebug() << _timestamp << "Tsmt #" << _txFrameList.count(); } } Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r2d5e51a42abdf392801371aea2d2dbcb197a1da2 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 2d5e51a42abdf392801371aea2d2dbcb197a1da2) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -91,7 +91,7 @@ {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 }, // 1 parameters each 2bytes {Gui::GuiActionType::ID_DGHeatersData , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_DGTemperaturesData , 12 * 4 }, // 12 parameters each 4bytes + {Gui::GuiActionType::ID_DGTemperaturesData , 13 * 4 }, // 13 parameters each 4bytes {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_DGConductivityData , 5 * 4 }, // 9 parameters each 4bytes // HD Data Messages Index: sources/cloudsync/CloudSyncController.cpp =================================================================== diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 301c0a2101eb9374145ae274c8d91460fc9a6a62) +++ sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -389,7 +389,7 @@ // TODO: messages have to have a sequence. // if the seq is duplicate it will be ignored. // seq, id, payload - // qDebug() << vContent; + // DEBUG: qDebug() << vContent; bool ok = true; Message message; @@ -723,7 +723,7 @@ { QString source = QString(Storage::CloudSync_Base_Path_Name) + Storage::CloudSync_Credentials_Folder_Name; QFileInfoList fileInfos = QDir(source).entryInfoList(QDir::NoDotAndDotDot|QDir::Files); - if( ! fileInfos.isEmpty() ) { + if( fileInfos.isEmpty() ) { sendDeviceRegister(); } else { toLog(eError_CredentialEmpty,{}); // It is intentional that the vault folder path has not been sent to the log. Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -176,29 +176,31 @@ y: row(0) model: [ vDGTemperatures.inletPrimaryHeater .toFixed(2) , + vDGTemperatures.heatDisinfect .toFixed(2) , vDGTemperatures.outletPrimaryHeater .toFixed(2) , vDGTemperatures.conductivitySensor1 .toFixed(2) , vDGTemperatures.conductivitySensor2 .toFixed(2) , vDGTemperatures.outletRedundancy .toFixed(2) , vDGTemperatures.inletDialysate .toFixed(2) , vDGTemperatures.primaryHeaterThermoCouple .toFixed(2) , vDGTemperatures.trimmerHeaterThermoCouple .toFixed(2) , - vDGTemperatures.primaryHeaterColdJunction .toFixed(2) , - vDGTemperatures.trimmerHeaterColdJunction .toFixed(2) , + // vDGTemperatures.primaryHeaterColdJunction .toFixed(2) , + // vDGTemperatures.trimmerHeaterColdJunction .toFixed(2) , vDGTemperatures.primaryHeaterInternal .toFixed(2) , vDGTemperatures.trimmerHeaterInternal .toFixed(2) , ] label: [ "TPi" , + "THd" , "TPo" , "TD1" , "TD2" , "TRo" , "TDi" , "HP.Trm", "HR.Trm", - "HP.CJ" , - "HR.CJ" , + // "HP.CJ" , + // "HR.CJ" , "HP.Int", "HR.Int", ] @@ -399,19 +401,19 @@ y: row(0.0) width: 50 model: [ - vDGValvesStates.valveStates_01, - vDGValvesStates.valveStates_02, - vDGValvesStates.valveStates_03, - vDGValvesStates.valveStates_04, - vDGValvesStates.valveStates_05, - vDGValvesStates.valveStates_06, - vDGValvesStates.valveStates_07, - vDGValvesStates.valveStates_08, - vDGValvesStates.valveStates_09, - vDGValvesStates.valveStates_10, - vDGValvesStates.valveStates_11, - vDGValvesStates.valveStates_12, - vDGValvesStates.valveStates_13, + vDGValvesStates.valveStates_VRF , + vDGValvesStates.valveStates_VRI , + vDGValvesStates.valveStates_VRD , + vDGValvesStates.valveStates_VRO , + vDGValvesStates.valveStates_VPO , + vDGValvesStates.valveStates_VBF , + vDGValvesStates.valveStates_VRC , + vDGValvesStates.valveStates_VDR , + vDGValvesStates.valveStates_VPI , + vDGValvesStates.valveStates_VSP , + vDGValvesStates.valveStates_VR1 , + vDGValvesStates.valveStates_VR2 , + vDGValvesStates.valveStates_VPD , ] label: [ "VRF", @@ -426,7 +428,7 @@ "VSP", "VR1", "VR2", - "VRD", + "VPD", ] } Index: sources/model/dg/data/MDGTemperaturesData.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/model/dg/data/MDGTemperaturesData.cpp (.../MDGTemperaturesData.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/dg/data/MDGTemperaturesData.cpp (.../MDGTemperaturesData.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -20,6 +20,7 @@ { return { _data.mInletPrimaryHeater .value, + _data.mHeatDisinfect .value, _data.mOutletPrimaryHeater .value, _data.mConductivitySensor1 .value, _data.mConductivitySensor2 .value, @@ -37,6 +38,7 @@ bool MDGTemperatures::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mInletPrimaryHeater )) + if (GetValue(vByteArray, index, _data.mHeatDisinfect )) if (GetValue(vByteArray, index, _data.mOutletPrimaryHeater )) if (GetValue(vByteArray, index, _data.mConductivitySensor1 )) if (GetValue(vByteArray, index, _data.mConductivitySensor2 )) @@ -61,6 +63,7 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -71,6 +74,7 @@ MDGTemperatures::Data MDGTemperatures::data() const { Data data; data.mInletPrimaryHeater = _data.mInletPrimaryHeater .value; + data.mHeatDisinfect = _data.mHeatDisinfect .value; data.mOutletPrimaryHeater = _data.mOutletPrimaryHeater .value; data.mConductivitySensor1 = _data.mConductivitySensor1 .value; data.mConductivitySensor2 = _data.mConductivitySensor2 .value; Index: sources/model/dg/data/MDGTemperaturesData.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -36,18 +36,19 @@ * * | Payload || * | || - * | # 1:(F32) | \ref Data::mInletPrimaryHeater | - * | # 2:(F32) | \ref Data::mOutletPrimaryHeater | - * | # 3:(F32) | \ref Data::mConductivitySensor1 | - * | # 4:(F32) | \ref Data::mConductivitySensor2 | - * | # 5:(F32) | \ref Data::mOutletRedundancy | - * | # 6:(F32) | \ref Data::mInletDialysate | - * | # 7:(F32) | \ref Data::mPrimaryHeaterThermoCouple | - * | # 8:(F32) | \ref Data::mTrimmerHeaterThermoCouple | - * | # 9:(F32) | \ref Data::mPrimaryHeaterColdJunction | - * | #10:(F32) | \ref Data::mTrimmerHeaterColdJunction | - * | #11:(F32) | \ref Data::mPrimaryHeaterInternal | - * | #12:(F32) | \ref Data::mTrimmerHeaterInternal | + * | #01:(F32) | \ref Data::mInletPrimaryHeater | + * | #02:(F32) | \ref Data::mHeatDisinfect | + * | #03:(F32) | \ref Data::mOutletPrimaryHeater | + * | #04:(F32) | \ref Data::mConductivitySensor1 | + * | #05:(F32) | \ref Data::mConductivitySensor2 | + * | #06:(F32) | \ref Data::mOutletRedundancy | + * | #07:(F32) | \ref Data::mInletDialysate | + * | #08:(F32) | \ref Data::mPrimaryHeaterThermoCouple | + * | #09:(F32) | \ref Data::mTrimmerHeaterThermoCouple | + * | #10:(F32) | \ref Data::mPrimaryHeaterColdJunction | + * | #11:(F32) | \ref Data::mTrimmerHeaterColdJunction | + * | #12:(F32) | \ref Data::mPrimaryHeaterInternal | + * | #13:(F32) | \ref Data::mTrimmerHeaterInternal | * * \sa Data * @@ -72,17 +73,18 @@ struct { Types::F32 mInletPrimaryHeater ; /* 01 */ - Types::F32 mOutletPrimaryHeater ; /* 02 */ - Types::F32 mConductivitySensor1 ; /* 03 */ - Types::F32 mConductivitySensor2 ; /* 04 */ - Types::F32 mOutletRedundancy ; /* 05 */ - Types::F32 mInletDialysate ; /* 06 */ - Types::F32 mPrimaryHeaterThermoCouple ; /* 07 */ - Types::F32 mTrimmerHeaterThermoCouple ; /* 08 */ - Types::F32 mPrimaryHeaterColdJunction ; /* 09 */ - Types::F32 mTrimmerHeaterColdJunction ; /* 10 */ - Types::F32 mPrimaryHeaterInternal ; /* 11 */ - Types::F32 mTrimmerHeaterInternal ; /* 12 */ + Types::F32 mHeatDisinfect ; /* 02 */ + Types::F32 mOutletPrimaryHeater ; /* 03 */ + Types::F32 mConductivitySensor1 ; /* 04 */ + Types::F32 mConductivitySensor2 ; /* 05 */ + Types::F32 mOutletRedundancy ; /* 06 */ + Types::F32 mInletDialysate ; /* 07 */ + Types::F32 mPrimaryHeaterThermoCouple ; /* 08 */ + Types::F32 mTrimmerHeaterThermoCouple ; /* 09 */ + Types::F32 mPrimaryHeaterColdJunction ; /* 10 */ + Types::F32 mTrimmerHeaterColdJunction ; /* 11 */ + Types::F32 mPrimaryHeaterInternal ; /* 12 */ + Types::F32 mTrimmerHeaterInternal ; /* 13 */ } _data; public: @@ -93,6 +95,7 @@ struct Data { float mInletPrimaryHeater = 0; ///< Inlet primary heaters temperature + float mHeatDisinfect = 0; ///< Heat Disinfect temperature float mOutletPrimaryHeater = 0; ///< Outlet primary heaters temperature float mConductivitySensor1 = 0; ///< Conductivity sensor 1 temperature float mConductivitySensor2 = 0; ///< Conductivity sensor 2 temperature Index: sources/model/dg/data/MDGValvesStatesData.h =================================================================== diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision 301c0a2101eb9374145ae274c8d91460fc9a6a62) +++ sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -57,19 +57,20 @@ public: enum Flag { - eFlag_ValveStates_01 = 0, - eFlag_ValveStates_02 , - eFlag_ValveStates_03 , - eFlag_ValveStates_04 , - eFlag_ValveStates_05 , - eFlag_ValveStates_06 , - eFlag_ValveStates_07 , - eFlag_ValveStates_08 , - eFlag_ValveStates_09 , - eFlag_ValveStates_10 , - eFlag_ValveStates_11 , - eFlag_ValveStates_12 , - eFlag_ValveStates_13 , + eFlag_ValveStates_VRF = 0, ///< Valve Reservoir Fill + eFlag_ValveStates_VRI , ///< Valve Reservoir Inlet + eFlag_ValveStates_VRD , ///< Valve Reservoir Drain + eFlag_ValveStates_VRO , ///< Valve Reservoir Outlet + eFlag_ValveStates_VPO , ///< Valve Pressure Outlet + eFlag_ValveStates_VBF , ///< Valve Bypass Filter + eFlag_ValveStates_VRC , ///< Valve Recirculate + eFlag_ValveStates_VDR , ///< Valve Drain + eFlag_ValveStates_VPI , ///< Valve Pressure Inlet + eFlag_ValveStates_VSP , ///< Valve Sampling Port + eFlag_ValveStates_VR1 , ///< Valve Reservoir 1 Drain + eFlag_ValveStates_VR2 , ///< Valve Reservoir 2 Drain + eFlag_ValveStates_VPD , ///< Valve Production Drain + eFlag_Bits_Length = 16, }; Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r193097d35332dfc285f00afd34bc343ea13325d5 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 193097d35332dfc285f00afd34bc343ea13325d5) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 09-Mar-2022 + * \date (last) 10-Mar-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * Index: sources/storage/FileHandler.cpp =================================================================== diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision 301c0a2101eb9374145ae274c8d91460fc9a6a62) +++ sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -338,7 +338,7 @@ // checks if the total files size subtracted by the current file size will be less that limit // if it is breaks // else adds the file to the list and continues. - qDebug() << "%" << totalSizeStorage << totalSizeFiles << totalSizeRetain << totalSizeFiles - totalSizeRetain << vRetainPercent; + // DEBUG: qDebug() << "%" << totalSizeStorage << totalSizeFiles << totalSizeRetain << totalSizeFiles - totalSizeRetain << vRetainPercent; quint64 totalSizeRemoved = 0; for (auto it = fileInfoListAll.crbegin(); it != fileInfoListAll.crend(); ++it) { // (totalSizeFiles <= totalSizeRetain) has been checked above and didn't return; , Index: sources/storage/Logger.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -213,7 +213,7 @@ { if (vUseApplicationDirPath) { _dir.setPath(qApp->applicationDirPath()); - // Do not use LOG_XXXXX, At this moment Logger has not been initialized yet + // NOTE: Do not use LOG_XXXXX, At this moment Logger has not been initialized yet qDebug() << QString("Application path used for events logging (%1)").arg(_dir.path()); } else { Index: sources/storage/Settings.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/storage/Settings.cpp (.../Settings.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/storage/Settings.cpp (.../Settings.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -117,7 +117,7 @@ } } } - // qDebug() << group << line; + // DEBUG: qDebug() << group << line; } } return 0; Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 301c0a2101eb9374145ae274c8d91460fc9a6a62) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -63,7 +63,7 @@ { // Formatted values QString mStrText = "%1"; - // qDebug() << _Settings.groups(); + // DEBUG: qDebug() << _Settings.groups(); // SRSUI910 : PRS178 : Clinical - Data - Order Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -252,7 +252,7 @@ emit fwValidationFailed(""); } - qDebug() << "fw validation success = " << success; + // DEBUG: qDebug() << "fw validation success = " << success; if (success) { Index: sources/view/dg/data/VDGTemperaturesData.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/view/dg/data/VDGTemperaturesData.cpp (.../VDGTemperaturesData.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/dg/data/VDGTemperaturesData.cpp (.../VDGTemperaturesData.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -8,7 +8,7 @@ * \file VDGTemperaturesData.cpp * \author (last) Behrouz NematiPour * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour + * \author (original) Behrouz NematiPour * \date (original) 02-Jul-2020 * */ @@ -22,6 +22,7 @@ void VDGTemperatures::onActionReceive(const DGTemperaturesData &vData) { inletPrimaryHeater ( vData.mInletPrimaryHeater ); + heatDisinfect ( vData.mHeatDisinfect ); outletPrimaryHeater ( vData.mOutletPrimaryHeater ); conductivitySensor1 ( vData.mConductivitySensor1 ); conductivitySensor2 ( vData.mConductivitySensor2 ); Index: sources/view/dg/data/VDGTemperaturesData.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -37,6 +37,7 @@ Q_OBJECT PROPERTY( float , inletPrimaryHeater , 0) + PROPERTY( float , heatDisinfect , 0) PROPERTY( float , outletPrimaryHeater , 0) PROPERTY( float , conductivitySensor1 , 0) PROPERTY( float , conductivitySensor2 , 0) Index: sources/view/dg/data/VDGValvesStatesData.cpp =================================================================== diff -u -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/view/dg/data/VDGValvesStatesData.cpp (.../VDGValvesStatesData.cpp) (revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3) +++ sources/view/dg/data/VDGValvesStatesData.cpp (.../VDGValvesStatesData.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -21,19 +21,19 @@ void VDGValvesStates::onActionReceive(const DGValvesStatesData &vData) { - valveStates_01 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_01 )); - valveStates_02 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_02 )); - valveStates_03 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_03 )); - valveStates_04 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_04 )); - valveStates_05 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_05 )); - valveStates_06 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_06 )); - valveStates_07 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_07 )); - valveStates_08 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_08 )); - valveStates_09 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_09 )); - valveStates_10 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_10 )); - valveStates_11 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_11 )); - valveStates_12 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_12 )); - valveStates_13 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_13 )); + valveStates_VRF ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRF )); + valveStates_VRI ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRI )); + valveStates_VRD ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRD )); + valveStates_VRO ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRO )); + valveStates_VPO ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VPO )); + valveStates_VBF ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VBF )); + valveStates_VRC ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRC )); + valveStates_VDR ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VDR )); + valveStates_VPI ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VPI )); + valveStates_VSP ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VSP )); + valveStates_VR1 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VR1 )); + valveStates_VR2 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VR2 )); + valveStates_VPD ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VPD )); // Trigger should be the last refresh(true); @@ -43,18 +43,18 @@ { // order changed in reverse by request. QString text = QString() + - (valveStates_13() ? "1" : "0" ) + "" + - (valveStates_12() ? "1" : "0" ) + "" + - (valveStates_11() ? "1" : "0" ) + "" + - (valveStates_10() ? "1" : "0" ) + "" + - (valveStates_09() ? "1" : "0" ) + "" + - (valveStates_08() ? "1" : "0" ) + "" + - (valveStates_07() ? "1" : "0" ) + "" + - (valveStates_06() ? "1" : "0" ) + "" + - (valveStates_05() ? "1" : "0" ) + "" + - (valveStates_04() ? "1" : "0" ) + "" + - (valveStates_03() ? "1" : "0" ) + "" + - (valveStates_02() ? "1" : "0" ) + "" + - (valveStates_01() ? "1" : "0" ); + (valveStates_VRF () ? "1" : "0" ) + "" + + (valveStates_VRI () ? "1" : "0" ) + "" + + (valveStates_VRD () ? "1" : "0" ) + "" + + (valveStates_VRO () ? "1" : "0" ) + "" + + (valveStates_VPO () ? "1" : "0" ) + "" + + (valveStates_VBF () ? "1" : "0" ) + "" + + (valveStates_VRC () ? "1" : "0" ) + "" + + (valveStates_VDR () ? "1" : "0" ) + "" + + (valveStates_VPI () ? "1" : "0" ) + "" + + (valveStates_VSP () ? "1" : "0" ) + "" + + (valveStates_VR1 () ? "1" : "0" ) + "" + + (valveStates_VR2 () ? "1" : "0" ) + "" + + (valveStates_VPD () ? "1" : "0" ); return text; } Index: sources/view/dg/data/VDGValvesStatesData.h =================================================================== diff -u -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3) +++ sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -40,19 +40,19 @@ TRIGGER ( bool , refresh , false) // coco end - PROPERTY( quint8 , valveStates_01 , 0 ) - PROPERTY( quint8 , valveStates_02 , 0 ) - PROPERTY( quint8 , valveStates_03 , 0 ) - PROPERTY( quint8 , valveStates_04 , 0 ) - PROPERTY( quint8 , valveStates_05 , 0 ) - PROPERTY( quint8 , valveStates_06 , 0 ) - PROPERTY( quint8 , valveStates_07 , 0 ) - PROPERTY( quint8 , valveStates_08 , 0 ) - PROPERTY( quint8 , valveStates_09 , 0 ) - PROPERTY( quint8 , valveStates_10 , 0 ) - PROPERTY( quint8 , valveStates_11 , 0 ) - PROPERTY( quint8 , valveStates_12 , 0 ) - PROPERTY( quint8 , valveStates_13 , 0 ) + PROPERTY( quint8 , valveStates_VRF , 0 ) + PROPERTY( quint8 , valveStates_VRI , 0 ) + PROPERTY( quint8 , valveStates_VRD , 0 ) + PROPERTY( quint8 , valveStates_VRO , 0 ) + PROPERTY( quint8 , valveStates_VPO , 0 ) + PROPERTY( quint8 , valveStates_VBF , 0 ) + PROPERTY( quint8 , valveStates_VRC , 0 ) + PROPERTY( quint8 , valveStates_VDR , 0 ) + PROPERTY( quint8 , valveStates_VPI , 0 ) + PROPERTY( quint8 , valveStates_VSP , 0 ) + PROPERTY( quint8 , valveStates_VR1 , 0 ) + PROPERTY( quint8 , valveStates_VR2 , 0 ) + PROPERTY( quint8 , valveStates_VPD , 0 ) Q_PROPERTY(QString text READ text NOTIFY refreshTriggered) Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r0c983aea7de7480e86739469f5a64ad18b244634 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 0c983aea7de7480e86739469f5a64ad18b244634) @@ -171,7 +171,7 @@ void View::VTreatmentVitals::timerEvent(QTimerEvent *) { // TODO: Change the logic of the timer to count down instead of count up and reset to interval on 0. - qDebug() << __FUNCTION__ << _timerCounter; + // DEBUG: qDebug() << __FUNCTION__ << _timerCounter; if ( _interval == _timerCounter ) { timerReset(); emit didTrigger();