Index: sources/device/DeviceModels.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r0932b2beee9cc169291cbf69161f902f805237b1 --- sources/device/DeviceModels.h (.../DeviceModels.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/device/DeviceModels.h (.../DeviceModels.h) (revision 0932b2beee9cc169291cbf69161f902f805237b1) @@ -67,10 +67,13 @@ QString infoText () const override { return QString("DeviceBase") ; } struct Data { - // by default it has to be accepted with no rejection reason - bool mAccepted = true; /*!< Accepted value of type quint32 extracted out */ - quint32 mReason = 0 ; /*!< Reason value of type quint32 extracted out */ - QString mMessage = "" ; /*!< Message value of type QString of the reason */ + bool mCompleted= false; /*!< Completed The mComplete is used to ensure the script ran and is complete, + since the responses may have been produced to inform the UI only like a progress + and the script is not complete unless we are done with the script. */ + bool mAccepted = false; /*!< Accepted The result of the script execution for the request + it could be sent back multiple times with accepted to false just to inform UI of a intermediary value like progress percentage.*/ + quint32 mReason = 0 ; /*!< Reason if the mAccepted is 0 then this includes why it has been rejected with an ID of the rejection reason. */ + QString mMessage = "" ; /*!< Message a message that can always be sent from the script. */ }; MDeviceResponseBase () { } @@ -79,7 +82,7 @@ }; -// ---------- MDeviceBrightness ---------- // +// ================================================= MDeviceBrightness /*! * \brief The MDeviceBrightnessRequest class * \details The model for the device brightness value modification request. @@ -145,7 +148,7 @@ Device::DeviceError::Scripts_Error_Enum setBrightnessPercent(quint8 vSysVal); }; -// ---------- MDeviceBluetoothPaired 'Reset' ---------- // +// ================================================= MDeviceBluetoothPaired 'Reset' /*! * \brief The MDeviceBluetoothPairedResetRequest class * \details The model for the bluetooth pared removal script call. @@ -174,7 +177,7 @@ bool fromByteArray(const QByteArray &vByteArray, int *vExitCode = nullptr) override; }; -// ---------- MDeviceBluetoothPaired 'Query' ---------- // +// ================================================= MDeviceBluetoothPaired 'Query' /*! * \brief The MDeviceBluetoothPairedQueryRequest class * \details The model for the bluetooth pared removal script call. @@ -213,7 +216,7 @@ bool fromByteArray(const QByteArray &vByteArray, int *vExitCode = nullptr) override; }; -// ---------- MDeviceCryptSetup ---------- // +// ================================================= MDeviceCryptSetup /*! * \brief The MDeviceCryptSetupRequest class * \details The model for the CryptSetup script call. @@ -244,7 +247,7 @@ bool fromByteArray(const QByteArray &vByteArray, int *vExitCode = nullptr) override; }; -// ---------- MDeviceRootSSHAccess ---------- // +// ================================================= MDeviceRootSSHAccess /*! * \brief The MDeviceRootSSHAccessRequest class * \details The model for the device RootSSHAccess value modification request. @@ -276,9 +279,7 @@ Data data () const { return _data; } }; - - -// ---------- MDeviceFactoryReset ---------- // +// ================================================= MDeviceFactoryReset /*! * \brief The MDeviceFactoryResetRequest class * \details The model for the factory reset script call. @@ -307,8 +308,7 @@ bool fromByteArray(const QByteArray &vByteArray, int *vExitCode = nullptr) override; }; - -// ---------- MDeviceDecommission ---------- // +// ================================================= MDeviceDecommission /*! * \brief The MDeviceDecommissionRequest class * \details The model for the decommission script call. @@ -338,7 +338,7 @@ bool fromByteArray(const QByteArray &vByteArray, int *vExitCode = nullptr) override; }; -// ---------- MDeviceUSBMount ---------- // +// ================================================= MDeviceUSBMount /*! * \brief The MDeviceUSBMountRequest class * \details The model for the usb unmount/mount script call. @@ -368,30 +368,64 @@ Data data ( ) const { return _data; } bool fromByteArray(const QByteArray &vByteArray, int *vExitCode = nullptr) override; }; + +// ================================================= MDeviceWifiList +/*! + * \brief The MDeviceMDeviceWifiListRequest class + * \details The model for the Wifi Lsit script call. + */ +class MDeviceWifiListRequest : public MDeviceRequestBase { +public: + struct Data { + } _data; + + QString toString() { + return MDeviceRequestBase::toString("WifiList", {}); + } +}; + +/*! + * \brief The MDeviceWifiListResponse class + * \details The model for the Wifi List script call returned value / response. + */ +class MDeviceWifiListResponse : public MDeviceResponseBase { +public: + struct Data : MDeviceResponseBase::Data { + QString mWifiList = ""; + } _data; + QVariantList parameters ( ) const override { return { }; } + QString infoText ( ) const override { return QString("WifiList"); } + Data data ( ) const { return _data; } + bool fromByteArray(const QByteArray &vByteArray, int *vExitCode = nullptr) override; +}; } -typedef Model::MDeviceResponseBase ::Data DeviceResponseBaseData ; +typedef Model::MDeviceResponseBase ::Data DeviceResponseBaseData; -typedef Model::MDeviceBrightnessRequest ::Data DeviceBrightnessRequestData ; -typedef Model::MDeviceBrightnessResponse::Data DeviceBrightnessResponseData ; +typedef Model::MDeviceBrightnessRequest ::Data DeviceBrightnessRequestData ; +typedef Model::MDeviceBrightnessResponse ::Data DeviceBrightnessResponseData; -typedef Model::MDeviceBluetoothPairedResetRequest ::Data DeviceBluetoothPairedResetRequestData ; -typedef Model::MDeviceBluetoothPairedResetResponse::Data DeviceBluetoothPairedResetResponseData; +typedef Model::MDeviceBluetoothPairedResetRequest ::Data DeviceBluetoothPairedResetRequestData ; +typedef Model::MDeviceBluetoothPairedResetResponse ::Data DeviceBluetoothPairedResetResponseData; -typedef Model::MDeviceBluetoothPairedQueryRequest ::Data DeviceBluetoothPairedQueryRequestData ; -typedef Model::MDeviceBluetoothPairedQueryResponse::Data DeviceBluetoothPairedQueryResponseData; +typedef Model::MDeviceBluetoothPairedQueryRequest ::Data DeviceBluetoothPairedQueryRequestData ; +typedef Model::MDeviceBluetoothPairedQueryResponse ::Data DeviceBluetoothPairedQueryResponseData; -typedef Model::MDeviceCryptSetupRequest ::Data DeviceCryptSetupRequestData ; -typedef Model::MDeviceCryptSetupResponse::Data DeviceCryptSetupResponseData; +typedef Model::MDeviceCryptSetupRequest ::Data DeviceCryptSetupRequestData ; +typedef Model::MDeviceCryptSetupResponse ::Data DeviceCryptSetupResponseData; -typedef Model::MDeviceRootSSHAccessRequest ::Data DeviceRootSSHAccessRequestData ; -typedef Model::MDeviceRootSSHAccessResponse::Data DeviceRootSSHAccessResponseData ; +typedef Model::MDeviceRootSSHAccessRequest ::Data DeviceRootSSHAccessRequestData ; +typedef Model::MDeviceRootSSHAccessResponse ::Data DeviceRootSSHAccessResponseData; -typedef Model::MDeviceFactoryResetRequest ::Data DeviceFactoryResetRequestData ; -typedef Model::MDeviceFactoryResetResponse::Data DeviceFactoryResetResponseData; +typedef Model::MDeviceFactoryResetRequest ::Data DeviceFactoryResetRequestData ; +typedef Model::MDeviceFactoryResetResponse ::Data DeviceFactoryResetResponseData; -typedef Model::MDeviceDecommissionRequest ::Data DeviceDecommissionRequestData ; -typedef Model::MDeviceDecommissionResponse::Data DeviceDecommissionResponseData; +typedef Model::MDeviceDecommissionRequest ::Data DeviceDecommissionRequestData ; +typedef Model::MDeviceDecommissionResponse ::Data DeviceDecommissionResponseData; -typedef Model::MDeviceUSBMountRequest ::Data DeviceUSBMountRequestData ; -typedef Model::MDeviceUSBMountResponse::Data DeviceUSBMountResponseData; +typedef Model::MDeviceUSBMountRequest ::Data DeviceUSBMountRequestData ; +typedef Model::MDeviceUSBMountResponse ::Data DeviceUSBMountResponseData; + +typedef Model::MDeviceWifiListRequest ::Data DeviceWifiListRequestData ; +typedef Model::MDeviceWifiListResponse ::Data DeviceWifiListResponseData; +