aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-23 17:34:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes in UART Manager

Browse Source
This commit is contained in:
Aleksander Nowakowski
2018-06-26 11:20:47 +02:00
parent 72a17f1794
commit ddbc16ae7b
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java
View File

@@ -44,6 +44,13 @@ public class UARTManager extends BleManager<UARTManagerCallbacks> {
private final static UUID UART_TX_CHARACTERISTIC_UUID = UUID.fromString("6E400003-B5A3-F393-E0A9-E50E24DCCA9E"); private final static UUID UART_TX_CHARACTERISTIC_UUID = UUID.fromString("6E400003-B5A3-F393-E0A9-E50E24DCCA9E");
private BluetoothGattCharacteristic mRXCharacteristic, mTXCharacteristic; private BluetoothGattCharacteristic mRXCharacteristic, mTXCharacteristic;
/**
* A flag indicating whether Long Write can be used. It's set to false if the UART RX
* characteristic has only PROPERTY_WRITE_NO_RESPONSE property and no PROPERTY_WRITE.
* If you set it to false here, it will never use Long Write.
*
* TODO change this flag if you don't want to use Long Write even with Write Request.
*/
private boolean mUseLongWrite = true; private boolean mUseLongWrite = true;
UARTManager(final Context context) { UARTManager(final Context context) {
@@ -64,13 +71,13 @@ public class UARTManager extends BleManager<UARTManagerCallbacks> {
@Override @Override
protected void initialize() { protected void initialize() {
requestMtu(260).enqueue();
setNotificationCallback(mTXCharacteristic) setNotificationCallback(mTXCharacteristic)
.with((device, data) -> { .with((device, data) -> {
final String text = data.getStringValue(0); final String text = data.getStringValue(0);
log(LogContract.Log.Level.APPLICATION, "\"" + text + "\" received"); log(LogContract.Log.Level.APPLICATION, "\"" + text + "\" received");
mCallbacks.onDataReceived(device, text); mCallbacks.onDataReceived(device, text);
}); });
requestMtu(260).enqueue();
enableNotifications(mTXCharacteristic).enqueue(); enableNotifications(mTXCharacteristic).enqueue();
} }
@@ -126,8 +133,11 @@ public class UARTManager extends BleManager<UARTManagerCallbacks> {
return; return;
if (!TextUtils.isEmpty(text)) { if (!TextUtils.isEmpty(text)) {
final WriteRequest request = writeCharacteristic(mRXCharacteristic, text.getBytes()); final WriteRequest request = writeCharacteristic(mRXCharacteristic, text.getBytes())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION,
"\"" + data.getStringValue(0) + "\" sent"));
if (!mUseLongWrite) { if (!mUseLongWrite) {
// This will automatically split the long data into MTU-3-byte long packets.
request.split(); request.split();
} }
request.enqueue(); request.enqueue();