Index: sources/applicationcontroller.h =================================================================== diff -u -r93b6ad6b18c505fedab37d95dc87be61db48641c -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/applicationcontroller.h (.../applicationcontroller.h) (revision 93b6ad6b18c505fedab37d95dc87be61db48641c) +++ sources/applicationcontroller.h (.../applicationcontroller.h) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -27,7 +27,7 @@ // define #define _ApplicationController ApplicationController::I() -// forward diclations +// forward declarations class tst_initializations; // namespace Index: sources/applicationpost.cpp =================================================================== diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/applicationpost.cpp (.../applicationpost.cpp) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) +++ sources/applicationpost.cpp (.../applicationpost.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file applicationpost.cpp * \author (last) Behrouz NematiPour * \date (last) 13-Apr-2020 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 - * + * */ #include "applicationpost.h" @@ -32,7 +32,7 @@ bool ApplicationPost::start() { - // coco begin validated: Is a placeholder and has not beed implemented yet + // coco begin validated: Is a placeholder and has not been implemented yet return true; } // coco end Index: sources/canbus/caninterface.cpp =================================================================== diff -u -red5d989264015440d9da6d0830679394a323cf55 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/canbus/caninterface.cpp (.../caninterface.cpp) (revision ed5d989264015440d9da6d0830679394a323cf55) +++ sources/canbus/caninterface.cpp (.../caninterface.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -106,7 +106,7 @@ /*! * \brief CanInterface::enableConsoleOut * \details Enable or Disables the console output and logs the status - * \param vEnabled - Enalbe console output if true + * \param vEnabled - Enable console output if true */ void CanInterface::enableConsoleOut(bool vEnabled) { // coco begin validated: This code meant to be used only for debugging and tested manually Index: sources/canbus/caninterface.h =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/canbus/caninterface.h (.../caninterface.h) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/canbus/caninterface.h (.../caninterface.h) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -1,144 +1,144 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file caninterface.h * \author (last) Behrouz NematiPour * \date (last) 02-Mar-2020 * \author (original) Behrouz NematiPour * \date (original) 28-Oct-2019 - * + * */ -#pragma once - -// Qt -#include -#include - -// Project -#include "main.h" -#include "messageglobals.h" - - -// Define -#define _CanInterface Can::CanInterface::I() - -// forward declarations -class tst_canbus; -class tst_acknow; - -// namespace -namespace Can { - -/*! - * \brief CANBUS interface - * \details This class contains the interface to CANBUS - * And utilizes Qt QCanBus to interact with the CANBUS - * This class works only with the QCanBusFrame frames. - * On the OS side there is a driver installed to convert SPI to CAN - * Since the GUI Board by itself doesn't contain the CAN Bus. - * Application would know nothing about the SPI-TO-CAN - */ -class CanInterface : public QObject -{ - Q_OBJECT - - // friends - friend class ::tst_canbus; - friend class ::tst_acknow; - - // constants - const char *_canType = "socketcan"; - QString _canInterface = "can0"; - const int _canBitRate = 250000; - - // member variables - QCanBusDevice *_canDevice = nullptr; - QString _canStatus = ""; - bool _enableConsoleOut = false; - - QThread *_thread = nullptr; - bool _init = false; - - FrameCount _rxFrameCount = 0; - FrameCount _txFrameCount = 0; - FrameCount _erFrameCount = 0; - -// Singleton -SINGLETON(CanInterface) - -public slots: - bool init(); - bool init(QThread &vThread); - -private slots: - void quit(); - -public: - QString status() const; - void enableConsoleOut(bool vEnabled); - - void quitDevice(); -private: - void initConnections(); - - void initThread(QThread &vThread); - void quitThread(); - - bool initDevice(); - bool testDevice(); - - void status (const QString &vDescription, QString vError = ""); - bool transmit (const QCanBusFrame &vFrame); - void consoleOut (const QCanBusFrame &vFrame, const QString &vFrameCount); - - FrameCount rxCount(); - FrameCount txCount(); - FrameCount erCount(); - - static QString frameFlags(const QCanBusFrame &vFrame); - -signals: - /*! - * \brief didFrameReceive - * \details This signal will be emitted when a frame has been received - * \param vFrame - The Frame which has been received - */ - void didFrameReceive (const QCanBusFrame &vFrame ); - - /*! - * \brief didFrameError - * \details If and error occurs on CanDevice after the error is processed - * this signal can be used as a notifier. - * \param vStatus - CanDevice status with some extra information. - */ - void didFrameError (const QString &vStatus); - - /*! - * \brief didFrameTransmit - * \details After the frame has been transmitted this signal can be used as a notifier. - * \param ok - is true if the frame has been transmitted successfully - */ - void didFrameTransmit(bool ok); - - /*! - * \brief didFrameWritten - * \details After the frame transmission is done - * and acknowledged by a node on the CANBus, - * this signal is emmited. - * \param vCount is the number of frame which has been written - */ - void didFrameWritten(qint64 vCount); - -public slots: -private slots: - void onFrameTransmit (const QCanBusFrame &vFrame); - void onFrameReceive (); - void onFrameError (QCanBusDevice::CanBusError vError); - void onFrameWritten (qint64 vFramesCount); - -}; -} +#pragma once + +// Qt +#include +#include + +// Project +#include "main.h" +#include "messageglobals.h" + + +// Define +#define _CanInterface Can::CanInterface::I() + +// forward declarations +class tst_canbus; +class tst_acknow; + +// namespace +namespace Can { + +/*! + * \brief CANBUS interface + * \details This class contains the interface to CANBUS + * And utilizes Qt QCanBus to interact with the CANBUS + * This class works only with the QCanBusFrame frames. + * On the OS side there is a driver installed to convert SPI to CAN + * Since the GUI Board by itself doesn't contain the CAN Bus. + * Application would know nothing about the SPI-TO-CAN + */ +class CanInterface : public QObject +{ + Q_OBJECT + + // friends + friend class ::tst_canbus; + friend class ::tst_acknow; + + // constants + const char *_canType = "socketcan"; + QString _canInterface = "can0"; + const int _canBitRate = 250000; + + // member variables + QCanBusDevice *_canDevice = nullptr; + QString _canStatus = ""; + bool _enableConsoleOut = false; + + QThread *_thread = nullptr; + bool _init = false; + + FrameCount _rxFrameCount = 0; + FrameCount _txFrameCount = 0; + FrameCount _erFrameCount = 0; + +// Singleton +SINGLETON(CanInterface) + +public slots: + bool init(); + bool init(QThread &vThread); + +private slots: + void quit(); + +public: + QString status() const; + void enableConsoleOut(bool vEnabled); + + void quitDevice(); +private: + void initConnections(); + + void initThread(QThread &vThread); + void quitThread(); + + bool initDevice(); + bool testDevice(); + + void status (const QString &vDescription, QString vError = ""); + bool transmit (const QCanBusFrame &vFrame); + void consoleOut (const QCanBusFrame &vFrame, const QString &vFrameCount); + + FrameCount rxCount(); + FrameCount txCount(); + FrameCount erCount(); + + static QString frameFlags(const QCanBusFrame &vFrame); + +signals: + /*! + * \brief didFrameReceive + * \details This signal will be emitted when a frame has been received + * \param vFrame - The Frame which has been received + */ + void didFrameReceive (const QCanBusFrame &vFrame ); + + /*! + * \brief didFrameError + * \details If and error occurs on CanDevice after the error is processed + * this signal can be used as a notifier. + * \param vStatus - CanDevice status with some extra information. + */ + void didFrameError (const QString &vStatus); + + /*! + * \brief didFrameTransmit + * \details After the frame has been transmitted this signal can be used as a notifier. + * \param ok - is true if the frame has been transmitted successfully + */ + void didFrameTransmit(bool ok); + + /*! + * \brief didFrameWritten + * \details After the frame transmission is done + * and acknowledged by a node on the CANBus, + * this signal is emitted. + * \param vCount is the number of frame which has been written + */ + void didFrameWritten(qint64 vCount); + +public slots: +private slots: + void onFrameTransmit (const QCanBusFrame &vFrame); + void onFrameReceive (); + void onFrameError (QCanBusDevice::CanBusError vError); + void onFrameWritten (qint64 vFramesCount); + +}; +} Index: sources/canbus/frameinterface.cpp =================================================================== diff -u -red5d989264015440d9da6d0830679394a323cf55 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/canbus/frameinterface.cpp (.../frameinterface.cpp) (revision ed5d989264015440d9da6d0830679394a323cf55) +++ sources/canbus/frameinterface.cpp (.../frameinterface.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -266,7 +266,7 @@ /*! * \brief FrameInterface::timerEvent - * \details This event handler is reimplemented in this subclass to receive timer events for this object. + * \details This event handler is re-implemented in this subclass to receive timer events for this object. */ void FrameInterface::timerEvent(QTimerEvent *) { @@ -282,9 +282,9 @@ /*! * \brief FrameInterface::trnsmtHead - * \details Transmits the head of the trasmit buffer - * Sends an empty frame with lowest prioriority if the transmit buffer is empty - * to keep the UI board CANDriver awake. + * \details Transmits the head of the transmit buffer + * Sends an empty frame with lowest priority if the transmit buffer is empty + * to keep the UI board Can-driver awake. */ void FrameInterface::trnsmtHead() { @@ -329,7 +329,7 @@ void FrameInterface::appendHead(Can_Id vCan_Id, const QByteArray &vData) { Frame frame = Frame(vCan_Id, vData); - // coco begin validated: has been manually tested by sending over 4000 frames and not received by anyother node. + // coco begin validated: has been manually tested by sending over 4000 frames and not received by any other node. if (_txFrameList.count() >= _txFrameList_Max) { LOG_DEBUG(QString("Transmit buffer overflow of %1").arg(_txFrameList_Max)); return; Index: sources/canbus/messageglobals.h =================================================================== diff -u -r7c2a96774285bb618946f125763bf7bea7acadd8 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/canbus/messageglobals.h (.../messageglobals.h) (revision 7c2a96774285bb618946f125763bf7bea7acadd8) +++ sources/canbus/messageglobals.h (.../messageglobals.h) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -188,15 +188,15 @@ // coco begin validated:Has been validated manually. // Since the crc is part of the data and there is no message without crc // initialized flag and data.length() == 0 became the same. - // I preffer too keep it as it is so the initialization would be independent of the data. + // It's been preferred too keep it as it is so the initialization would be independent of the data. return !initialized || !data.length(); // coco end } bool isComplete() { // coco begin validated:Has been validated manually. // Since the crc is part of the data and there is no message without crc // then a message would never be empty. - // I preffer too keep it as it is so the initialization would be independent of the data. + // I prefer too keep it as it is so the initialization would be independent of the data. return !isEmpty() && data.length() == length; // coco end } Index: sources/gui/guicontroller.cpp =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/gui/guicontroller.cpp (.../guicontroller.cpp) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/gui/guicontroller.cpp (.../guicontroller.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file guicontroller.cpp * \author (last) Peter Lucia * \date (last) 25-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 - * + * */ #include "guicontroller.h" @@ -284,7 +284,7 @@ /*! * \brief GuiController::didFailedTransmit - * Raises an HD communiation timeout alarm if communication with HD is lost. + * Raises an HD communication timeout alarm if communication with HD is lost. * \param seq - Sequence that failed to transmit */ void GuiController::didFailedTransmit(Sequence seq) Index: sources/gui/guiglobals.cpp =================================================================== diff -u -r9a7be58dc7d9d8a2b502a91b684dd4b046b6a96a -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision 9a7be58dc7d9d8a2b502a91b684dd4b046b6a96a) +++ sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -100,7 +100,7 @@ QObject::connect(_viewer, &QQuickView::statusChanged, qApp, [=](QQuickView::Status vStatus) { // coco begin validated: this portion of the code is handling application initialization - // and if not initialized correctly will terminate the applicaiton . + // and if not initialized correctly will terminate the application . // So it had been manually tested. bool ok = vStatus == QQuickView::Ready; if (ok) { Index: sources/gui/guiglobals.h =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/gui/guiglobals.h (.../guiglobals.h) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file guiglobals.h * \author (last) Peter Lucia * \date (last) 25-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 28-Oct-2019 - * + * */ #pragma once @@ -35,7 +35,7 @@ * *** So it has to be converted, each time it is referenced. ***\n * *** Since an enum is a constant value, ***\n * *** There is no point in calculating it on each reference. ***\n - * *** Therefore it is preffered to keep them as constant values ***\n + * *** Therefore it is preferred to keep them as constant values ***\n * *** Exactly as it is going to be shown/used in denali messages ***\n * *** then it can be compared exactly the way it is with no conversion.***\n */ Index: sources/gui/guiview.cpp =================================================================== diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/gui/guiview.cpp (.../guiview.cpp) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) +++ sources/gui/guiview.cpp (.../guiview.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file guiview.cpp * \author (last) Behrouz NematiPour * \date (last) 21-May-2020 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 - * + * */ #include "guiview.h" @@ -87,7 +87,7 @@ */ void GuiView::doActionTransmit(GuiActionType vAction, const QVariantList &vData) { - // TODO : Remove this code later when Investigated throughly. + // TODO : Remove this code later when Investigated thoroughly. // coco begin validated: This code later needs to be removed when Investigated thoroughly. // has been tested manually emit didActionTransmit(vAction, vData); @@ -105,8 +105,8 @@ void GuiView::doActionTransmit(GuiActionType vAction, const QVariant &vData) { - // TODO : Remove this code later when Investigated throughly. - // coco begin validated: This code later needs to be removed when Investigated throughly. + // TODO : Remove this code later when Investigated thoroughly. + // coco begin validated: This code later needs to be removed when Investigated thoroughly. // has been tested manually QVariantList mData; mData += vData; Index: sources/model/MAbstract.cpp =================================================================== diff -u -r15de0cd12dad1ea5107c52e5ed89280bc9e29b1d -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/model/MAbstract.cpp (.../MAbstract.cpp) (revision 15de0cd12dad1ea5107c52e5ed89280bc9e29b1d) +++ sources/model/MAbstract.cpp (.../MAbstract.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -22,8 +22,8 @@ /*! * \brief MAbstract::toVariantList - * \details Currnet values of the model data will be listed in a QVariantList vData. - * It has been mostly been used for debugging with the Generic onAcitonRecived which has the QVariantList as the signal parameter. + * \details Current values of the model data will be listed in a QVariantList vData. + * It has been mostly been used for debugging with the Generic onActionReceived which has the QVariantList as the signal parameter. * \param vData - The output data of the QVariantList */ void MAbstract::toVariantList(QVariantList &vData) const { Index: sources/model/MAbstract.h =================================================================== diff -u -r3aab84456cfbdc4c4f495975ba9b8968eb844309 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/model/MAbstract.h (.../MAbstract.h) (revision 3aab84456cfbdc4c4f495975ba9b8968eb844309) +++ sources/model/MAbstract.h (.../MAbstract.h) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -53,7 +53,7 @@ public: - // the model needs to implement these since each model have different meaning of the bytes from differnet souce(unit). + // the model needs to implement these since each model have different meaning of the bytes from different source(unit). virtual bool fromByteArray(const QByteArray &vByteArray , int *vIndex = nullptr) = 0; virtual Type_Enum typeText ( ) const = 0; virtual Unit_Enum unitText ( ) const = 0; Index: sources/model/MDGDebugText.cpp =================================================================== diff -u -r15de0cd12dad1ea5107c52e5ed89280bc9e29b1d -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/model/MDGDebugText.cpp (.../MDGDebugText.cpp) (revision 15de0cd12dad1ea5107c52e5ed89280bc9e29b1d) +++ sources/model/MDGDebugText.cpp (.../MDGDebugText.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -22,7 +22,7 @@ } bool MDGDebugText::fromByteArray(const QByteArray &vByteArray, int *) { - // since this is a varable length debug text, it is not required to check for length + // since this is a variable length debug text, it is not required to check for length // Qt simple conversion is used. _data = qPrintable(vByteArray); // Has to be printable return true ; Index: sources/model/MHDDebugText.cpp =================================================================== diff -u -r15de0cd12dad1ea5107c52e5ed89280bc9e29b1d -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/model/MHDDebugText.cpp (.../MHDDebugText.cpp) (revision 15de0cd12dad1ea5107c52e5ed89280bc9e29b1d) +++ sources/model/MHDDebugText.cpp (.../MHDDebugText.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -22,7 +22,7 @@ } bool MHDDebugText::fromByteArray(const QByteArray &vByteArray, int *) { - // since this is a varable length debug text, it is not required to check for length + // since this is a variable length debug text, it is not required to check for length // Qt simple conversion is used. _data = qPrintable(vByteArray); // Has to be printable return true ; Index: sources/model/MModel.h =================================================================== diff -u -r15de0cd12dad1ea5107c52e5ed89280bc9e29b1d -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/model/MModel.h (.../MModel.h) (revision 15de0cd12dad1ea5107c52e5ed89280bc9e29b1d) +++ sources/model/MModel.h (.../MModel.h) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -64,7 +64,7 @@ * \endcode * * 3 - MSG Payload Len : - * Add a line in the "messageglobals.h" in paloadLen hash table + * Add a line in the "messageglobals.h" in payloadLen hash table * to define the required payload length of the message * * 4 - Model Implementation : Index: sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h =================================================================== diff -u -r3aab84456cfbdc4c4f495975ba9b8968eb844309 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h (.../MTreatmentAdjustBloodDialysateResponse.h) (revision 3aab84456cfbdc4c4f495975ba9b8968eb844309) +++ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h (.../MTreatmentAdjustBloodDialysateResponse.h) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -43,7 +43,7 @@ Type_Enum typeText () const override { return Type_Enum::eEvent ; } Unit_Enum unitText () const override { return Unit_Enum::eHD ; } - QString infoText () const override { return QString("AdjustBloodDialisate"); } + QString infoText () const override { return QString("AdjustBloodDialysate"); } struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r93b6ad6b18c505fedab37d95dc87be61db48641c -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 93b6ad6b18c505fedab37d95dc87be61db48641c) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -25,8 +25,8 @@ /*! * Simple request models - * These are models to send the request for the doAdjustmet - * The the only reason thy have been defined to help overloadding the adjusmtent methods + * These are models to send the request for the doAdjustment + * The the only reason thy have been defined to help overloading the adjustment methods * Otherwise the parameters are so tiny models. */ @@ -67,7 +67,7 @@ } // coco end static QString toString(const QVariantList &vParameters) { - return MModel::toString("AdjustBloodDialisate", vParameters); + return MModel::toString("AdjustBloodDialysate", vParameters); } }; Index: sources/model/hd/data/MTreatmentTimeData.h =================================================================== diff -u -raa0772fe1b0ff6b07e9f64e8c38acad66ad5468d -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/model/hd/data/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision aa0772fe1b0ff6b07e9f64e8c38acad66ad5468d) +++ sources/model/hd/data/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -43,7 +43,7 @@ Type_Enum typeText () const override { return Type_Enum::eDatum ; } Unit_Enum unitText () const override { return Unit_Enum::eHD ; } - QString infoText () const override { return QString("TreamtmentTime"); } + QString infoText () const override { return QString("TreatmentTime"); } struct Data { quint32 mTotal = 0; /*!< Total treatment time in sec */ Index: sources/storage/DriveWatcher.cpp =================================================================== diff -u -r4cdc58eeac133511c98a1a6cc0d0839dd770e1d9 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/storage/DriveWatcher.cpp (.../DriveWatcher.cpp) (revision 4cdc58eeac133511c98a1a6cc0d0839dd770e1d9) +++ sources/storage/DriveWatcher.cpp (.../DriveWatcher.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -158,7 +158,7 @@ * \param vPath - Device mount point * \param vTotalBytes - Total volume size in bytes * \param vAvailableBytes - Size (in bytes) available for the current user - * \param vPercent - The percentage of availabe spcae + * \param vPercent - The percentage of available space * \return - The drive mounted and ready * \note if device ejected manually system assumes it's still ready. */ @@ -221,7 +221,7 @@ quint8 mPercent ; - // OLd Info ; // Current info + // Old Info ; // Current info static bool mOIsReady ; bool mCIsReady ; static qint64 mOTotal ; qint64 mCTotal ; static qint64 mOAvailable; qint64 mCAvailable; Index: sources/storage/DriveWatcher.h =================================================================== diff -u -r8824bacaeb6cb2479cd2ea84cd52a69ba38a65ce -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/storage/DriveWatcher.h (.../DriveWatcher.h) (revision 8824bacaeb6cb2479cd2ea84cd52a69ba38a65ce) +++ sources/storage/DriveWatcher.h (.../DriveWatcher.h) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -23,7 +23,7 @@ // Define #define _DriveWatcher Storage::DriveWatcher::I() -// forward diclations +// forward declarations class tst_initializations; namespace Storage { @@ -104,14 +104,14 @@ * It returns the total size available if the user is the root user or a system administrator. * This size can be less than or equal to the free size returned by bytesFree() function. * Returns -1 if QStorageInfo object is not valid. - * \param vPercent - The percentage of availabe spcae. - * \note Will emitted if only one of the publishing paramter changes. + * \param vPercent - The percentage of available space. + * \note Will emitted if only one of the publishing parameter changes. */ void didSDCardSpaceChange(bool vReady, qint64 vTotal, qint64 vAvailable, quint8 vPercent); /*! * \brief didSDCardSpaceRemove - * \details If sdcard removed or is not present this siganl will emit. + * \details If sdcard removed or is not present this signal will emit. */ void didSDCardSpaceRemove(); Index: sources/storage/filehandler.cpp =================================================================== diff -u -rbf645acccabb7b5a84801620c4f7fa0b0e6878e0 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/storage/filehandler.cpp (.../filehandler.cpp) (revision bf645acccabb7b5a84801620c4f7fa0b0e6878e0) +++ sources/storage/filehandler.cpp (.../filehandler.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -49,7 +49,7 @@ QFile::OpenMode openMode = vAppend ? QFile::Text | QFile::Append : QFile::Text | QFile::WriteOnly; - // coco begin validated : This has been manually test. Needs filesystem access to make file the way it can't be opened for writing. + // coco begin validated : This has been manually test. Needs file system access to make file the way it can't be opened for writing. if (! file.open(openMode)) { QString msg = QString("Can't open file for write (%1).Possible corrupted file system").arg(vFileName); errOut (msg); @@ -150,7 +150,7 @@ * \brief FileHandler::makeFolder * \details Create the folder vFolder if it doesn't exist. * \param vFolder - the folder to create - * \return true on successfull creation + * \return true on successful creation */ bool FileHandler::makeFolder(const QString &vFolder) { Index: sources/storage/logger.h =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/storage/logger.h (.../logger.h) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/storage/logger.h (.../logger.h) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file logger.h * \author (last) Behrouz NematiPour * \date (last) 04-Feb-2020 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 - * + * */ #pragma once @@ -62,7 +62,7 @@ public : enum LogType { - eLogDebug, ///< Application Error : CANBus messages doesn't have error it's Evnet/Data only + eLogDebug, ///< Application Error : CANBus messages doesn't have error it's Event/Data only eLogEvent, ///< Massages on the CANBus : Error is an event type eLogDatum, ///< Massages on the CANBus : Broadcast data type @@ -151,7 +151,7 @@ // ----- Remove Old Logs structure private: int removeLogs(); -private slots: // this slot is thread safe and can be called from outside but preffered not to. +private slots: // this slot is thread safe and can be called from outside but preferred not to. bool concurrentRemoveLogs(); void onRemoveLogs(); signals: Index: sources/utility/format.cpp =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/utility/format.cpp (.../format.cpp) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/utility/format.cpp (.../format.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file format.cpp * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour * \date (original) 16-Dec-2019 - * + * */ #include "format.h" @@ -46,7 +46,7 @@ * \param vData - The value * \return The QByteAttay of the value vData if can't be converted 0x00 will be returned * \note Regarding the QVariant type conversion, if cannot be converted 0 will be returned - * This rule has been used and also to be consistent followed the sae rule. + * This rule has been used and also to be consistent followed the same rule. * \note This method converts both float and double to F32 and returns its QByteArray representation. */ QByteArray Format::fromVariant(const QVariant &vData) Index: sources/view/vtreatmentadjustmentresponsebase.h =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/view/vtreatmentadjustmentresponsebase.h (.../vtreatmentadjustmentresponsebase.h) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/view/vtreatmentadjustmentresponsebase.h (.../vtreatmentadjustmentresponsebase.h) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file vtreatmentadjustmentresponsebase.h * \author (last) Behrouz NemaiPour * \date (last) 08-Jun-2020 * \author (original) Behrouz NemaiPour * \date (original) 08-Jun-2020 - * + * */ #pragma once @@ -22,7 +22,7 @@ #include "vview.h" #include "guiglobals.h" -// forward diclations +// forward declarations class tst_views; // namespace Index: sources/view/vtreatmentadjustmentultrafiltrationstate.cpp =================================================================== diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/view/vtreatmentadjustmentultrafiltrationstate.cpp (.../vtreatmentadjustmentultrafiltrationstate.cpp) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) +++ sources/view/vtreatmentadjustmentultrafiltrationstate.cpp (.../vtreatmentadjustmentultrafiltrationstate.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file vtreatmentadjustmentultrafiltrationstate.cpp * \author (last) Behrouz NemaiPour * \date (last) 23-Jun-2020 * \author (original) Behrouz NemaiPour * \date (original) 09-Jun-2020 - * + * */ #include "vtreatmentadjustmentultrafiltrationstate.h" @@ -62,7 +62,7 @@ // if there is a reason (passed) it will be used QString mText = VTreatmentAdjustmentResponseBase::text(); // coco begin validated : Manually tested. - // Although currently there is no reson passed in the corespounding message. + // Although currently there is no reason passed in the corresponding message. // But kept this code which seems reasonable to have a reason later. if (! mText.isEmpty()) return mText; // coco end Index: sources/view/vtreatmentadjustmentultrafiltrationstate.h =================================================================== diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- sources/view/vtreatmentadjustmentultrafiltrationstate.h (.../vtreatmentadjustmentultrafiltrationstate.h) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) +++ sources/view/vtreatmentadjustmentultrafiltrationstate.h (.../vtreatmentadjustmentultrafiltrationstate.h) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file vtreatmentadjustmentultrafiltrationstate.h * \author (last) Behrouz NemaiPour * \date (last) 09-Jun-2020 * \author (original) Behrouz NemaiPour * \date (original) 09-Jun-2020 - * + * */ #pragma once @@ -42,7 +42,7 @@ VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationState, AdjustUltrafiltrationStateResponseData) -// ---------- Puase Ultrafiltration +// ---------- Pause Ultrafiltration public slots: void doPause (); void doResume(); Index: unittests/tst_acknow.cpp =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- unittests/tst_acknow.cpp (.../tst_acknow.cpp) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ unittests/tst_acknow.cpp (.../tst_acknow.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file tst_acknow.cpp * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour * \date (original) 21-Jan-2020 - * + * */ #include "tst_acknow.h" @@ -149,7 +149,7 @@ /*! * \brief tst_acknow::tst_AcknowModel_onAcknowReceive_Incorrect * \details Tries to remove a seq from acknow model which is not expected - * (there was no message send with this seq which required qcknow) + * (there was no message send with this seq which required acknow) * and the seq should not exist before and after removal * this is a test for qt hash test used for acknow model * \param vSequence Index: unittests/tst_utilities.cpp =================================================================== diff -u -red5d989264015440d9da6d0830679394a323cf55 -r618891879f5cdc68e37ee68eea005afb76dd4e5b --- unittests/tst_utilities.cpp (.../tst_utilities.cpp) (revision ed5d989264015440d9da6d0830679394a323cf55) +++ unittests/tst_utilities.cpp (.../tst_utilities.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) @@ -179,7 +179,7 @@ void tst_utilities::tst_fromvariant_Undefined() { - QTime t; // Any undefied type which is not defined in the Format::fromVariant + QTime t; // Any undefined type which is not defined in the Format::fromVariant QByteArray ba; ba += '\0'; QCOMPARE(Format::fromVariant(t.currentTime()).toHex(), ba.toHex());