Index: AlarmMapping.csv =================================================================== diff -u -r75219a6e89b20f405aad0c12c5aed5937118b2ad -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 75219a6e89b20f405aad0c12c5aed5937118b2ad) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -122,7 +122,7 @@ 121,"DG main primary heater voltage out of range." 122,"DG small primary heater voltage out of range." 123,"DG trimmer heater voltage out of range." - 124,"HD end of treatment alarm (high priority - user still not acting to end treatment)." + 124,"HD end of treatment alarm (high priority)." 125,"Blood sitting too long after treatment stopped by user alarm (>5 min)." 126,"HD blood leak detected alarm." 127,"Venous pressure too low during treatment." @@ -222,7 +222,7 @@ 221,"HD Saline bag is empty." 222,"HD dialysate temperature too high alarm." 223,"HD dialysate temperature too low alarm." - 224,"Treatment stopped by user action - pressed stop button." + 224,"Treatment stopped by user action." 225,"HD end of treatment warning." 226,"HD prime completed low priority alarm." 227,"HD prime out of time alarm." Index: alarmMapping.sh =================================================================== diff -u -r0c983aea7de7480e86739469f5a64ad18b244634 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- alarmMapping.sh (.../alarmMapping.sh) (revision 0c983aea7de7480e86739469f5a64ad18b244634) +++ alarmMapping.sh (.../alarmMapping.sh) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -39,8 +39,8 @@ # update the alarm messaging echo "update the alarm message mapping" ../scripts/build/alarmMapping \ - common/AlarmDefs.h \ - sources/model/hd/alarm/MAlarmMapping.cpp \ + common/ \ + sources/model/hd/alarm/ \ 2> alarmMapping.err \ | tee alarmMapping.log Index: denali.pro.user =================================================================== diff -u -r6f81407d61aa7d43f316f66f1038807cab5c253b -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- denali.pro.user (.../denali.pro.user) (revision 6f81407d61aa7d43f316f66f1038807cab5c253b) +++ denali.pro.user (.../denali.pro.user) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/ApplicationController.cpp =================================================================== diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -535,7 +535,7 @@ * \param vAlarmID */ void ApplicationController::onPOSTFail(GuiAlarmID vAlarmID) { - emit didActionTransmit(GuiActionType::ID_AlarmTriggered, {vAlarmID ,0,0,0,0}); + emit didActionTransmit(GuiActionType::ID_AlarmTriggered, {vAlarmID ,0,0,0,0,0,0,0}); } /*! Index: sources/ApplicationController.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/ApplicationController.h (.../ApplicationController.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/ApplicationController.h (.../ApplicationController.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -65,8 +65,6 @@ public slots: bool init(); bool init(QThread &vThread); - -private slots: void quit(); private: Index: sources/bluetooth/BluetoothInterface.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/bluetooth/BluetoothInterface.h (.../BluetoothInterface.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/bluetooth/BluetoothInterface.h (.../BluetoothInterface.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -92,12 +92,11 @@ public slots: bool init(); bool init(QThread &vThread); + void quit(); void doNotifyStatePOSTError(); private slots: - void quit(); - // Local Device Slots void onLocalDeviceConnect (const QBluetoothAddress &vAddress ); void onLocalDeviceDisconnect (const QBluetoothAddress &vAddress ); Index: sources/canbus/CanInterface.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/canbus/CanInterface.h (.../CanInterface.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/canbus/CanInterface.h (.../CanInterface.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -72,8 +72,6 @@ public slots: bool init(); bool init(QThread &vThread); - -private slots: void quit(); public: Index: sources/canbus/FrameInterface.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/canbus/FrameInterface.h (.../FrameInterface.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/canbus/FrameInterface.h (.../FrameInterface.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -90,8 +90,6 @@ public slots: bool init(); bool init(QThread &vThread); - -private slots: void quit(); private: Index: sources/canbus/MessageAcknowModel.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/canbus/MessageAcknowModel.h (.../MessageAcknowModel.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/canbus/MessageAcknowModel.h (.../MessageAcknowModel.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -123,8 +123,6 @@ public slots: bool init(); bool init(QThread &vThread); - -private slots: void quit(); private: Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -161,8 +161,6 @@ public slots: bool init(); bool init(QThread &vThread); - -private slots: void quit(); public: Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -100,7 +100,7 @@ // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DO NOT NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE. {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes - {Gui::GuiActionType::ID_AlarmTriggered , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_AlarmTriggered , 8 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_AlarmCleared , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AlarmClearedConditionReq , 1 * 4 }, // 1 parameter each 4bytes // the same message 63:0x3F00 {Gui::GuiActionType::ID_AlarmClearedConditionRsp , 1 * 4 }, // 1 parameter each 4bytes // the same message 63:0x3F00 Index: sources/cloudsync/CloudSyncController.h =================================================================== diff -u -r6f81407d61aa7d43f316f66f1038807cab5c253b -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/cloudsync/CloudSyncController.h (.../CloudSyncController.h) (revision 6f81407d61aa7d43f316f66f1038807cab5c253b) +++ sources/cloudsync/CloudSyncController.h (.../CloudSyncController.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -169,13 +169,13 @@ protected: void timerEvent(QTimerEvent *event) override; bool event(QEvent* vEvent) override; + public slots: bool init(); bool init(QThread &vThread); - -private slots: void quit(); +private slots: void onWatchFileChange (const QString &vFile); void onActionReceive (GuiActionType vAction, const QVariantList &vData); void onTreatmentLogSave(const QString &vPatientID , Index: sources/device/DeviceController.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/device/DeviceController.h (.../DeviceController.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/device/DeviceController.h (.../DeviceController.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -119,11 +119,11 @@ public slots: bool init(); bool init(QThread &vThread); + void quit(); void doScreenshot(const QImage &vImage, const QString &vFileName); private slots: - void quit(); void onRemoveLogs(bool vInProgress); void onScreenshot(const QImage &vImage, const QString &vFileName); Index: sources/gui/GuiController.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/gui/GuiController.h (.../GuiController.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/GuiController.h (.../GuiController.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -57,8 +57,6 @@ public slots: bool init(); bool init(QThread &vThread); - -private slots: void quit(); private: Index: sources/model/MAbstractDynamic.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/model/MAbstractDynamic.cpp (.../MAbstractDynamic.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/MAbstractDynamic.cpp (.../MAbstractDynamic.cpp) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -73,6 +73,7 @@ } bool MAbstractDynamic::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + bool ok = true; int index = 0; // message data start position _data.mFieldDescriptor1 .value = 0; _data.mDataFieldU1 .value = 0; @@ -91,27 +92,27 @@ Gui::GuiAlarmDataTypes field1Type = static_cast(_data.mFieldDescriptor1.value); switch (field1Type) { case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_NONE : - return true; + ok = true ; goto lOut; case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_U32 : if (GetValue(vByteArray, index, _data.mDataFieldU1)) break; - else { if(vIndex) *vIndex = index; return false; } + else { ok = false; goto lOut; } case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_S32 : if (GetValue(vByteArray, index, _data.mDataFieldS1)) break; - else { if(vIndex) *vIndex = index; return false; } + else { ok = false; goto lOut; } case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_F32 : if (GetValue(vByteArray, index, _data.mDataFieldF1)) break; - else { if(vIndex) *vIndex = index; return false; } + else { ok = false; goto lOut; } case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_BOOL : if (GetValue(vByteArray, index, _data.mDataFieldB1)) break; - else { if(vIndex) *vIndex = index; return false; } + else { ok = false; goto lOut; } default: return true; @@ -122,35 +123,40 @@ Gui::GuiAlarmDataTypes field2Type = static_cast(_data.mFieldDescriptor2.value); switch (field2Type) { case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_NONE : - return true; + ok = true ; goto lOut; case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_U32 : if (GetValue(vByteArray, index, _data.mDataFieldU2)) break; - else { if(vIndex) *vIndex = index; return false; } + else { ok = false; goto lOut; } case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_S32 : if (GetValue(vByteArray, index, _data.mDataFieldS2)) break; - else { if(vIndex) *vIndex = index; return false; } + else { ok = false; goto lOut; } case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_F32 : if (GetValue(vByteArray, index, _data.mDataFieldF2)) break; - else { if(vIndex) *vIndex = index; return false; } + else { ok = false; goto lOut; } case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_BOOL : if (GetValue(vByteArray, index, _data.mDataFieldB2)) break; - else { if(vIndex) *vIndex = index; return false; } + else { ok = false; goto lOut; } default: - return true; + ok = true; goto lOut; } - return true; + ok = true; goto lOut; + } - else { if(vIndex) *vIndex = index; return false; } + else { ok = false; goto lOut; } } - else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } + else { ok = false; goto lOut; } + else { ok = false; goto lOut; } + +lOut: + if ( vIndex ) *vIndex = index; + return ok; } Index: sources/model/MAbstractDynamic.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/model/MAbstractDynamic.h (.../MAbstractDynamic.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/MAbstractDynamic.h (.../MAbstractDynamic.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -74,7 +74,8 @@ Types::F32 mDataFieldF2 ; Types::U32 mDataFieldB2 ; } _data; - +protected: + const quint8 _xata_start = 5 * 4; public: MAbstractDynamic () { } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r75219a6e89b20f405aad0c12c5aed5937118b2ad -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 75219a6e89b20f405aad0c12c5aed5937118b2ad) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 23-Mar-2022 + * \date (last) 28-Mar-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -157,7 +157,7 @@ /*0121*/case GuiAlarmID::ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE : { result = QObject::tr("DG main primary heater voltage out of range." ); break; } /* 121*/ /*0122*/case GuiAlarmID::ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE : { result = QObject::tr("DG small primary heater voltage out of range." ); break; } /* 122*/ /*0123*/case GuiAlarmID::ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE : { result = QObject::tr("DG trimmer heater voltage out of range." ); break; } /* 123*/ -/*0124*/case GuiAlarmID::ALARM_ID_END_OF_TREATMENT_HIGH : { result = QObject::tr("HD end of treatment alarm (high priority - user still not acting to end treatment)." ); break; } /* 124*/ +/*0124*/case GuiAlarmID::ALARM_ID_END_OF_TREATMENT_HIGH : { result = QObject::tr("HD end of treatment alarm (high priority)." ); break; } /* 124*/ /*0125*/case GuiAlarmID::ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK : { result = QObject::tr("Blood sitting too long after treatment stopped by user alarm (>5 min)." ); break; } /* 125*/ /*0126*/case GuiAlarmID::ALARM_ID_HD_BLOOD_LEAK_DETECTED : { result = QObject::tr("HD blood leak detected alarm." ); break; } /* 126*/ /*0127*/case GuiAlarmID::ALARM_ID_VENOUS_PRESSURE_LOW : { result = QObject::tr("Venous pressure too low during treatment." ); break; } /* 127*/ @@ -257,7 +257,7 @@ /*0221*/case GuiAlarmID::ALARM_ID_EMPTY_SALINE_BAG : { result = QObject::tr("HD Saline bag is empty." ); break; } /* 221*/ /*0222*/case GuiAlarmID::ALARM_ID_DIALYSATE_TEMPERATURE_HIGH : { result = QObject::tr("HD dialysate temperature too high alarm." ); break; } /* 222*/ /*0223*/case GuiAlarmID::ALARM_ID_DIALYSATE_TEMPERATURE_LOW : { result = QObject::tr("HD dialysate temperature too low alarm." ); break; } /* 223*/ -/*0224*/case GuiAlarmID::ALARM_ID_TREATMENT_STOPPED_BY_USER : { result = QObject::tr("Treatment stopped by user action - pressed stop button." ); break; } /* 224*/ +/*0224*/case GuiAlarmID::ALARM_ID_TREATMENT_STOPPED_BY_USER : { result = QObject::tr("Treatment stopped by user action." ); break; } /* 224*/ /*0225*/case GuiAlarmID::ALARM_ID_END_OF_TREATMENT_WARNING : { result = QObject::tr("HD end of treatment warning." ); break; } /* 225*/ /*0226*/case GuiAlarmID::ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY : { result = QObject::tr("HD prime completed low priority alarm." ); break; } /* 226*/ /*0227*/case GuiAlarmID::ALARM_ID_PRIME_OUT_OF_TIME : { result = QObject::tr("HD prime out of time alarm." ); break; } /* 227*/ Index: sources/model/hd/alarm/MAlarmTriggered.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/model/hd/alarm/MAlarmTriggered.cpp (.../MAlarmTriggered.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/hd/alarm/MAlarmTriggered.cpp (.../MAlarmTriggered.cpp) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -21,6 +21,34 @@ using namespace Model; +QVariantList MAlarmTriggered::parameters() const +{ + QVariantList params = MAbstractDynamic::parameters(); + params += _xata.mPriority .value; + params += _xata.mRank .value; + params += _xata.mClearTop .value; + return params; +} + +bool MAlarmTriggered::fromByteArray(const QByteArray &vByteArray, int *vIndex) +{ + int index = 0; // message data start position + if ( ! MAbstractDynamic::fromByteArray(vByteArray, &index)) + return false; + + index = _xata_start; // the message parameters are dynamic and the second set may not be sent + // and MAbstractDynamic returns true but since it hasn't have proper type it won't increment the index + // so the extra data (xata) needs to have its own start setup correctly. + if (GetValue(vByteArray, index, _xata.mPriority )) + if (GetValue(vByteArray, index, _xata.mRank )) + if (GetValue(vByteArray, index, _xata.mClearTop )) + return true ; + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + if ( vIndex ) *vIndex = index; +} + /*! * \brief MAlarmTriggered::data * \details Provides model's Data from the received messages data values @@ -29,16 +57,23 @@ MAlarmTriggered::Data MAlarmTriggered::data() const { Data data; data.mAlarmID = _data.mID .value; + data.mFieldDescriptor1 = _data.mFieldDescriptor1 .value; data.mDataFieldU1 = _data.mDataFieldU1 .value; data.mDataFieldS1 = _data.mDataFieldS1 .value; data.mDataFieldF1 = _data.mDataFieldF1 .value; data.mDataFieldB1 = _data.mDataFieldB1 .value ? true : false; + data.mFieldDescriptor2 = _data.mFieldDescriptor2 .value; data.mDataFieldU2 = _data.mDataFieldU2 .value; data.mDataFieldS2 = _data.mDataFieldS2 .value; data.mDataFieldF2 = _data.mDataFieldF2 .value; data.mDataFieldB2 = _data.mDataFieldB2 .value ? true : false; + + data.mPriority = _xata.mPriority .value; + data.mRank = _xata.mRank .value; + data.mClearTop = _xata.mClearTop .value ? true : false; + return data; } Index: sources/model/hd/alarm/MAlarmTriggered.h =================================================================== diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f) +++ sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -42,8 +42,10 @@ * | #3:(Any) | \ref Data::mDataField1 | * | #4:(U32) | \ref Data::mFieldDescriptor2 | * | #5:(Any) | \ref Data::mDataField2 | + * | #6:(U32) | \ref Data::mPriority | + * | #7:(U32) | \ref Data::mRank | + * | #8:(U32) | \ref Data::mClearTop | * - * * \sa Data * *

Logging info

@@ -59,28 +61,45 @@ // friends friend class ::tst_models; +protected: + QVariantList parameters() const; + public: Type_Enum typeText() const override { return Type_Enum::eEvent ; } Unit_Enum unitText() const override { return Unit_Enum::eHD ; } QString infoText() const override { return QString("AlarmTriggered") ; } struct Data { quint32 mAlarmID = 0; + quint32 mFieldDescriptor1 ; quint32 mDataFieldU1 ; qint32 mDataFieldS1 ; float mDataFieldF1 ; bool mDataFieldB1 ; + quint32 mFieldDescriptor2 ; quint32 mDataFieldU2 ; qint32 mDataFieldS2 ; float mDataFieldF2 ; bool mDataFieldB2 ; + + quint32 mPriority ; + quint32 mRank ; + bool mClearTop ; }; + struct { + Types::U32 mPriority ; + Types::U32 mRank ; + Types::U32 mClearTop ; + } _xata; + public: MAlarmTriggered () { } + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data () const; }; Index: sources/storage/Logger.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/storage/Logger.h (.../Logger.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/storage/Logger.h (.../Logger.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -167,9 +167,6 @@ public slots: bool init(); bool init(QThread &vThread); - - -private slots: void quit(); private: Index: sources/wifi/WifiInterface.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 --- sources/wifi/WifiInterface.h (.../WifiInterface.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/wifi/WifiInterface.h (.../WifiInterface.h) (revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2) @@ -96,6 +96,7 @@ public slots: bool init(QThread &vThread); bool init(); + void quit(); void doScan (); void doJoinNetwork (const WifiNetworkData &vNetwork, const QString &vPassword); @@ -128,7 +129,6 @@ void didError (const QString &); private slots: - void quit(); void onStatusChanged(const QString &vMessage); void onRequestAutoAssignedIP(); void onProcessFinishedScan (int vExitCode, QProcess::ExitStatus vExitStatus);