diff --git a/Examples/Android Studio Examples/BLEController/build.gradle b/Examples/Android Studio Examples/BLEController/build.gradle
index efab534..dfe0597 100644
--- a/Examples/Android Studio Examples/BLEController/build.gradle
+++ b/Examples/Android Studio Examples/BLEController/build.gradle
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0'
+ classpath 'com.android.tools.build:gradle:2.2.3'
}
}
apply plugin: 'android'
diff --git a/Examples/Android Studio Examples/BLEController/build/generated/source/buildConfig/debug/com/redbear/redbearbleclient/BuildConfig.java b/Examples/Android Studio Examples/BLEController/build/generated/source/buildConfig/debug/com/redbear/redbearbleclient/BuildConfig.java
index 5c52e10..48ded5d 100644
--- a/Examples/Android Studio Examples/BLEController/build/generated/source/buildConfig/debug/com/redbear/redbearbleclient/BuildConfig.java
+++ b/Examples/Android Studio Examples/BLEController/build/generated/source/buildConfig/debug/com/redbear/redbearbleclient/BuildConfig.java
@@ -9,5 +9,5 @@ public final class BuildConfig {
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 1;
- public static final String VERSION_NAME = "";
+ public static final String VERSION_NAME = "@string/version_name";
}
diff --git a/Examples/Android Studio Examples/BLEController/build/generated/source/buildConfig/test/debug/com/redbear/redbearbleclient/test/BuildConfig.java b/Examples/Android Studio Examples/BLEController/build/generated/source/buildConfig/test/debug/com/redbear/redbearbleclient/test/BuildConfig.java
deleted file mode 100644
index 8f98a01..0000000
--- a/Examples/Android Studio Examples/BLEController/build/generated/source/buildConfig/test/debug/com/redbear/redbearbleclient/test/BuildConfig.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.redbear.redbearbleclient.test;
-
-public final class BuildConfig {
- public static final boolean DEBUG = Boolean.parseBoolean("true");
- public static final String APPLICATION_ID = "com.redbear.redbearbleclient.test";
- public static final String BUILD_TYPE = "debug";
- public static final String FLAVOR = "";
- public static final int VERSION_CODE = -1;
- public static final String VERSION_NAME = "";
-}
diff --git a/Examples/Android Studio Examples/BLEController/build/generated/source/r/debug/com/redbear/redbearbleclient/R.java b/Examples/Android Studio Examples/BLEController/build/generated/source/r/debug/com/redbear/redbearbleclient/R.java
index eb90129..39b89de 100644
--- a/Examples/Android Studio Examples/BLEController/build/generated/source/r/debug/com/redbear/redbearbleclient/R.java
+++ b/Examples/Android Studio Examples/BLEController/build/generated/source/r/debug/com/redbear/redbearbleclient/R.java
@@ -21,11 +21,11 @@ public static final class anim {
public static final class attr {
}
public static final class color {
- public static final int black=0x7f050000;
- public static final int blue=0x7f050001;
- public static final int gold=0x7f050002;
- public static final int transparent=0x7f050003;
- public static final int white=0x7f050004;
+ public static final int black=0x7f060000;
+ public static final int blue=0x7f060001;
+ public static final int gold=0x7f060002;
+ public static final int transparent=0x7f060003;
+ public static final int white=0x7f060004;
}
public static final class drawable {
public static final int add_icon=0x7f020000;
@@ -92,43 +92,43 @@ public static final class menu {
public static final int activity_standardview=0x7f080001;
}
public static final class string {
- public static final int addpage_name=0x7f060000;
- public static final int app_name=0x7f060001;
- public static final int bluetooth_not_enable=0x7f060002;
- public static final int hello_world=0x7f060003;
- public static final int input_label=0x7f060004;
- public static final int label_no_devices=0x7f060005;
- public static final int menu_add=0x7f060006;
- public static final int menu_disconnect=0x7f060007;
- public static final int menu_settings=0x7f060008;
- public static final int ok_title=0x7f060009;
- public static final int output_Label=0x7f06000a;
- public static final int pulltorefresh_lasttime_label=0x7f06000b;
- public static final int pulltorefresh_lasttimeupdate_label=0x7f06000c;
- public static final int pulltorefresh_pullltorefresh_label=0x7f06000d;
- public static final int pulltorefresh_refreshing_label=0x7f06000e;
- public static final int pulltorefresh_releasetorefresh_label=0x7f06000f;
- public static final int send_label=0x7f060010;
- public static final int settingpage_name=0x7f060011;
- public static final int standardview_name=0x7f060012;
- public static final int tip_dialog_title=0x7f060013;
- public static final int title_section1=0x7f060014;
- public static final int title_section2=0x7f060015;
- public static final int title_section3=0x7f060016;
- public static final int version_name=0x7f060017;
+ public static final int addpage_name=0x7f070000;
+ public static final int app_name=0x7f070001;
+ public static final int bluetooth_not_enable=0x7f070002;
+ public static final int hello_world=0x7f070003;
+ public static final int input_label=0x7f070004;
+ public static final int label_no_devices=0x7f070005;
+ public static final int menu_add=0x7f070006;
+ public static final int menu_disconnect=0x7f070007;
+ public static final int menu_settings=0x7f070008;
+ public static final int ok_title=0x7f070009;
+ public static final int output_Label=0x7f07000a;
+ public static final int pulltorefresh_lasttime_label=0x7f07000b;
+ public static final int pulltorefresh_lasttimeupdate_label=0x7f07000c;
+ public static final int pulltorefresh_pullltorefresh_label=0x7f07000d;
+ public static final int pulltorefresh_refreshing_label=0x7f07000e;
+ public static final int pulltorefresh_releasetorefresh_label=0x7f07000f;
+ public static final int send_label=0x7f070010;
+ public static final int settingpage_name=0x7f070011;
+ public static final int standardview_name=0x7f070012;
+ public static final int tip_dialog_title=0x7f070013;
+ public static final int title_section1=0x7f070014;
+ public static final int title_section2=0x7f070015;
+ public static final int title_section3=0x7f070016;
+ public static final int version_name=0x7f070017;
}
public static final class style {
- /**
+ /** API 11 theme customizations can go here.
+ API 14 theme customizations can go here.
+
Theme customizations available in newer API levels can go in
res/values-vXX/styles.xml, while customizations related to
backward-compatibility can go here.
- API 11 theme customizations can go here.
- API 14 theme customizations can go here.
*/
- public static final int AppBaseTheme=0x7f070000;
+ public static final int AppBaseTheme=0x7f050000;
/** All customizations that are NOT specific to a particular API-level can go here.
*/
- public static final int AppTheme=0x7f070001;
+ public static final int AppTheme=0x7f050001;
}
}
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/dex-cache/cache.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/dex-cache/cache.xml
deleted file mode 100644
index 3decc2d..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/dex-cache/cache.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/aidl/debug/dependency.store b/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/aidl/debug/dependency.store
deleted file mode 100644
index 8b8400d..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/aidl/debug/dependency.store and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/aidl/test/debug/dependency.store b/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/aidl/test/debug/dependency.store
deleted file mode 100644
index 8b8400d..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/aidl/test/debug/dependency.store and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/mergeAssets/debug/merger.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/mergeAssets/debug/merger.xml
deleted file mode 100644
index 6de7574..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/mergeAssets/debug/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/mergeAssets/test/debug/merger.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/mergeAssets/test/debug/merger.xml
deleted file mode 100644
index afc139f..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/mergeAssets/test/debug/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/mergeResources/debug/merger.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/mergeResources/debug/merger.xml
deleted file mode 100644
index b326909..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/mergeResources/debug/merger.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#33b6ea#b89766#00000000#ffffff#000000Hello world!1.0Pull down to refreshRelease to updateStandard ViewLast updateRefreshing......Bluetooth is not enable!OkBLE ControllerNo BLE device was found.AddTipSettingsAddSettingsLast update time:DisconnectSendInputStandard ViewOutputCustom2Custom1
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/mergeResources/test/debug/merger.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/mergeResources/test/debug/merger.xml
deleted file mode 100644
index 4cfe819..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/incremental/mergeResources/test/debug/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/manifests/test/debug/AndroidManifest.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/manifests/test/debug/AndroidManifest.xml
deleted file mode 100644
index e144846..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/manifests/test/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/model_data.bin b/Examples/Android Studio Examples/BLEController/build/intermediates/model_data.bin
deleted file mode 100644
index bc25bcb..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/model_data.bin and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/pre-dexed/debug/android-support-v4-9f82e0ddaed439db97b72f78afadfa89d48c5906.jar b/Examples/Android Studio Examples/BLEController/build/intermediates/pre-dexed/debug/android-support-v4-9f82e0ddaed439db97b72f78afadfa89d48c5906.jar
deleted file mode 100644
index 803b1a2..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/pre-dexed/debug/android-support-v4-9f82e0ddaed439db97b72f78afadfa89d48c5906.jar and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/pre-dexed/debug/nineoldandroids-2.4.0-6259de167fef15a1b68c0574aac529da7cd12f83.jar b/Examples/Android Studio Examples/BLEController/build/intermediates/pre-dexed/debug/nineoldandroids-2.4.0-6259de167fef15a1b68c0574aac529da7cd12f83.jar
deleted file mode 100644
index a29f51a..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/pre-dexed/debug/nineoldandroids-2.4.0-6259de167fef15a1b68c0574aac529da7cd12f83.jar and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_bottom.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_bottom.xml
deleted file mode 100644
index bf50a7e..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_bottom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_left.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_left.xml
deleted file mode 100644
index 389a231..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_left.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_right.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_right.xml
deleted file mode 100644
index 0b3a5d0..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_right.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_top.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_top.xml
deleted file mode 100644
index 94d9c35..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_top.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_bottom.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_bottom.xml
deleted file mode 100644
index 2bb0158..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_bottom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_left.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_left.xml
deleted file mode 100644
index 532c5a5..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_left.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_right.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_right.xml
deleted file mode 100644
index f703b42..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_right.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_top.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_top.xml
deleted file mode 100644
index ebac31d..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_top.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/add_icon.png b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/add_icon.png
deleted file mode 100644
index 10d24a9..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/add_icon.png and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/arrow.png b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/arrow.png
deleted file mode 100644
index 5472f19..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/arrow.png and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/ic_launcher.png b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/ic_launcher.png
deleted file mode 100644
index 0ed47a3..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/ic_launcher.png and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/remove_icon.png b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/remove_icon.png
deleted file mode 100644
index fcb87e6..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/remove_icon.png and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/right_row.png b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/right_row.png
deleted file mode 100644
index 223b0ca..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/right_row.png and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/setting_icon.png b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/setting_icon.png
deleted file mode 100644
index f0bb00f..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/setting_icon.png and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/splash.jpg b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/splash.jpg
deleted file mode 100644
index 954b5f3..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-hdpi-v4/splash.jpg and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-ldpi-v4/ic_launcher.png b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-ldpi-v4/ic_launcher.png
deleted file mode 100644
index 306281a..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-ldpi-v4/ic_launcher.png and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-mdpi-v4/ic_launcher.png b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-mdpi-v4/ic_launcher.png
deleted file mode 100644
index 4b90493..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-mdpi-v4/ic_launcher.png and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-xhdpi-v4/ic_launcher.png b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-xhdpi-v4/ic_launcher.png
deleted file mode 100644
index d5a5970..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable-xhdpi-v4/ic_launcher.png and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable/button_clicked.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable/button_clicked.xml
deleted file mode 100644
index 710f94d..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable/button_clicked.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable/button_selector.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable/button_selector.xml
deleted file mode 100644
index 531cf76..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable/button_selector.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable/mainpage_listview_item_bg.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable/mainpage_listview_item_bg.xml
deleted file mode 100644
index 4f22926..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/drawable/mainpage_listview_item_bg.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/action_bar.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/action_bar.xml
deleted file mode 100644
index 9c9afb5..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/action_bar.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/activity_main_page.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/activity_main_page.xml
deleted file mode 100644
index a38030d..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/activity_main_page.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/activity_standardview.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/activity_standardview.xml
deleted file mode 100644
index 4c964f1..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/activity_standardview.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/activity_standardview_pins.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/activity_standardview_pins.xml
deleted file mode 100644
index 231b865..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/activity_standardview_pins.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/activity_standardview_pins_ex.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/activity_standardview_pins_ex.xml
deleted file mode 100644
index df0817e..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/activity_standardview_pins_ex.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/main_page_layout.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/main_page_layout.xml
deleted file mode 100644
index 745e3aa..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/main_page_layout.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/main_page_listview_item.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/main_page_listview_item.xml
deleted file mode 100644
index dfa4742..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/main_page_listview_item.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/refreshlist_head.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/refreshlist_head.xml
deleted file mode 100644
index cc8f8e1..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/refreshlist_head.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/standardview_item.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/standardview_item.xml
deleted file mode 100644
index a9d06c0..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/standardview_item.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/standardview_item_ex.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/standardview_item_ex.xml
deleted file mode 100644
index 1222102..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/layout/standardview_item_ex.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/menu/activity_main_page.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/menu/activity_main_page.xml
deleted file mode 100644
index db897d5..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/menu/activity_main_page.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/menu/activity_standardview.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/menu/activity_standardview.xml
deleted file mode 100644
index 4cb437e..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/menu/activity_standardview.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/values-v11/values.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/values-v11/values.xml
deleted file mode 100644
index c1e84c7..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/values-v11/values.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/values-v14/values.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/values-v14/values.xml
deleted file mode 100644
index c56aa63..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/values-v14/values.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/values/values.xml b/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/values/values.xml
deleted file mode 100644
index 117ebee..0000000
--- a/Examples/Android Studio Examples/BLEController/build/intermediates/res/debug/values/values.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
- #000000
- #33b6ea
- #b89766
- #00000000
- #ffffff
-
-
- Add
- BLE Controller
- Bluetooth is not enable!
- Hello world!
- Input
- No BLE device was found.
- Add
- Disconnect
- Settings
- Ok
- Output
- Last update time:
- Last update
- Pull down to refresh
- Refreshing......
- Release to update
- Send
- Settings
- Standard View
- Tip
- Standard View
- Custom1
- Custom2
- 1.0
-
-
-
-
-
\ No newline at end of file
diff --git a/Examples/Android Studio Examples/BLEController/build/outputs/apk/BLEController-debug-unaligned.apk b/Examples/Android Studio Examples/BLEController/build/outputs/apk/BLEController-debug-unaligned.apk
deleted file mode 100644
index 9c6c9be..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/outputs/apk/BLEController-debug-unaligned.apk and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/outputs/apk/BLEController-debug.apk b/Examples/Android Studio Examples/BLEController/build/outputs/apk/BLEController-debug.apk
deleted file mode 100644
index 3645d6f..0000000
Binary files a/Examples/Android Studio Examples/BLEController/build/outputs/apk/BLEController-debug.apk and /dev/null differ
diff --git a/Examples/Android Studio Examples/BLEController/build/outputs/apk/manifest-merger-debug-report.txt b/Examples/Android Studio Examples/BLEController/build/outputs/apk/manifest-merger-debug-report.txt
deleted file mode 100644
index 45d19af..0000000
--- a/Examples/Android Studio Examples/BLEController/build/outputs/apk/manifest-merger-debug-report.txt
+++ /dev/null
@@ -1,105 +0,0 @@
--- Merging decision tree log ---
-manifest
-ADDED from AndroidManifest.xml:2:1
- package
- ADDED from AndroidManifest.xml:3:5
- android:versionName
- ADDED from AndroidManifest.xml:5:5
- android:versionCode
- ADDED from AndroidManifest.xml:4:5
- INJECTED from AndroidManifest.xml:0:0
- INJECTED from AndroidManifest.xml:0:0
- xmlns:android
- ADDED from AndroidManifest.xml:2:11
-uses-sdk
-ADDED from AndroidManifest.xml:7:5
- android:targetSdkVersion
- ADDED from AndroidManifest.xml:9:9
- android:minSdkVersion
- ADDED from AndroidManifest.xml:8:9
-uses-feature#android.hardware.bluetooth_le
-ADDED from AndroidManifest.xml:11:5
- android:required
- ADDED from AndroidManifest.xml:13:9
- android:name
- ADDED from AndroidManifest.xml:12:9
-uses-permission#android.permission.BLUETOOTH
-ADDED from AndroidManifest.xml:15:5
- android:name
- ADDED from AndroidManifest.xml:15:22
-uses-permission#android.permission.BLUETOOTH_ADMIN
-ADDED from AndroidManifest.xml:16:5
- android:name
- ADDED from AndroidManifest.xml:16:22
-application
-ADDED from AndroidManifest.xml:18:5
- android:label
- ADDED from AndroidManifest.xml:21:9
- android:allowBackup
- ADDED from AndroidManifest.xml:19:9
- android:icon
- ADDED from AndroidManifest.xml:20:9
- android:theme
- ADDED from AndroidManifest.xml:22:9
-activity#com.redbear.redbearbleclient.MainPage
-ADDED from AndroidManifest.xml:23:9
- android:screenOrientation
- ADDED from AndroidManifest.xml:26:13
- android:label
- ADDED from AndroidManifest.xml:25:13
- android:name
- ADDED from AndroidManifest.xml:24:13
-activity#com.redbear.redbearbleclient.SplashScreen
-ADDED from AndroidManifest.xml:28:9
- android:screenOrientation
- ADDED from AndroidManifest.xml:30:13
- android:theme
- ADDED from AndroidManifest.xml:31:13
- android:name
- ADDED from AndroidManifest.xml:29:13
-intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:32:13
-action#android.intent.action.MAIN
-ADDED from AndroidManifest.xml:33:17
- android:name
- ADDED from AndroidManifest.xml:33:25
-category#android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:35:17
- android:name
- ADDED from AndroidManifest.xml:35:27
-activity#com.redbear.redbearbleclient.SettingPage
-ADDED from AndroidManifest.xml:38:9
- android:screenOrientation
- ADDED from AndroidManifest.xml:41:13
- android:label
- ADDED from AndroidManifest.xml:40:13
- android:name
- ADDED from AndroidManifest.xml:39:13
-activity#com.redbear.redbearbleclient.AddPage
-ADDED from AndroidManifest.xml:43:9
- android:screenOrientation
- ADDED from AndroidManifest.xml:46:13
- android:label
- ADDED from AndroidManifest.xml:45:13
- android:name
- ADDED from AndroidManifest.xml:44:13
-activity#com.redbear.redbearbleclient.StandardView
-ADDED from AndroidManifest.xml:48:9
- android:screenOrientation
- ADDED from AndroidManifest.xml:51:13
- android:label
- ADDED from AndroidManifest.xml:50:13
- android:name
- ADDED from AndroidManifest.xml:49:13
-service#com.redbear.RedBearService.RedBearService
-ADDED from AndroidManifest.xml:54:9
- android:enabled
- ADDED from AndroidManifest.xml:56:13
- android:name
- ADDED from AndroidManifest.xml:55:13
-intent-filter#com.redbear.RedBearService.RedBearService
-ADDED from AndroidManifest.xml:57:13
-action#com.redbear.RedBearService.RedBearService
-ADDED from AndroidManifest.xml:58:17
- android:name
- ADDED from AndroidManifest.xml:58:25
diff --git a/Examples/Android Studio Examples/BLEController/gradle/wrapper/gradle-wrapper.properties b/Examples/Android Studio Examples/BLEController/gradle/wrapper/gradle-wrapper.properties
index f14477b..3c41abc 100644
--- a/Examples/Android Studio Examples/BLEController/gradle/wrapper/gradle-wrapper.properties
+++ b/Examples/Android Studio Examples/BLEController/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Oct 23 16:32:26 CST 2015
+#Tue Feb 28 18:15:12 IST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/Examples/Android Studio Examples/BLEController/src/com/redbear/RedBearService/RedBearService.java b/Examples/Android Studio Examples/BLEController/src/com/redbear/RedBearService/RedBearService.java
index b111fbd..2332d36 100644
--- a/Examples/Android Studio Examples/BLEController/src/com/redbear/RedBearService/RedBearService.java
+++ b/Examples/Android Studio Examples/BLEController/src/com/redbear/RedBearService/RedBearService.java
@@ -108,6 +108,21 @@ public void writeValue(String deviceAddress, char[] data) {
}
}
+
+ public void writeValue(String deviceAddress, byte[] data) {
+ if (txCharc != null) {
+ //String value = new String(data);//THIS IS WHERE THE BUG IS AT
+
+ if (txCharc.setValue(data)) {
+ if (!mBluetoothGatt.writeCharacteristic(txCharc)) {
+ Log.e(TAG, "Error: writeCharacteristic!");
+ }
+ } else {
+ Log.e(TAG, "Error: setValue!");
+ }
+ }
+ }
+
@Override
public IBinder onBind(Intent intent) {
return mBinder;
diff --git a/Examples/Android Studio Examples/BLEController/src/com/redbear/protocol/RBLProtocol.java b/Examples/Android Studio Examples/BLEController/src/com/redbear/protocol/RBLProtocol.java
index c35d16a..19dec43 100644
--- a/Examples/Android Studio Examples/BLEController/src/com/redbear/protocol/RBLProtocol.java
+++ b/Examples/Android Studio Examples/BLEController/src/com/redbear/protocol/RBLProtocol.java
@@ -102,6 +102,11 @@ protected void write(char[] data) {
mRedBearService.writeValue(address, data);
}
}
+ protected void write(byte[] data){
+ if(mRedBearService != null){
+ mRedBearService.writeValue(address, data);
+ }
+ }
public void setPinMode(int pin, int mode) {
Log.e(TAG, "RBLPRotocol: setPinMode");
@@ -176,6 +181,13 @@ public void analogWrite(int pin, int value) {
// write data
}
+ public void analogWrite(int pin, byte value){
+ Log.e(TAG, "RBLPRotocol: analogWrite value: " + value);
+ byte buf[] = { 'N', (byte) pin, value };
+ write(buf);
+ //write data
+ }
+
public void servoWrite(int pin, int value) {
Log.e(TAG, "RBLPRotocol: servoWrite value: " + value);
char buf[] = { 'O', (char) pin, (char) value };
diff --git a/Examples/Android Studio Examples/BLEController/src/com/redbear/redbearbleclient/StandardViewFragmentForPinsEx.java b/Examples/Android Studio Examples/BLEController/src/com/redbear/redbearbleclient/StandardViewFragmentForPinsEx.java
index 5399500..1d9c334 100644
--- a/Examples/Android Studio Examples/BLEController/src/com/redbear/redbearbleclient/StandardViewFragmentForPinsEx.java
+++ b/Examples/Android Studio Examples/BLEController/src/com/redbear/redbearbleclient/StandardViewFragmentForPinsEx.java
@@ -649,7 +649,7 @@ private void setModeAction(ViewHolder holder, PinInfo pinInfo) {
if (pinInfo.mode == SERVO) {
holder.servo.setMax(130);
} else {
- holder.servo.setMax(130);
+ holder.servo.setMax(255);
}
holder.servo.setVisibility(View.VISIBLE);
holder.servo.setProgress(pinInfo.value);
@@ -703,7 +703,9 @@ public void onStopTrackingTouch(SeekBar seekBar) {
if (mProtocol != null) {
PinInfo pinInfo = data.get(key);
if (pinInfo.mode == PWM) {
- mProtocol.analogWrite(key.intValue(), value);
+ //mProtocol.analogWrite(key.intValue(), (byte) value);// old write
+ // correct way to do this is to write byte not char
+ mProtocol.analogWrite(key.intValue(), (byte) value);
} else {
mProtocol.servoWrite(key.intValue(), value);
}