Index: sources/view/settings/VBluetooth.cpp =================================================================== diff -u -r2dd767833cf0cf706c457951c2d78e7e20aff768 -r028cb1403e8fcb2d2e9ab2aa1562f660124015b1 --- sources/view/settings/VBluetooth.cpp (.../VBluetooth.cpp) (revision 2dd767833cf0cf706c457951c2d78e7e20aff768) +++ sources/view/settings/VBluetooth.cpp (.../VBluetooth.cpp) (revision 028cb1403e8fcb2d2e9ab2aa1562f660124015b1) @@ -56,56 +56,77 @@ case MBluetooth::eIS_Scan_Found : case MBluetooth::eIS_Scan_NotFound : case MBluetooth::eIS_Scan_Discover : - deviceAddr (vData.deviceAddr ); - deviceName (vData.deviceName ); - devicePair (vData.devicePair ); + deviceAddr (vData.deviceAddr ); + deviceName (vData.deviceName ); + devicePair (vData.devicePair ); break; + + case MBluetooth::eIS_Local_Init : + localAddr (vData.localAddr ); + localName (vData.localName ); + break; + default: break; } - error (vData.error ); - devicePin (vData.devicePin ); + error (vData.error ); + devicePin (vData.devicePin ); QString message; switch (vData.state) { case MBluetooth::eIS_Idle : message = "" ; break; + case MBluetooth::eIS_Close : message = tr("BluetoothInterface Closed" ); break; // Used BluetoothInterface to be consistent with the - case MBluetooth::eIS_Local_Error_Invalid : message = tr("No Valid Bluetooth Adapter" ); break; + + case MBluetooth::eIS_Local_Init : message = tr("The Bluetooth Adapter Is Ready" ); break; case MBluetooth::eIS_Local_Connect : message = tr("The Bluetooth Adapter Connected" ); break; case MBluetooth::eIS_Local_Disconnect : message = tr("The Bluetooth Adapter Disconnected" ); break; + case MBluetooth::eIS_Local_Error_Invalid : message = tr("No Valid Bluetooth Adapter" ); break; case MBluetooth::eIS_Local_Error_Off : message = tr("The Bluetooth Adapter Is Off" ); break; case MBluetooth::eIS_Local_Error_IO : message = tr("The Bluetooth Adapter IO Error" ); break; case MBluetooth::eIS_Local_Error_Unknown : message = tr("The Bluetooth Adapter Unknown Error" ); break; case MBluetooth::eIS_Scan_NotFound : message = tr("No Valid device found" ); break; - case MBluetooth::eIS_Scan_Start : message = tr("Scanning ... " ); break; + case MBluetooth::eIS_Scan_Start : message = tr("Scanning ..." ); break; case MBluetooth::eIS_Scan_Reject : message = tr("Scanning Rejected" ); break; case MBluetooth::eIS_Scan_Discover : message = tr("Device Discovered" ); break; case MBluetooth::eIS_Scan_Found : message = tr("Blood Pressure Device Found" ); break; case MBluetooth::eIS_Scan_Stop : message = tr("Scanning Stopped" ); break; case MBluetooth::eIS_Scan_Done : message = tr("Scanning Finished" ); break; case MBluetooth::eIS_Scan_Detail : message = tr("Scanning Details" ); break; - case MBluetooth::eIS_Device_Init : message = tr("Initializing ... " ); break; - case MBluetooth::eIS_Device_Error_Init : message = tr("Initialization Error" ); break; - case MBluetooth::eIS_Device_Connect : message = tr("Connecting ... " ); break; - case MBluetooth::eIS_Device_Error : message = tr("Connection Error" ); break; - case MBluetooth::eIS_Device_Done : message = tr("Connecting Done" ); break; - case MBluetooth::eIS_Device_Disconnect : message = tr("Disconnected" ); break; + case MBluetooth::eIS_Device_Init : message = tr("Device Initializing ..." ); break; + case MBluetooth::eIS_Device_Error_Init : message = tr("Device Initialization Error" ); break; + case MBluetooth::eIS_Device_Start : message = tr("Device Connecting ..." ); break; + case MBluetooth::eIS_Device_Error : message = tr("Device Connection Error" ); break; + case MBluetooth::eIS_Device_Connect : message = tr("Device Connected" ); break; + case MBluetooth::eIS_Device_Done : message = tr("Device Connection Done" ); break; + case MBluetooth::eIS_Device_Disconnect : message = tr("Device Disconnected" ); break; - case MBluetooth::eIS_Pair_Start : message = tr("Pairing ... " ); break; + case MBluetooth::eIS_Service_Start : message = tr("Service Scanning ..." ); break; + case MBluetooth::eIS_Service_Error : message = tr("Service Scanning Error" ); break; + case MBluetooth::eIS_Service_Discover : message = tr("Service Discovered" ); break; + case MBluetooth::eIS_Service_Done : message = tr("Service Scanning Finished" ); break; + + case MBluetooth::eIS_Pair_Start : message = tr("Pairing ..." ); break; case MBluetooth::eIS_Pair_Error : message = tr("Pairing Error" ); break; case MBluetooth::eIS_Pair_PinCode : message = tr("Pairing PinCode" ); break; case MBluetooth::eIS_Pair_Confirm : message = tr("Pairing Confirm" ); break; case MBluetooth::eIS_Pair_Done : message = tr("Pairing Done" ); break; - default : message = "" ; break; + // IMPORTANT: Do not use the "default:" to let compiler check for all the enumeration which are not handled. } notification(message); + + // Console Log message = QString::number(_error) + " " + _deviceAddr + " " + QString::number(_devicePair) + " " + message + " " + _deviceName; - qDebug().noquote().nospace() << message.trimmed(); + message = message.trimmed().simplified(); + qDebug().noquote().nospace() << message; + + // Service Log + LOG_DEBUG(message); } void View::VBluetooth::doScan()