Index: sources/device/DeviceModels.h =================================================================== diff -u -re8262d170bb94046ddb767074a31530bdf4a2319 -rbefa8e7e7667c4aa5193022bd80e9f52c2374ad0 --- sources/device/DeviceModels.h (.../DeviceModels.h) (revision e8262d170bb94046ddb767074a31530bdf4a2319) +++ sources/device/DeviceModels.h (.../DeviceModels.h) (revision befa8e7e7667c4aa5193022bd80e9f52c2374ad0) @@ -122,9 +122,10 @@ QVariantList parameters () const override { return { _data.mBrightnessPercent }; } QString infoText () const override { return QString("DeviceBrightness") ; } - Data data () const; + Data data () const { return _data; } }; +// ---------- MDeviceBluetoothPaired 'Reset' ---------- // /*! * \brief The MDeviceBluetoothPairedResetRequest class * \details The model for the bluetooth pared removal script call. @@ -147,11 +148,51 @@ public: struct Data : MDeviceResponseBase::Data { } _data; - QVariantList parameters () const override { return { }; } - QString infoText () const override { return QString("DeviceBluetoothPairedReset") ; } - Data data () const; + QVariantList parameters ( ) const override { return { }; } + QString infoText ( ) const override { return QString("DeviceBluetoothPairedReset") ; } + Data data ( ) const { return _data; } + bool fromByteArray(const QByteArray &vByteArray, int *vExitCode = nullptr) override; }; +// ---------- MDeviceBluetoothPaired 'Query' ---------- // +/*! + * \brief The MDeviceBluetoothPairedQueryRequest class + * \details The model for the bluetooth pared removal script call. + */ +class MDeviceBluetoothPairedQueryRequest : public MDeviceRequestBase { +public: + struct Data { + } _data; + + QString toString() { + return MDeviceRequestBase::toString("DeviceBluetoothPairedQuery", { }); + } +}; + +/*! + * \brief The MDeviceBluetoothPairedQueryResponse class + * \details The model for the bluetooth pared removal script call returned value / response. + */ +class MDeviceBluetoothPairedQueryResponse : public MDeviceResponseBase { +public: + const quint8 LEN_COUNT = 2; + const char SEPARATOR = ' '; + const char *ZERO = "00:00:00:00:00:00"; + enum { + eAddr, + eName, + }; + struct Data : MDeviceResponseBase::Data { + QString mAddr = ""; // Paired device address + QString mName = ""; // Paired device name + QStringList mInfo = {}; // combination of the {mAddr, mName} to be used in QML/GUI side. + } _data; + QVariantList parameters ( ) const override { return { }; } + QString infoText ( ) const override { return QString("DeviceBluetoothPairedQuery"); } + Data data ( ) const { return _data; } + bool fromByteArray(const QByteArray &vByteArray, int *vExitCode = nullptr) override; +}; + } @@ -161,3 +202,6 @@ typedef Model::MDeviceBluetoothPairedResetRequest ::Data DeviceBluetoothPairedResetRequestData ; typedef Model::MDeviceBluetoothPairedResetResponse::Data DeviceBluetoothPairedResetResponseData; + +typedef Model::MDeviceBluetoothPairedQueryRequest ::Data DeviceBluetoothPairedQueryRequestData ; +typedef Model::MDeviceBluetoothPairedQueryResponse::Data DeviceBluetoothPairedQueryResponseData;