From e74dabcb043bd443a12e1de39079a3e8425675d2 Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Tue, 28 Apr 2015 10:41:55 +0200 Subject: [PATCH] New error codes added. Build tools 22.0.1. --- dfu/build.gradle | 4 ++-- dfu/dfu.iml | 4 ++-- .../java/no/nordicsemi/android/error/GattError.java | 12 ++++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dfu/build.gradle b/dfu/build.gradle index fab5139..818361b 100644 --- a/dfu/build.gradle +++ b/dfu/build.gradle @@ -8,7 +8,7 @@ ext { android { compileSdkVersion 22 - buildToolsVersion '22.0.0' + buildToolsVersion '22.0.1' defaultConfig { minSdkVersion 18 @@ -26,7 +26,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:support-v4:22.0.0' + compile 'com.android.support:support-v4:22.1.1' compile 'com.google.code.gson:gson:2.3.1' } diff --git a/dfu/dfu.iml b/dfu/dfu.iml index 7763777..6c1988d 100644 --- a/dfu/dfu.iml +++ b/dfu/dfu.iml @@ -87,8 +87,8 @@ - - + + diff --git a/dfu/src/main/java/no/nordicsemi/android/error/GattError.java b/dfu/src/main/java/no/nordicsemi/android/error/GattError.java index 3ceca4c..a084327 100644 --- a/dfu/src/main/java/no/nordicsemi/android/error/GattError.java +++ b/dfu/src/main/java/no/nordicsemi/android/error/GattError.java @@ -135,12 +135,16 @@ public class GattError { return "GATT ENCRYPTED NO MITM"; case 0x008e: return "GATT NOT ENCRYPTED"; - case 0x01FF: + case 0x008f: + return "GATT CONGESTED"; + case 0x00FD: + return "GATT CCCD CFG ERROR"; + case 0x00FE: + return "GATT PROCEDURE IN PROGRESS"; + case 0x00FF: return "GATT VALUE OUT OF RANGE"; case 0x0101: return "TOO MANY OPEN CONNECTIONS"; - case 0x00FF: - return "DFU SERVICE DISCOVERY NOT STARTED"; case DfuBaseService.ERROR_DEVICE_DISCONNECTED: return "DFU DEVICE DISCONNECTED"; case DfuBaseService.ERROR_FILE_ERROR: @@ -152,7 +156,7 @@ public class GattError { case DfuBaseService.ERROR_FILE_NOT_FOUND: return "DFU FILE NOT FOUND"; case DfuBaseService.ERROR_SERVICE_DISCOVERY_NOT_STARTED: - return "DFU ERROR WHILE SERVICE DISCOVERY"; + return "DFU SERVICE DISCOVERY NOT STARTED"; case DfuBaseService.ERROR_SERVICE_NOT_FOUND: return "DFU SERVICE NOT FOUND"; case DfuBaseService.ERROR_CHARACTERISTICS_NOT_FOUND: