Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
UART divides long text into 20B parts
UART now checks the RX characteristic properties and: 1) it will use long write if WRITE REQUEST is set, 2) it will divide the text into up to 20-bytes packets Also the app background has been fixed.
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,7 +26,9 @@ | |
| import android.bluetooth.BluetoothGattCharacteristic; | ||
| import android.bluetooth.BluetoothGattService; | ||
| import android.content.Context; | ||
| import android.text.TextUtils; | ||
|
|
||
| import java.io.UnsupportedEncodingException; | ||
| import java.util.LinkedList; | ||
| import java.util.Queue; | ||
| import java.util.UUID; | ||
|
|
@@ -36,12 +38,16 @@ | |
| public class UARTManager extends BleManager<UARTManagerCallbacks> { | ||
| /** Nordic UART Service UUID */ | ||
| private final static UUID UART_SERVICE_UUID = UUID.fromString("6E400001-B5A3-F393-E0A9-E50E24DCCA9E"); | ||
| /** RX characteristic UUID */ | ||
| private final static UUID UART_RX_CHARACTERISTIC_UUID = UUID.fromString("6E400002-B5A3-F393-E0A9-E50E24DCCA9E"); | ||
| /** TX characteristic UUID */ | ||
| private final static UUID UART_TX_CHARACTERISTIC_UUID = UUID.fromString("6E400003-B5A3-F393-E0A9-E50E24DCCA9E"); | ||
| /** The maximum packet size is 20 bytes. */ | ||
| private static final int MAX_PACKET_SIZE = 20; | ||
|
|
||
| private BluetoothGattCharacteristic mRXCharacteristic, mTXCharacteristic; | ||
| private byte[] mOutgoingBuffer; | ||
| private int mBufferOffset; | ||
|
|
||
| public UARTManager(final Context context) { | ||
| super(context); | ||
|
|
@@ -60,30 +66,59 @@ protected BleManagerGattCallback getGattCallback() { | |
| @Override | ||
| protected Queue<Request> initGatt(final BluetoothGatt gatt) { | ||
| final LinkedList<Request> requests = new LinkedList<>(); | ||
| requests.push(Request.newEnableNotificationsRequest(mTXCharacteristic)); | ||
| return requests; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isRequiredServiceSupported(final BluetoothGatt gatt) { | ||
| final BluetoothGattService service = gatt.getService(UART_SERVICE_UUID); | ||
| if (service != null) { | ||
| mRXCharacteristic = service.getCharacteristic(UART_RX_CHARACTERISTIC_UUID); | ||
| mTXCharacteristic = service.getCharacteristic(UART_TX_CHARACTERISTIC_UUID); | ||
| } | ||
|
|
||
| boolean writeRequest = false; | ||
| boolean writeCommand = false; | ||
| if (mRXCharacteristic != null) { | ||
| final int rxProperties = mRXCharacteristic.getProperties(); | ||
| writeRequest = (rxProperties & BluetoothGattCharacteristic.PROPERTY_WRITE) > 0; | ||
| writeCommand = (rxProperties & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE) > 0; | ||
|
|
||
| // Set the WRITE REQUEST type when the characteristic supports it. This will allow to send long write (also if the characteristic support it). | ||
| // In case there is no WRITE REQUEST property, this manager will divide texts longer then 20 bytes into up to 20 bytes chunks. | ||
| if (writeRequest) | ||
| mRXCharacteristic.setWriteType(BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT); | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
philips77
Author
Member
|
||
| } | ||
|
|
||
| return mRXCharacteristic != null && mTXCharacteristic != null && (writeRequest || writeCommand); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onDeviceDisconnected() { | ||
| mRXCharacteristic = null; | ||
| mTXCharacteristic = null; | ||
| } | ||
|
|
||
| @Override | ||
| public void onCharacteristicWrite(final BluetoothGatt gatt, final BluetoothGattCharacteristic characteristic) { | ||
| // When the whole buffer has been sent | ||
| final byte[] buffer = mOutgoingBuffer; | ||
| if (mBufferOffset == buffer.length) { | ||
| try { | ||
| mCallbacks.onDataSent(new String(buffer, "UTF-8")); | ||
| } catch (final UnsupportedEncodingException e) { | ||
| // do nothing | ||
| } | ||
| mOutgoingBuffer = null; | ||
| } else { // Otherwise... | ||
| final int length = Math.min(buffer.length - mBufferOffset, MAX_PACKET_SIZE); | ||
| final byte[] data = new byte[length]; // We send at most 20 bytes | ||
| System.arraycopy(buffer, mBufferOffset, data, 0, length); | ||
| mBufferOffset += length; | ||
| mRXCharacteristic.setValue(data); | ||
| writeCharacteristic(mRXCharacteristic); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
|
|
@@ -100,13 +135,30 @@ protected boolean shouldAutoConnect() { | |
| } | ||
|
|
||
| /** | ||
| * Sends the given text to RX characteristic. | ||
| * @param text the text to be sent | ||
| */ | ||
| public void send(final String text) { | ||
| // An outgoing buffer may not be null if there is already another packet being sent. We do nothing in this case. | ||
| if (!TextUtils.isEmpty(text) && mOutgoingBuffer == null) { | ||
| final byte[] buffer = mOutgoingBuffer = text.getBytes(); | ||
| mBufferOffset = 0; | ||
|
|
||
| // Depending on whether the characteristic has the WRITE REQUEST property or not, we will either send it as it is (hoping the long write is implemented), | ||
| // or divide it into up to 20 bytes chunks and send them one by one. | ||
| final boolean writeRequest = (mRXCharacteristic.getProperties() & BluetoothGattCharacteristic.PROPERTY_WRITE) > 0; | ||
|
|
||
| if (!writeRequest) { // no WRITE REQUEST property | ||
| final int length = Math.min(buffer.length, MAX_PACKET_SIZE); | ||
| final byte[] data = new byte[length]; // We send at most 20 bytes | ||
| System.arraycopy(buffer, 0, data, 0, length); | ||
| mBufferOffset += length; | ||
| mRXCharacteristic.setValue(data); | ||
| } else { // there is WRITE REQUEST property | ||
| mRXCharacteristic.setValue(buffer); | ||
| mBufferOffset = buffer.length; | ||
| } | ||
| writeCharacteristic(mRXCharacteristic); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
@philips77 The
WRITE_TYPE_DEFAULTcorrespond to ATT R/W requests (with peer acknowledge).So by setting the write type to
WRITE_TYPE_DEFAULT, this will send a long write and the data will be spitted in chunk of 20 bytes ? I did no find anything in the Android API documentation about this feature. Where di you find the information ?I am very curious about this feature, I will try it and check with a BLE sniffer ;)