Index: sources/model/settings/MBluetooth.h =================================================================== diff -u -rb252cd2777aadbce2d04aa32cc275f193de0cf52 -raeb915075b9e13e5c1aaf2800ba6db03b6c24a0b --- sources/model/settings/MBluetooth.h (.../MBluetooth.h) (revision b252cd2777aadbce2d04aa32cc275f193de0cf52) +++ sources/model/settings/MBluetooth.h (.../MBluetooth.h) (revision aeb915075b9e13e5c1aaf2800ba6db03b6c24a0b) @@ -52,16 +52,17 @@ eIS_Device_Init , eIS_Device_Start , eIS_Device_Connect , + eIS_Device_Waiting , eIS_Device_Error_Init , eIS_Device_Error , eIS_Device_Done , eIS_Device_Disconnect , eIS_Service_Start , + eIS_Service_Invalid , eIS_Service_Error , eIS_Service_Discover , eIS_Service_Detail , - eIS_Service_Detail_Invalid , eIS_Service_Detail_Error , eIS_Service_Detail_Done , eIS_Service_Done , @@ -77,13 +78,12 @@ Q_ENUM(InterfaceStates) struct BluetoothDevice { - QString addr = ""; - QString name = ""; - bool pair = 0; + QString addr = ""; ///< the device address + QString name = ""; ///< the device name + bool pair = 0; ///< the device pairing status bool operator ==(const BluetoothDevice &vDevice) const { return vDevice.addr == addr && - vDevice.name == name && - vDevice.pair == pair ; + vDevice.name == name ; } QString toString() const { return addr + "," + pair + "," + name; @@ -95,7 +95,7 @@ QString localName = ""; QString deviceAddr = ""; QString deviceName = ""; - QString devicePin = ""; + quint8 deviceBatt = 0; quint8 devicePair = 0; qint16 error = 0; bool valid = 1; @@ -110,7 +110,7 @@ InterfaceStates vState = eIS_Idle, QString vDeviceAddr = "", QString vDeviceName = "", - QString vDevicePin = "", + quint8 vDeviceBatt = 0, quint8 vDevicePair = 0, qint16 vError = 0, bool vValid = 1,